Fixes failing tests; reorganized test files (PHPUnit 10.x related)

.github/workflows/continuous-integration.yml

@@ -165,7 +165,7 @@ jobs:
           coverage: "none"
 
       - name: "Test alt-autoload"
-        run: "php tests/AltAutoloadTest.php"
+        run: "php tests/AltAutoloading/AltAutoloadCheck.php"
 
   phpunit-lowest:
     name: "PHPUnit lowest deps (PHP ${{ matrix.php }})"

.gitignore

@@ -8,4 +8,5 @@
 debug*
 composer.lock
 /.php-cs-fixer.cache
+/.phpunit.cache
 /.phpunit.result.cache

composer.json

@@ -27,7 +27,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\Smalot\\PdfParser\\": "tests/"
+            "PerformanceTests\\": "tests/Performance/",
+            "PHPUnitTests\\": "tests/PHPUnit/"
         }
     },
     "config": {

dev-tools/composer.json

@@ -4,6 +4,6 @@
         "friendsofphp/php-cs-fixer": "^3",
         "phpstan/phpstan": "^1",
         "phpstan/phpstan-phpunit": "^1",
-        "phpunit/phpunit": ">=7.5"
+        "phpunit/phpunit": ">=7.5 <11.0"
     }
 }

phpunit-windows.xml

@@ -1,36 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Only use this when running in Windows environment! -->
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor\autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="zend.enable_gc" value="0"/>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="display_errors" value="On"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="all">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" backupGlobals="false" bootstrap="vendor\autoload.php" colors="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory>src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <ini name="zend.enable_gc" value="0"/>
+    <ini name="error_reporting" value="-1"/>
+    <ini name="intl.error_level" value="0"/>
+    <ini name="display_errors" value="On"/>
+  </php>
+  <testsuites>
+    <testsuite name="all">
+      <directory>tests/PHPUnit</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

phpunit.xml

@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <ini name="zend.enable_gc" value="0"/>
-        <ini name="error_reporting" value="-1"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="display_errors" value="On"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="all">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory>src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <ini name="zend.enable_gc" value="0"/>
+    <ini name="error_reporting" value="-1"/>
+    <ini name="intl.error_level" value="0"/>
+    <ini name="display_errors" value="On"/>
+  </php>
+  <testsuites>
+    <testsuite name="all">
+      <directory>tests/PHPUnit</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

tests/AltAutoloadTest.php → tests/AltAutoloading/AltAutoloadCheck.php

@@ -28,11 +28,11 @@
  *  along with this program.
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
-require __DIR__.'/../alt_autoload.php-dist';
+require __DIR__.'/../../alt_autoload.php-dist';
 
 $parser = new Smalot\PdfParser\Parser();
 
-$filename = __DIR__.'/../samples/InternationalChars.pdf';
+$filename = __DIR__.'/../../samples/InternationalChars.pdf';
 $document = $parser->parseFile($filename);
 
 $needle = 'Лорем ипсум долор сит амет, еу сед либрис долорем инцоррупте.';

tests/Integration/ConfigTest.php → tests/PHPUnit/Integration/ConfigTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration;
+namespace PHPUnitTests\Integration;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Config;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ConfigTest extends TestCase
 {

tests/Integration/DocumentTest.php → tests/PHPUnit/Integration/DocumentTest.php

@@ -33,15 +33,15 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration;
+namespace PHPUnitTests\Integration;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Document;
 use Smalot\PdfParser\Header;
 use Smalot\PdfParser\Page;
 use Smalot\PdfParser\Pages;
 use Smalot\PdfParser\Parser;
 use Smalot\PdfParser\PDFObject;
-use Tests\Smalot\PdfParser\TestCase;
 
 class DocumentTest extends TestCase
 {

tests/Integration/Element/ElementArrayTest.php → tests/PHPUnit/Integration/Element/ElementArrayTest.php

@@ -33,14 +33,14 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Document;
 use Smalot\PdfParser\Element\ElementArray;
 use Smalot\PdfParser\Element\ElementNumeric;
 use Smalot\PdfParser\Header;
 use Smalot\PdfParser\Page;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementArrayTest extends TestCase
 {

tests/Integration/Element/ElementBooleanTest.php → tests/PHPUnit/Integration/Element/ElementBooleanTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementBoolean;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementBooleanTest extends TestCase
 {

tests/Integration/Element/ElementDateTest.php → tests/PHPUnit/Integration/Element/ElementDateTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementDate;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementDateTest extends TestCase
 {

tests/Integration/Element/ElementHexaTest.php → tests/PHPUnit/Integration/Element/ElementHexaTest.php

@@ -33,12 +33,12 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementDate;
 use Smalot\PdfParser\Element\ElementHexa;
 use Smalot\PdfParser\Element\ElementString;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementHexaTest extends TestCase
 {

tests/Integration/Element/ElementMissingTest.php → tests/PHPUnit/Integration/Element/ElementMissingTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementMissing;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementMissingTest extends TestCase
 {

tests/Integration/Element/ElementNameTest.php → tests/PHPUnit/Integration/Element/ElementNameTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementName;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementNameTest extends TestCase
 {

tests/Integration/Element/ElementNullTest.php → tests/PHPUnit/Integration/Element/ElementNullTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementNull;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementNullTest extends TestCase
 {

tests/Integration/Element/ElementNumericTest.php → tests/PHPUnit/Integration/Element/ElementNumericTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementNumeric;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementNumericTest extends TestCase
 {

tests/Integration/Element/ElementStringTest.php → tests/PHPUnit/Integration/Element/ElementStringTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementString;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementStringTest extends TestCase
 {

tests/Integration/Element/ElementStructTest.php → tests/PHPUnit/Integration/Element/ElementStructTest.php

@@ -33,11 +33,11 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementStruct;
 use Smalot\PdfParser\Header;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementStructTest extends TestCase
 {

tests/Integration/Element/ElementXRefTest.php → tests/PHPUnit/Integration/Element/ElementXRefTest.php

@@ -33,10 +33,10 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration\Element;
+namespace PHPUnitTests\Integration\Element;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element\ElementXRef;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementXRefTest extends TestCase
 {

tests/Integration/ElementTest.php → tests/PHPUnit/Integration/ElementTest.php

@@ -33,8 +33,9 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration;
+namespace PHPUnitTests\Integration;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Element;
 use Smalot\PdfParser\Element\ElementArray;
 use Smalot\PdfParser\Element\ElementBoolean;
@@ -45,7 +46,6 @@
 use Smalot\PdfParser\Element\ElementString;
 use Smalot\PdfParser\Element\ElementXRef;
 use Smalot\PdfParser\Header;
-use Tests\Smalot\PdfParser\TestCase;
 
 class ElementTest extends TestCase
 {

tests/Integration/EncodingTest.php → tests/PHPUnit/Integration/EncodingTest.php

@@ -33,16 +33,16 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration;
+namespace PHPUnitTests\Integration;
 
 use Exception;
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Document;
 use Smalot\PdfParser\Element;
 use Smalot\PdfParser\Encoding;
 use Smalot\PdfParser\Encoding\StandardEncoding;
 use Smalot\PdfParser\Exception\EncodingNotFoundException;
 use Smalot\PdfParser\Header;
-use Tests\Smalot\PdfParser\TestCase;
 
 class EncodingTest extends TestCase
 {

tests/Integration/FontTest.php → tests/PHPUnit/Integration/FontTest.php

@@ -33,16 +33,16 @@
  *  If not, see <http://www.pdfparser.org/sites/default/LICENSE.txt>.
  */
 
-namespace Tests\Smalot\PdfParser\Integration;
+namespace PHPUnitTests\Integration;
 
+use PHPUnitTests\TestCase;
 use Smalot\PdfParser\Config;
 use Smalot\PdfParser\Document;
 use Smalot\PdfParser\Element;
 use Smalot\PdfParser\Encoding;
 use Smalot\PdfParser\Font;
 use Smalot\PdfParser\Header;
 use Smalot\PdfParser\PDFObject;
-use Tests\Smalot\PdfParser\TestCase;
 
 class FontTest extends TestCase
 {