Upgrade 1-11.38

vendor/setasign/fpdi/composer.json

@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": ">=7.2 <=8.5.99999",
         "ext-zlib": "*"
     },
     "conflict": {
@@ -37,9 +37,9 @@
         "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured."
     },
     "require-dev": {
-        "phpunit/phpunit": "^7",
+        "phpunit/phpunit": "^8.5.52",
         "setasign/fpdf": "~1.8.6",
-        "tecnickcom/tcpdf": "^6.2",
+        "tecnickcom/tcpdf": "^6.8",
         "setasign/tfpdf": "~1.33",
         "squizlabs/php_codesniffer": "^3.5"
     },

vendor/setasign/fpdi/src/FpdfTpl.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/FpdfTplTrait.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -302,7 +302,7 @@ trait FpdfTplTrait
 
         $fontKey = $this->FontFamily . $this->FontStyle;
         if ($fontKey) {
-            $this->CurrentFont =& $this->fonts[$fontKey];
+            $this->CurrentFont = $this->fonts[$fontKey];
         } else {
             unset($this->CurrentFont);
         }

vendor/setasign/fpdi/src/FpdfTrait.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -137,7 +137,7 @@ trait FpdfTrait
     {
         foreach ($this->PageLinks[$n] as $pl) {
             $this->_newobj();
-            $rect = sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);
+            $rect = \sprintf('%.2F %.2F %.2F %.2F', $pl[0], $pl[1], $pl[0] + $pl[2], $pl[1] - $pl[3]);
             $this->_put('<</Type /Annot /Subtype /Link /Rect [' . $rect . ']', false);
             if (is_string($pl[4])) {
                 if (isset($pl['importedLink'])) {
@@ -152,7 +152,7 @@ trait FpdfTrait
                     if (isset($pl['quadPoints'])) {
                         $s = '/QuadPoints[';
                         foreach ($pl['quadPoints'] as $value) {
-                            $s .= sprintf('%.2F ', $value);
+                            $s .= \sprintf('%.2F ', $value);
                         }
                         $s .= ']';
                         $this->_put($s);
@@ -172,7 +172,7 @@ trait FpdfTrait
                         ? $this->DefPageSize[1] * $this->k
                         : $this->DefPageSize[0] * $this->k;
                 }
-                $this->_put(sprintf(
+                $this->_put(\sprintf(
                     '/Dest [%d 0 R /XYZ 0 %.2F null]>>',
                     $this->PageInfo[$l[0]]['n'],
                     $h - $l[1] * $this->k

vendor/setasign/fpdi/src/Fpdi.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -30,5 +30,5 @@ class Fpdi extends FpdfTpl
      *
      * @string
      */
-    const VERSION = '2.6.3';
+    const VERSION = '2.6.6';
 }

vendor/setasign/fpdi/src/FpdiException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/FpdiTrait.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -127,8 +127,11 @@ trait FpdiTrait
      * @param array $parserParams Individual parameters passed to the parser instance.
      * @return PdfParser|FpdiPdfParser
      */
-    protected function getPdfParserInstance(StreamReader $streamReader, array $parserParams = [])
-    {
+    protected function getPdfParserInstance(
+        StreamReader $streamReader,
+        #[\SensitiveParameter]
+        array $parserParams = []
+    ) {
         // note: if you get an exception here - turn off errors/warnings on not found classes for your autoloader.
         // psr-4 (https://www.php-fig.org/psr/psr-4/) says: Autoloader implementations MUST NOT throw
         // exceptions, MUST NOT raise errors of any level, and SHOULD NOT return a value.
@@ -149,8 +152,11 @@ trait FpdiTrait
      * @param array $parserParams Individual parameters passed to the parser instance.
      * @return string
      */
-    protected function getPdfReaderId($file, array $parserParams = [])
-    {
+    protected function getPdfReaderId(
+        $file,
+        #[\SensitiveParameter]
+        array $parserParams = []
+    ) {
         if (\is_resource($file)) {
             $id = (string) $file;
         } elseif (\is_string($file)) {
@@ -166,7 +172,8 @@ trait FpdiTrait
             );
         }
 
-        /** @noinspection OffsetOperationsInspection */
+        $id = \md5($id . '|' . \print_r($parserParams, true));
+
         if (isset($this->readers[$id])) {
             return $id;
         }
@@ -181,7 +188,6 @@ trait FpdiTrait
         }
 
         $reader = new PdfReader($this->getPdfParserInstance($streamReader, $parserParams));
-        /** @noinspection OffsetOperationsInspection */
         $this->readers[$id] = $reader;
 
         return $id;
@@ -228,8 +234,11 @@ trait FpdiTrait
      * @throws PdfParserException
      * @throws PdfTypeException
      */
-    public function setSourceFileWithParserParams($file, array $parserParams = [])
-    {
+    public function setSourceFileWithParserParams(
+        $file,
+        #[\SensitiveParameter]
+        array $parserParams = []
+    ) {
         $this->currentReaderId = $this->getPdfReaderId($file, $parserParams);
         $this->objectsToCopy[$this->currentReaderId] = [];
 
@@ -313,7 +322,7 @@ trait FpdiTrait
             $dict->value['Resources'] = $resources;
         }
 
-        list($width, $height) = $page->getWidthAndHeight($box);
+        [$width, $height] = $page->getWidthAndHeight($box);
 
         $a = 1;
         $b = 0;
@@ -522,11 +531,11 @@ trait FpdiTrait
     protected function adjustLastLink($externalLink, $xPt, $scaleX, $yPt, $newHeightPt, $scaleY, $importedPage)
     {
         // let's create a relation of the newly created link to the data of the external link
-        $lastLink = count($this->PageLinks[$this->page]);
+        $lastLink = \count($this->PageLinks[$this->page]);
         $this->PageLinks[$this->page][$lastLink - 1]['importedLink'] = $externalLink;
-        if (count($externalLink['quadPoints']) > 0) {
+        if (\count($externalLink['quadPoints']) > 0) {
             $quadPoints = [];
-            for ($i = 0, $n = count($externalLink['quadPoints']); $i < $n; $i += 2) {
+            for ($i = 0, $n = \count($externalLink['quadPoints']); $i < $n; $i += 2) {
                 $quadPoints[] = $xPt + $externalLink['quadPoints'][$i] * $scaleX;
                 $quadPoints[] = $this->hPt - $yPt - $newHeightPt + $externalLink['quadPoints'][$i + 1] * $scaleY;
             }

vendor/setasign/fpdi/src/GraphicsState.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -53,13 +53,13 @@ class GraphicsState
      */
     public function rotate($x, $y, $angle)
     {
-        if (abs($angle) < 1e-5) {
+        if (\abs($angle) < 1e-5) {
             return  $this;
         }
 
-        $angle = deg2rad($angle);
-        $c = cos($angle);
-        $s = sin($angle);
+        $angle = \deg2rad($angle);
+        $c = \cos($angle);
+        $s = \sin($angle);
 
         $this->add(new Matrix($c, $s, -$s, $c, $x, $y));
 

vendor/setasign/fpdi/src/Math/Matrix.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/Math/Vector.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -57,7 +57,7 @@ class Vector
      */
     public function multiplyWithMatrix(Matrix $matrix)
     {
-        list($a, $b, $c, $d, $e, $f) = $matrix->getValues();
+        [$a, $b, $c, $d, $e, $f] = $matrix->getValues();
         $x = $a * $this->x + $c * $this->y + $e;
         $y = $b * $this->x + $d * $this->y + $f;
 

vendor/setasign/fpdi/src/PdfParser/CrossReference/AbstractReader.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -35,7 +35,6 @@ abstract class AbstractReader
      *
      * @param PdfParser $parser
      * @throws CrossReferenceException
-     * @throws PdfTypeException
      */
     public function __construct(PdfParser $parser)
     {
@@ -57,7 +56,6 @@ abstract class AbstractReader
      * Read the trailer dictionary.
      *
      * @throws CrossReferenceException
-     * @throws PdfTypeException
      */
     protected function readTrailer()
     {

vendor/setasign/fpdi/src/PdfParser/CrossReference/CrossReference.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -56,6 +56,9 @@ class CrossReference
      */
     public function __construct(PdfParser $parser, $fileHeaderOffset = 0)
     {
+        // clear the token stack, if the parser instance is re-used
+        $parser->getTokenizer()->clearStack();
+
         $this->parser = $parser;
         $this->fileHeaderOffset = $fileHeaderOffset;
 

vendor/setasign/fpdi/src/PdfParser/CrossReference/CrossReferenceException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/CrossReference/FixedReader.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -62,7 +62,7 @@ class FixedReader extends AbstractReader implements ReaderInterface
      */
     public function getOffsetFor($objectNumber)
     {
-        foreach ($this->subSections as $offset => list($startObject, $objectCount)) {
+        foreach ($this->subSections as $offset => [$startObject, $objectCount]) {
             /**
              * @var int $startObject
              * @var int $objectCount
@@ -71,7 +71,7 @@ class FixedReader extends AbstractReader implements ReaderInterface
                 $position = $offset + 20 * ($objectNumber - $startObject);
                 $this->reader->ensure($position, 20);
                 $line = $this->reader->readBytes(20);
-                if ($line[17] === 'f') {
+                if ($line === false || $line[17] === 'f') {
                     return false;
                 }
 
@@ -189,7 +189,7 @@ class FixedReader extends AbstractReader implements ReaderInterface
         }
 
         if ($this->getOffsetFor(1) === false) {
-            foreach ($subSections as $offset => list($startObject, $objectCount)) {
+            foreach ($subSections as $offset => [$startObject, $objectCount]) {
                 $this->subSections[$offset] = [$startObject - 1, $objectCount];
             }
             return true;

vendor/setasign/fpdi/src/PdfParser/CrossReference/LineReader.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/CrossReference/ReaderInterface.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/Ascii85.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -47,7 +47,7 @@ class Ascii85 implements FilterInterface
             }
 
             if ($ch === 122 /* z */ && $state === 0) {
-                $out .= \chr(0) . \chr(0) . \chr(0) . \chr(0);
+                $out .= "\x00\x00\x00\x00";
                 continue;
             }
 
@@ -69,10 +69,10 @@ class Ascii85 implements FilterInterface
                     $r = (int)($r * 85 + $chn[$j]);
                 }
 
-                $out .= \chr($r >> 24)
-                    . \chr($r >> 16)
-                    . \chr($r >> 8)
-                    . \chr($r);
+                $out .= \chr(($r >> 24) & 255)
+                    . \chr(($r >> 16) & 255)
+                    . \chr(($r >> 8) & 255)
+                    . \chr($r & 255);
             }
         }
 
@@ -85,16 +85,16 @@ class Ascii85 implements FilterInterface
 
         if ($state === 2) {
             $r = $chn[0] * 85 * 85 * 85 * 85 + ($chn[1] + 1) * 85 * 85 * 85;
-            $out .= \chr($r >> 24);
+            $out .= \chr(($r >> 24) & 255);
         } elseif ($state === 3) {
             $r = $chn[0] * 85 * 85 * 85 * 85 + $chn[1] * 85 * 85 * 85 + ($chn[2] + 1) * 85 * 85;
-            $out .= \chr($r >> 24);
-            $out .= \chr($r >> 16);
+            $out .= \chr(($r >> 24) & 255);
+            $out .= \chr(($r >> 16) & 255);
         } elseif ($state === 4) {
             $r = $chn[0] * 85 * 85 * 85 * 85 + $chn[1] * 85 * 85 * 85 + $chn[2] * 85 * 85 + ($chn[3] + 1) * 85;
-            $out .= \chr($r >> 24);
-            $out .= \chr($r >> 16);
-            $out .= \chr($r >> 8);
+            $out .= \chr(($r >> 24) & 255);
+            $out .= \chr(($r >> 16) & 255);
+            $out .= \chr(($r >> 8) & 255);
         }
 
         return $out;

vendor/setasign/fpdi/src/PdfParser/Filter/Ascii85Exception.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/AsciiHex.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/FilterException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/FilterInterface.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/Flate.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/FlateException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/Lzw.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Filter/LzwException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/PdfParser.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -177,7 +177,7 @@ class PdfParser
                 PdfParserException::PDF_VERSION_NOT_FOUND
             );
         }
-        list(, $major, $minor) = $result;
+        [, $major, $minor] = $result;
 
         $catalog = $this->getCatalog();
         if (isset($catalog->value['Version'])) {
@@ -186,7 +186,7 @@ class PdfParser
                 PdfName::unescape(PdfType::resolve($catalog->value['Version'], $this)->value)
             );
             if (count($versionParts) === 2) {
-                list($major, $minor) = $versionParts;
+                [$major, $minor] = $versionParts;
             }
         }
 

vendor/setasign/fpdi/src/PdfParser/PdfParserException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/StreamReader.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Tokenizer.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfArray.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfBoolean.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfDictionary.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfHexString.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfIndirectObject.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfIndirectObjectReference.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfName.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -45,12 +45,12 @@ class PdfName extends PdfType
      */
     public static function unescape($value)
     {
-        if (strpos($value, '#') === false) {
+        if (\strpos($value, '#') === false) {
             return $value;
         }
 
-        return preg_replace_callback('/#([a-fA-F\d]{2})/', function ($matches) {
-            return chr(hexdec($matches[1]));
+        return \preg_replace_callback('/#([a-fA-F\d]{2})/', function ($matches) {
+            return \chr(\hexdec($matches[1]));
         }, $value);
     }
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfNull.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfNumeric.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfStream.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -147,7 +147,7 @@ class PdfStream extends PdfType
                     $this->reader->reset($this->stream + strlen($buffer));
                     $this->parser->getTokenizer()->clearStack();
                     $token = $this->parser->readValue();
-                    if ($token === false || !($token instanceof PdfToken) || $token->value !== 'endstream') {
+                    if (!($token instanceof PdfToken) || $token->value !== 'endstream') {
                         $this->reader->reset($this->stream, 100000);
                         $buffer = $this->extractStream();
                         $this->reader->reset($this->stream + strlen($buffer));
@@ -205,7 +205,7 @@ class PdfStream extends PdfType
         // There are streams in the wild, which have only white signs in them but need to be parsed manually due
         // to a problem encountered before (e.g. Length === 0). We should set them to empty streams to avoid problems
         // in further processing (e.g. applying of filters).
-        if (trim($buffer) === '') {
+        if (\trim($buffer) === '') {
             $buffer = '';
         }
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfString.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfToken.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfParser/Type/PdfType.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -27,22 +27,33 @@ class PdfType
      * @param PdfType $value
      * @param PdfParser $parser
      * @param bool $stopAtIndirectObject
+     * @param array $ensuredObjectsList A list of all ensured indirect objects to prevent recursion
      * @return PdfType
      * @throws CrossReferenceException
      * @throws PdfParserException
      */
-    public static function resolve(PdfType $value, PdfParser $parser, $stopAtIndirectObject = false)
-    {
+    public static function resolve(
+        PdfType $value,
+        PdfParser $parser,
+        $stopAtIndirectObject = false,
+        array &$ensuredObjectsList = []
+    ) {
+        if ($value instanceof PdfIndirectObjectReference) {
+            $value = $parser->getIndirectObject($value->value);
+        }
+
         if ($value instanceof PdfIndirectObject) {
             if ($stopAtIndirectObject === true) {
                 return $value;
             }
 
-            return self::resolve($value->value, $parser, $stopAtIndirectObject);
-        }
-
-        if ($value instanceof PdfIndirectObjectReference) {
-            return self::resolve($parser->getIndirectObject($value->value), $parser, $stopAtIndirectObject);
+            if (\in_array($value->objectNumber, $ensuredObjectsList, true)) {
+                throw new PdfParserException(
+                    \sprintf('Indirect reference recursion detected (%s).', $value->objectNumber)
+                );
+            }
+            $ensuredObjectsList[] = $value->objectNumber;
+            return self::resolve($value->value, $parser, $stopAtIndirectObject, $ensuredObjectsList);
         }
 
         return $value;

vendor/setasign/fpdi/src/PdfParser/Type/PdfTypeException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfReader/DataStructure/Rectangle.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfReader/Page.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -118,7 +118,7 @@ class Page
         if ($inherited && \in_array($name, $inheritedKeys, true)) {
             if ($this->inheritedAttributes === null) {
                 $this->inheritedAttributes = [];
-                $inheritedKeys = \array_filter($inheritedKeys, function ($key) use ($dict) {
+                $inheritedKeys = \array_filter($inheritedKeys, static function ($key) use ($dict) {
                     return !isset($dict->value[$key]);
                 });
 
@@ -334,7 +334,7 @@ class Page
                 }
 
                 $rect = PdfType::resolve(PdfDictionary::get($annotation, 'Rect'), $this->parser);
-                if (!$rect instanceof PdfArray || count($rect->value) !== 4) {
+                if (!$rect instanceof PdfArray || \count($rect->value) !== 4) {
                     continue;
                 }
 
@@ -370,7 +370,7 @@ class Page
                 $quadPoints = PdfType::resolve(PdfDictionary::get($annotation, 'QuadPoints'), $this->parser);
                 $normalizedQuadPoints = [];
                 if ($quadPoints instanceof PdfArray) {
-                    $quadPointsCount = count($quadPoints->value);
+                    $quadPointsCount = \count($quadPoints->value);
                     if ($quadPointsCount % 8 === 0) {
                         for ($i = 0; ($i + 1) < $quadPointsCount; $i += 2) {
                             $x = PdfNumeric::ensure(PdfType::resolve($quadPoints->value[$i], $this->parser));

vendor/setasign/fpdi/src/PdfReader/PageBoundaries.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/PdfReader/PdfReader.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -124,6 +124,8 @@ class PdfReader
             );
         }
 
+        $pageNumber = (int)$pageNumber;
+
         if ($pageNumber < 1 || $pageNumber > $this->getPageCount()) {
             throw new \InvalidArgumentException(
                 \sprintf(
@@ -139,12 +141,19 @@ class PdfReader
         $page = $this->pages[$pageNumber - 1];
 
         if ($page instanceof PdfIndirectObjectReference) {
-            $readPages = function ($kids) use (&$readPages) {
+            $alreadyReadKids = [];
+            $readPages = function ($kids) use (&$readPages, &$alreadyReadKids) {
                 $kids = PdfArray::ensure($kids);
 
                 /** @noinspection LoopWhichDoesNotLoopInspection */
                 foreach ($kids->value as $reference) {
                     $reference = PdfIndirectObjectReference::ensure($reference);
+
+                    if (\in_array($reference->value, $alreadyReadKids, true)) {
+                        throw new PdfReaderException('Recursive pages dictionary detected.');
+                    }
+                    $alreadyReadKids[] = $reference->value;
+
                     $object = $this->parser->getIndirectObject($reference->value);
                     $type = PdfDictionary::get($object->value, 'Type');
 
@@ -168,6 +177,7 @@ class PdfReader
             if ($type->value === 'Pages') {
                 $kids = PdfType::resolve(PdfDictionary::get($dict, 'Kids'), $this->parser);
                 try {
+                    $alreadyReadKids[] = $page->objectNumber;
                     $page = $this->pages[$pageNumber - 1] = $readPages($kids);
                 } catch (PdfReaderException $e) {
                     if ($e->getCode() !== PdfReaderException::KIDS_EMPTY) {
@@ -203,7 +213,8 @@ class PdfReader
         }
 
         $expectedPageCount = $this->getPageCount();
-        $readPages = function ($kids, $count) use (&$readPages, $readAll, $expectedPageCount) {
+        $alreadyReadKids = [];
+        $readPages = function ($kids, $count) use (&$readPages, &$alreadyReadKids, $readAll, $expectedPageCount) {
             $kids = PdfArray::ensure($kids);
             $isLeaf = ($count->value === \count($kids->value));
 
@@ -215,6 +226,11 @@ class PdfReader
                     continue;
                 }
 
+                if (\in_array($reference->value, $alreadyReadKids, true)) {
+                    throw new PdfReaderException('Recursive pages dictionary detected.');
+                }
+                $alreadyReadKids[] = $reference->value;
+
                 $object = $this->parser->getIndirectObject($reference->value);
                 $type = PdfDictionary::get($object->value, 'Type');
 

vendor/setasign/fpdi/src/PdfReader/PdfReaderException.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/Tcpdf/Fpdi.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -46,7 +46,7 @@ class Fpdi extends \TCPDF
      *
      * @string
      */
-    const VERSION = '2.6.3';
+    const VERSION = '2.6.6';
 
     /**
      * A counter for template ids.
@@ -293,10 +293,10 @@ class Fpdi extends \TCPDF
 
         if ($this->inxobj) {
             // store parameters for later use on template
-            $lastAnnotationKey = count($this->xobjects[$this->xobjid]['annotations']) - 1;
+            $lastAnnotationKey = \count($this->xobjects[$this->xobjid]['annotations']) - 1;
             $lastAnnotationOpt = &$this->xobjects[$this->xobjid]['annotations'][$lastAnnotationKey]['opt'];
         } else {
-            $lastAnnotationKey = count($this->PageAnnots[$this->page]) - 1;
+            $lastAnnotationKey = \count($this->PageAnnots[$this->page]) - 1;
             $lastAnnotationOpt = &$this->PageAnnots[$this->page][$lastAnnotationKey]['opt'];
         }
 
@@ -356,7 +356,7 @@ class Fpdi extends \TCPDF
                     case 'C':
                         $c = [];
                         $colors = PdfArray::ensure(PdfType::resolve($value, $parser))->value;
-                        $m = count($colors) === 4 ? 100 : 255;
+                        $m = \count($colors) === 4 ? 100 : 255;
                         foreach ($colors as $item) {
                             $c[] = PdfNumeric::ensure($item)->value * $m;
                         }

vendor/setasign/fpdi/src/TcpdfFpdi.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/Tfpdf/FpdfTpl.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 

vendor/setasign/fpdi/src/Tfpdf/Fpdi.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */
 
@@ -28,5 +28,5 @@ class Fpdi extends FpdfTpl
      *
      * @string
      */
-    const VERSION = '2.6.3';
+    const VERSION = '2.6.6';
 }

vendor/setasign/fpdi/src/autoload.php

@@ -4,7 +4,7 @@
  * This file is part of FPDI
  *
  * @package   setasign\Fpdi
- * @copyright Copyright (c) 2024 Setasign GmbH & Co. KG (https://www.setasign.com)
+ * @copyright Copyright (c) 2026 Setasign GmbH & Co. KG (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
  */