Revert to phpunit 9.x.

prwater · prwater · commit c54349d33011 · 2025-06-08T19:56:50.000+02:00
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   },
   "require-dev": {
     "phing/phing": "^3.0.1",
-    "phpunit/phpunit": "^11.5.22"
+    "phpunit/phpunit": "^9.6.23"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         displayDetailsOnTestsThatTriggerDeprecations="true"
-         displayDetailsOnTestsThatTriggerErrors="true"
-         displayDetailsOnTestsThatTriggerNotices="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true">
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <clover outputFile="test/coverage.xml"/>
+      <html outputDirectory="test/report"/>
+    </report>
+  </coverage>
   <testsuites>
-    <testsuite name="default">
+    <testsuite name="Tests">
       <directory>test</directory>
     </testsuite>
   </testsuites>
-
-  <source ignoreIndirectDeprecations="true" restrictNotices="true" restrictWarnings="true">
-    <include>
-      <directory>src</directory>
-    </include>
-  </source>
+  <logging/>
+  <php>
+    <const name="PHPUNIT_ERROR_HANDLER_TEST_SUITE" value="true"/>
+  </php>
 </phpunit>
diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
@@ -28,7 +28,7 @@ class ErrorHandler
   public function handleError(int $errno, string $errstr, ?string $errfile, ?int $errline): bool
   {
     // See https://www.php.net/manual/en/language.operators.errorcontrol.php for the bitwise or expression.
-    if (error_reporting()===(E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE))
+    if (error_reporting()===( E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE))
     {
       // The error was suppressed with the @-operator. Don't throw an exception.
       return false;
diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.php
@@ -101,10 +101,8 @@ public function testWarning(): void
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Test when __toString fails.
-   *
-   * The test gives us some problems with PhpUnit 11.
    */
-  public function xtestToString1(): void
+  public function testToString1(): void
   {
     $tmp = (string)$this;
     self::assertSame('__toString', $tmp);

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class ErrorHandler`
`28`	`28`	`public function handleError(int $errno, string $errstr, ?string $errfile, ?int $errline): bool`
`29`	`29`	`{`
`30`	`30`	`// See https://www.php.net/manual/en/language.operators.errorcontrol.php for the bitwise or expression.`
`31`		`- if (error_reporting()===(E_ERROR \| E_CORE_ERROR \| E_COMPILE_ERROR \| E_USER_ERROR \| E_RECOVERABLE_ERROR \| E_PARSE))`
	`31`	`+ if (error_reporting()===( E_ERROR \| E_CORE_ERROR \| E_COMPILE_ERROR \| E_USER_ERROR \| E_RECOVERABLE_ERROR \| E_PARSE))`
`32`	`32`	`{`
`33`	`33`	`// The error was suppressed with the @-operator. Don't throw an exception.`
`34`	`34`	`return false;`