Updated to php8.0

.github/workflows/tests.yml

@@ -22,6 +22,34 @@ jobs:
       - name: Install dependencies
         run: composer update --dev --no-interaction --prefer-dist --no-progress --no-suggest --ansi
 
+      - name: Run phpunit
+        run: |
+          ./vendor/bin/phpunit
+
+  testsPhp8:
+    name: Run PHP Unit tests (>= 8.0)
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        php: ['8.0']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install mupdf and imagemagick
+        run: sudo apt-get install mupdf-tools imagemagick
+
+      - name: Install php
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php }}"
+
+      - name: Upgrade phpunit
+        run: composer require --dev --with-all-dependencies "phpunit/phpunit=^9.0"
+
+      - name: Install dependencies
+        run: composer update --dev --no-interaction --prefer-dist --no-progress --no-suggest --ansi
+
       - name: Run phpunit
         run: |
           ./vendor/bin/phpunit

.gitignore

@@ -1,4 +1,5 @@
 vendor
 /phpstan.phar
 /composer.phar
-/tests/visual/**/compare/
+/tests/visual/**/compare/
+/**/.phpunit.result.cache

composer.json

@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
+        "php": "^5.6 || ^7.0 || ^8.0",
         "ext-zlib": "*"
     },
     "conflict": {

phpunit.xml

@@ -1,12 +1,13 @@
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./tests/bootstrap.php">
     <php>
         <!--Path to the autoload file that should be used. Use a composer autoloader by default-->
@@ -26,10 +27,4 @@
             <directory>./tests/visual</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
 </phpunit>

tests/bootstrap.php

@@ -1,6 +1,11 @@
 <?php
 
-error_reporting(E_ALL);
+if (version_compare(PHP_VERSION, '8.0', '>=')) {
+    // required for tcpdf
+    error_reporting(E_ALL & ~E_DEPRECATED);
+} else {
+    error_reporting(E_ALL);
+}
 ini_set('display_errors', 1);
 
 // if in travis scope

tests/functional/FpdfTplTest.php

@@ -66,23 +66,19 @@ public function testGetTemplateSizeResizedByHeight()
         ], $size);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testGetTemplateSizeWithZeroWidth()
     {
         $pdf = new FpdfTpl();
         $tplId = $pdf->beginTemplate(100, 200);
+        $this->expectException(\InvalidArgumentException::class);
         $pdf->getTemplateSize($tplId, 0);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testGetTemplateSizeWithZeroHeight()
     {
         $pdf = new FpdfTpl();
         $tplId = $pdf->beginTemplate(100, 200);
+        $this->expectException(\InvalidArgumentException::class);
         $pdf->getTemplateSize($tplId, null, 0);
     }
 

tests/functional/FpdiTest.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use setasign\Fpdi\Fpdi;
+use setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException;
 use setasign\Fpdi\PdfParser\PdfParser;
 use setasign\Fpdi\PdfParser\StreamReader;
 use setasign\Fpdi\PdfParser\Type\PdfNull;
@@ -81,13 +82,11 @@ public function testImportedPageInTemplate()
         $this->assertEquals($expectedStream, $tplAObject->getUnfilteredStream());
     }
 
-    /**
-     * @expectedException \setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException
-     * @expectedExceptionCode \setasign\Fpdi\PdfParser\CrossReference\CrossReferenceException::COMPRESSED_XREF
-     */
     public function testBehaviourOnCompressedXref()
     {
         $pdf = new Fpdi('P', 'pt');
+        $this->expectException(CrossReferenceException::class);
+        $this->expectExceptionCode(CrossReferenceException::COMPRESSED_XREF);
         $pdf->setSourceFile(__DIR__ . '/../_files/pdfs/compressed-xref.pdf');
     }
 

tests/functional/FpdiTraitTest.php

@@ -67,23 +67,19 @@ public function testGetTemplateSizeResizedByHeight()
         ], $size);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testGetTemplateSizeWithZeroWidth()
     {
         $pdf = new Fpdi();
         $pdf->setSourceFile(__DIR__ . '/../_files/pdfs/boxes/All2.pdf');
+        $this->expectException(\InvalidArgumentException::class);
         $pdf->getTemplateSize($pdf->importPage(1), 0);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testGetTemplateSizeWithZeroHeight()
     {
         $pdf = new Fpdi();
         $pdf->setSourceFile(__DIR__ . '/../_files/pdfs/boxes/All2.pdf');
+        $this->expectException(\InvalidArgumentException::class);
         $pdf->getTemplateSize($pdf->importPage(1), null, 0);
     }
 
@@ -141,13 +137,11 @@ public function testImportPageWithSameMeaningBoxParameters()
         $this->assertEquals($idA, $idB);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testImportPageWithInvalidBoxParameter()
     {
         $pdf = new Fpdi();
         $pdf->setSourceFile(__DIR__ . '/../_files/pdfs/boxes/All2.pdf');
+        $this->expectException(\InvalidArgumentException::class);
         $pdf->importPage(1, 'CropsBox');
     }
 }