Merge pull request #157 from Setasign/development

Author: JanSlabon

.github/workflows/code-style.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Install php
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "7.1"
+          php-version: "7.4"
 
       - name: Install dependencies
         run: composer update --dev --no-interaction --prefer-dist --no-progress --no-suggest --ansi

.github/workflows/tests.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: ['8.0', '8.1']
+        php: ['8.0', '8.1', '8.2']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

composer.lock

@@ -6,14 +6,14 @@ parameters:
 
 	ignoreErrors:
 		-
-			message: "#^Return typehint of method setasign\\\\Fpdi\\\\Fpdi\\:\\:getPdfParserInstance\\(\\) has invalid type setasign\\\\FpdiPdfParser\\\\PdfParser\\\\PdfParser\\.$#"
+			message: "#^Method setasign\\\\Fpdi\\\\Fpdi\\:\\:getPdfParserInstance\\(\\) has invalid return type setasign\\\\FpdiPdfParser\\\\PdfParser\\\\PdfParser\\.$#"
 			count: 1
 			path: src/Fpdi.php
 		-
-			message: "#^Return typehint of method setasign\\\\Fpdi\\\\Tcpdf\\\\Fpdi\\:\\:getPdfParserInstance\\(\\) has invalid type setasign\\\\FpdiPdfParser\\\\PdfParser\\\\PdfParser\\.$#"
+			message: "#^Method setasign\\\\Fpdi\\\\Tcpdf\\\\Fpdi\\:\\:getPdfParserInstance\\(\\) has invalid return type setasign\\\\FpdiPdfParser\\\\PdfParser\\\\PdfParser\\.$#"
 			count: 1
 			path: src/Tcpdf/Fpdi.php
 		-
-			message: "#^Return typehint of method setasign\\\\Fpdi\\\\Tfpdf\\\\Fpdi\\:\\:getPdfParserInstance\\(\\) has invalid type setasign\\\\FpdiPdfParser\\\\PdfParser\\\\PdfParser\\.$#"
+			message: "#^Method setasign\\\\Fpdi\\\\Tfpdf\\\\Fpdi\\:\\:getPdfParserInstance\\(\\) has invalid return type setasign\\\\FpdiPdfParser\\\\PdfParser\\\\PdfParser\\.$#"
 			count: 1
 			path: src/Tfpdf/Fpdi.php

phpstan.neon

@@ -58,6 +58,7 @@ public function getSubSections()
 
     /**
      * @inheritdoc
+     * @return int|false
      */
     public function getOffsetFor($objectNumber)
     {

src/PdfParser/CrossReference/FixedReader.php

@@ -42,6 +42,7 @@ public function __construct(PdfParser $parser)
 
     /**
      * @inheritdoc
+     * @return int|false
      */
     public function getOffsetFor($objectNumber)
     {

src/PdfParser/CrossReference/LineReader.php

@@ -87,37 +87,28 @@ public function decode($data)
         $this->nextData = 0;
         $this->nextBits = 0;
 
-        $oldCode = 0;
+        $prevCode = 0;
 
         $uncompData = '';
 
         while (($code = $this->getNextCode()) !== 257) {
             if ($code === 256) {
                 $this->initsTable();
-                $code = $this->getNextCode();
-
-                if ($code === 257) {
-                    break;
-                }
-
+            } elseif ($prevCode === 256) {
                 $uncompData .= $this->sTable[$code];
-                $oldCode = $code;
+            } elseif ($code < $this->tIdx) {
+                $string = $this->sTable[$code];
+                $uncompData .= $string;
+
+                $this->addStringToTable($this->sTable[$prevCode], $string[0]);
             } else {
-                if ($code < $this->tIdx) {
-                    $string = $this->sTable[$code];
-                    $uncompData .= $string;
-
-                    $this->addStringToTable($this->sTable[$oldCode], $string[0]);
-                    $oldCode = $code;
-                } else {
-                    $string = $this->sTable[$oldCode];
-                    $string .= $string[0];
-                    $uncompData .= $string;
-
-                    $this->addStringToTable($string);
-                    $oldCode = $code;
-                }
+                $string = $this->sTable[$prevCode];
+                $string .= $string[0];
+                $uncompData .= $string;
+
+                $this->addStringToTable($string);
             }
+            $prevCode = $code;
         }
 
         return $uncompData;
@@ -163,7 +154,7 @@ protected function addStringToTable($oldString, $newString = '')
     /**
      * Returns the next 9, 10, 11 or 12 bits.
      *
-     * @return integer
+     * @return int
      */
     protected function getNextCode()
     {

src/PdfParser/Filter/Lzw.php

@@ -140,6 +140,7 @@ public function getTemplateSize($tpl, $width = null, $height = null)
 
     /**
      * @inheritdoc
+     * @return string
      */
     protected function _getxobjectdict()
     {

src/Tcpdf/Fpdi.php

@@ -19,7 +19,11 @@ public function decodeProvider()
                 "\x80\x0D\x47\x23\x91\x00\xC2\x0A\x20\x1C\x0D\x06\x30\x78\x31\x8C\xDA\x0A\x17\x92"
                 . "\x4D\xA6\x78\x59\x10\xDF\x01",
                 "599 0 0 841 0 0 cm\n/Img1 Do"
-            ]
+            ],
+            [
+                "\x80\x40\x05\xB0\x28\x11\x06\x06\x42\x80\x80",
+                "-----A---B"
+            ],
         ];
     }
 

tests/functional/PdfParser/Filter/LzwTest.php

@@ -45,24 +45,24 @@ protected function _putextgstates()
         for ($i = 1; $i <= $count; $i++) {
             $this->_newobj();
             $this->extgstates[$i]['n'] = $this->n;
-            $this->_out('<</Type /ExtGState');
+            $this->_put('<</Type /ExtGState');
             $parms = $this->extgstates[$i]['parms'];
-            $this->_out(sprintf('/ca %.3F', $parms['ca']));
-            $this->_out(sprintf('/CA %.3F', $parms['CA']));
-            $this->_out('/BM '.$parms['BM']);
-            $this->_out('>>');
-            $this->_out('endobj');
+            $this->_put(sprintf('/ca %.3F', $parms['ca']));
+            $this->_put(sprintf('/CA %.3F', $parms['CA']));
+            $this->_put('/BM '.$parms['BM']);
+            $this->_put('>>');
+            $this->_put('endobj');
         }
     }
 
     protected function _putresourcedict()
     {
         parent::_putresourcedict();
-        $this->_out('/ExtGState <<');
+        $this->_put('/ExtGState <<');
         foreach ($this->extgstates as $k => $extgstate) {
-            $this->_out('/GS'.$k.' '.$extgstate['n'].' 0 R');
+            $this->_put('/GS'.$k.' '.$extgstate['n'].' 0 R');
         }
-        $this->_out('>>');
+        $this->_put('>>');
     }
 
     protected function _putresources()