Fixed CI

PHPOffice · Dec 1, 2023 · 0025151 · 0025151
1 parent f5907e1
commit 0025151
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/docs/changes/1.1.0.md b/docs/changes/1.1.0.md
@@ -9,3 +9,7 @@
 - Support for Hyperlink Text Color - [@MartynasJanu](https://github.com/MartynasJanu) & [@Progi1984](https://github.com/Progi1984) GH-682
     - PowerPoint2007 Reader
     - PowerPoint2007 Writer
+
+## Bugfixes
+
+- Fixed CI - [@Progi1984](https://github.com/Progi1984) in [#](https://github.com/PHPOffice/PHPPresentatio /pull/)
diff --git a/src/PhpPresentation/Reader/PowerPoint97.php b/src/PhpPresentation/Reader/PowerPoint97.php
@@ -535,7 +535,7 @@ private function loadCurrentUserStream(): void
         // headerToken
         $headerToken = self::getInt4d($this->streamCurrentUser, $pos);
         $pos += 4;
-        if (0xF3D1C4DF == $headerToken && 0xE391C05F != $headerToken) {
+        if (0xF3D1C4DF == $headerToken) {
             // Encrypted file
             throw new FeatureNotImplementedException();
         }

diff --git a/src/PhpPresentation/Slide/Iterator.php b/src/PhpPresentation/Slide/Iterator.php
@@ -70,6 +70,7 @@ public function rewind()
      *
      * @return \PhpOffice\PhpPresentation\Slide
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->subject->getSlide($this->position);
@@ -80,6 +81,7 @@ public function current()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;

diff --git a/src/PhpPresentation/Writer/ODPresentation/Content.php b/src/PhpPresentation/Writer/ODPresentation/Content.php
@@ -549,7 +549,7 @@ protected function writeShapeTxt(XMLWriter $objWriter, RichText $shape): void
             } elseif ('bullet' == $paragraph->getBulletStyle()->getBulletType()) {
                 $bCstShpHasBullet = true;
                 // Open the bullet list
-                if ('bullet' != $sCstShpLastBullet || ($sCstShpLastBullet == $paragraph->getBulletStyle()->getBulletType() && $iCstShpLastBulletLvl < $paragraph->getAlignment()->getLevel())) {
+                if ('bullet' != $sCstShpLastBullet || $iCstShpLastBulletLvl < $paragraph->getAlignment()->getLevel()) {
                     // text:list
                     $objWriter->startElement('text:list');
                     $objWriter->writeAttribute('text:style-name', 'L_' . $paragraph->getBulletStyle()->getHashCode());

diff --git a/tests/PhpPresentation/Tests/Writer/ODPresentation/ContentTest.php b/tests/PhpPresentation/Tests/Writer/ODPresentation/ContentTest.php
@@ -539,7 +539,7 @@ public function testRichTextShadow(): void
             if (0 == $inc || 180 == $inc || 360 == $inc) {
                 $this->assertZipXmlAttributeEquals('content.xml', $element, 'draw:shadow-offset-y', '0cm');
             } else {
-                if (($inc > 0 && $inc < 180) || 360 == $inc) {
+                if ($inc < 180) {
                     $this->assertZipXmlAttributeEquals('content.xml', $element, 'draw:shadow-offset-y', Drawing::pixelsToCentimeters((int) $randDistance) . 'cm');
                 } else {
                     $this->assertZipXmlAttributeEquals('content.xml', $element, 'draw:shadow-offset-y', '-' . Drawing::pixelsToCentimeters((int) $randDistance) . 'cm');