Merge pull request #251 from Setasign/development

Development

Author: JanSlabon

.github/workflows/code-style.yml

@@ -38,7 +38,7 @@ jobs:
         run: composer update --dev --no-interaction --prefer-dist --no-progress --no-suggest --ansi
 
       - name: Require phpstan
-        run: composer require --dev phpstan/phpstan --no-interaction
+        run: composer require --dev phpstan/phpstan:"~2.1.56" --no-interaction
 
       - name: Run phpstan
         run: php ./vendor/phpstan/phpstan/phpstan.phar analyse --no-progress

composer.json

@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5.52",
-        "setasign/fpdf": "~1.8.6",
+        "setasign/fpdf": "^1.9.0",
         "tecnickcom/tcpdf": "^6.8",
         "setasign/tfpdf": "~1.33",
         "squizlabs/php_codesniffer": "^3.5"
@@ -47,5 +47,9 @@
         "psr-4": {
             "setasign\\Fpdi\\": "tests/"
         }
+    },
+    "scripts": {
+        "all-tests": "@php vendor/bin/phpunit",
+        "cs": "@php vendor/bin/phpcs"
     }
 }

composer.lock

@@ -30,5 +30,5 @@ class Fpdi extends FpdfTpl
      *
      * @string
      */
-    const VERSION = '2.6.6';
+    const VERSION = '2.6.7';
 }

src/Fpdi.php

@@ -84,18 +84,16 @@ public function __construct(PdfParser $parser, $fileHeaderOffset = 0)
             $this->readers[] = $reader;
 
             if (isset($trailer->value['Prev'])) {
-                $nextOffset = $trailer->value['Prev']->value;
-                if (!\in_array($nextOffset, $offsets, true)) {
-                    $offsets[] = $nextOffset;
-                    $offset = $nextOffset;
-                } else {
+                $offset = $trailer->value['Prev']->value;
+                if (\in_array($offset, $offsets, true)) {
                     throw new CrossReferenceException(
                         'Cross-references includes cyclic structure.',
                         CrossReferenceException::CYCLIC_STRUCTURE
                     );
                 }
+                $offsets[] = $offset;
             } else {
-                $offset = false;
+                break;
             }
         }
 

src/PdfParser/CrossReference/CrossReference.php

@@ -46,7 +46,7 @@ class Fpdi extends \TCPDF
      *
      * @string
      */
-    const VERSION = '2.6.6';
+    const VERSION = '2.6.7';
 
     /**
      * A counter for template ids.

src/Tcpdf/Fpdi.php

@@ -28,5 +28,5 @@ class Fpdi extends FpdfTpl
      *
      * @string
      */
-    const VERSION = '2.6.6';
+    const VERSION = '2.6.7';
 }