Tests: Update development tools and check PHP 8.1/8.2 support (#553)

* updated PHP-CS-Fixer from 2.x to 3.x * dev tools: bumped version of PHPStan; updated .gitignore with .php-cs-fixer.cache * CI workflow: enabled PHP 8.1 + PHP 8.2 (at RC2 currently) * replaced function calls of utf8_encode utf8_encode with mb_convert_encoding - FYI: https://php.watch/versions/8.2/utf8_encode-utf8_decode-deprecated
smalot · Sep 26, 2022 · 988efcb · 988efcb
1 parent 7c00709
commit 988efcb
Show file tree

Hide file tree

Showing 67 changed files with 500 additions and 337 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -21,6 +21,8 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
+          - "8.2"
 
     steps:
       - name: "Checkout"
@@ -149,6 +151,8 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
+          - "8.2"
 
     steps:
       - name: "Checkout"

diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,5 @@
 /composer
 debug*
 composer.lock
-/.php_cs.cache
+/.php-cs-fixer.cache
 /.phpunit.result.cache
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -1,6 +1,20 @@
 <?php
 
-return PhpCsFixer\Config::create()
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->in([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
+    ->name('*.php')
+;
+
+$config = new Config();
+$config
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
@@ -11,13 +25,7 @@
         'ordered_imports' => true,
         'phpdoc_summary' => false,
         'protected_to_private' => false,
-     ])
-    ->setRiskyAllowed(true)
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->exclude([
-                'vendor',
-            ])
-            ->in(__DIR__)
-            ->name('*.php')
-    );
+    ])
+;
+
+return $config;
diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -1,9 +1,9 @@
 {
     "description": "This file provides development-only dependencies.",
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
-        "phpstan/phpstan": "^0.12.81",
-        "phpstan/phpstan-phpunit": "^0.12.18",
+        "friendsofphp/php-cs-fixer": "^3",
+        "phpstan/phpstan": "^1",
+        "phpstan/phpstan-phpunit": "^1",
         "phpunit/phpunit": ">=7.5"
     }
 }
diff --git a/src/Smalot/PdfParser/Config.php b/src/Smalot/PdfParser/Config.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Konrad Abicht <hi@inspirito.de>
+ *
  * @date    2020-11-22
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Document.php b/src/Smalot/PdfParser/Document.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element.php b/src/Smalot/PdfParser/Element.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.
@@ -91,7 +93,7 @@ public function getContent()
 
     public function __toString(): string
     {
-        return (string) ($this->value);
+        return (string) $this->value;
     }
 
     public static function parse(string $content, ?Document $document = null, int &$position = 0)

diff --git a/src/Smalot/PdfParser/Element/ElementArray.php b/src/Smalot/PdfParser/Element/ElementArray.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementBoolean.php b/src/Smalot/PdfParser/Element/ElementBoolean.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.
@@ -43,7 +45,7 @@ class ElementBoolean extends Element
      */
     public function __construct($value)
     {
-        parent::__construct(('true' == strtolower($value) || true === $value), null);
+        parent::__construct('true' == strtolower($value) || true === $value, null);
     }
 
     public function __toString(): string

diff --git a/src/Smalot/PdfParser/Element/ElementDate.php b/src/Smalot/PdfParser/Element/ElementDate.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHPi, extraction oriented.
@@ -90,7 +92,7 @@ public function equals($value): bool
 
     public function __toString(): string
     {
-        return (string) ($this->value->format($this->format));
+        return (string) $this->value->format($this->format);
     }
 
     /**

diff --git a/src/Smalot/PdfParser/Element/ElementHexa.php b/src/Smalot/PdfParser/Element/ElementHexa.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementMissing.php b/src/Smalot/PdfParser/Element/ElementMissing.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementName.php b/src/Smalot/PdfParser/Element/ElementName.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementNull.php b/src/Smalot/PdfParser/Element/ElementNull.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementNumeric.php b/src/Smalot/PdfParser/Element/ElementNumeric.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementString.php b/src/Smalot/PdfParser/Element/ElementString.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementStruct.php b/src/Smalot/PdfParser/Element/ElementStruct.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Element/ElementXRef.php b/src/Smalot/PdfParser/Element/ElementXRef.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.
@@ -65,7 +67,7 @@ public function equals($value): bool
             && true === \is_string($this->getContent())
             && 1 === preg_match('/[0-9]+\_[0-9]+/', $this->getContent(), $matches)
         ) {
-            return (float) ($this->getContent()) == $value;
+            return (float) $this->getContent() == $value;
         }
 
         $id = ($value instanceof self) ? $value->getId() : $value;

diff --git a/src/Smalot/PdfParser/Encoding.php b/src/Smalot/PdfParser/Encoding.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Encoding/ISOLatin1Encoding.php b/src/Smalot/PdfParser/Encoding/ISOLatin1Encoding.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Encoding/ISOLatin9Encoding.php b/src/Smalot/PdfParser/Encoding/ISOLatin9Encoding.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Encoding/MacRomanEncoding.php b/src/Smalot/PdfParser/Encoding/MacRomanEncoding.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Encoding/PostScriptGlyphs.php b/src/Smalot/PdfParser/Encoding/PostScriptGlyphs.php
@@ -4,9 +4,11 @@
  * @file This file is part of the PdfParser library.
  *
  * @author  Dāvis Mosāns <davis.mosans@intelligentsystems.lv>
+ *
  * @date    2019-09-17
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Encoding/StandardEncoding.php b/src/Smalot/PdfParser/Encoding/StandardEncoding.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.

diff --git a/src/Smalot/PdfParser/Encoding/WinAnsiEncoding.php b/src/Smalot/PdfParser/Encoding/WinAnsiEncoding.php
@@ -5,9 +5,11 @@
  *          This file is part of the PdfParser library.
  *
  * @author  Sébastien MALOT <sebastien@malot.fr>
+ *
  * @date    2017-01-03
  *
  * @license LGPLv3
+ *
  * @url     <https://github.com/smalot/pdfparser>
  *
  *  PdfParser is a pdf library written in PHP, extraction oriented.