php 8.4 compatibility

marcing · marcing · commit c234e7044a26 · 2025-04-10T18:49:35.000+02:00
diff --git a/PHPUnit/Extensions/PhptTestCase.php b/PHPUnit/Extensions/PhptTestCase.php
@@ -119,7 +119,7 @@ public function count()
      * @param  array                        $options
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL, array $options = array())
+    public function run(?PHPUnit_Framework_TestResult $result = NULL, array $options = array())
     {
         if (!class_exists('PEAR_RunTest', FALSE)) {
             throw new PHPUnit_Framework_Exception('Class PEAR_RunTest not found.');
diff --git a/PHPUnit/Extensions/RepeatedTest.php b/PHPUnit/Extensions/RepeatedTest.php
@@ -129,7 +129,7 @@ public function count()
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(?PHPUnit_Framework_TestResult $result = NULL)
     {
         if ($result === NULL) {
             $result = $this->createResult();
diff --git a/PHPUnit/Extensions/TestDecorator.php b/PHPUnit/Extensions/TestDecorator.php
@@ -137,7 +137,7 @@ public function getTest()
      * @param  PHPUnit_Framework_TestResult $result
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(?PHPUnit_Framework_TestResult $result = NULL)
     {
         if ($result === NULL) {
             $result = $this->createResult();
diff --git a/PHPUnit/Framework/Constraint.php b/PHPUnit/Framework/Constraint.php
@@ -126,7 +126,7 @@ public function count()
      * @param  PHPUnit_Framework_ComparisonFailure $comparisonFailure
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    protected function fail($other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)
+    protected function fail($other, $description, ?PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)
     {
         $failureDescription = sprintf(
           'Failed asserting that %s.',
diff --git a/PHPUnit/Framework/Error.php b/PHPUnit/Framework/Error.php
@@ -65,7 +65,7 @@ class PHPUnit_Framework_Error extends Exception
      * @param  integer    $line
      * @param  Exception  $previous
      */
-    public function __construct($message, $code, $file, $line, Exception $previous = NULL)
+    public function __construct($message, $code, $file, $line, ?Exception $previous = NULL)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/PHPUnit/Framework/ExpectationFailedException.php b/PHPUnit/Framework/ExpectationFailedException.php
@@ -65,7 +65,7 @@ class PHPUnit_Framework_ExpectationFailedException extends PHPUnit_Framework_Ass
      */
     protected $comparisonFailure;
 
-    public function __construct($message, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL, Exception $previous = NULL)
+    public function __construct($message, ?PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL, ?Exception $previous = NULL)
     {
         $this->comparisonFailure = $comparisonFailure;
 
diff --git a/PHPUnit/Framework/Test.php b/PHPUnit/Framework/Test.php
@@ -62,5 +62,5 @@ interface PHPUnit_Framework_Test extends Countable
      * @param  PHPUnit_Framework_TestResult $result
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL);
+    public function run(?PHPUnit_Framework_TestResult $result = NULL);
 }
diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -676,7 +676,7 @@ public function hasFailed()
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(?PHPUnit_Framework_TestResult $result = NULL)
     {
         if ($result === NULL) {
             $result = $this->createResult();
diff --git a/PHPUnit/Framework/TestResult.php b/PHPUnit/Framework/TestResult.php
@@ -582,7 +582,7 @@ public function run(PHPUnit_Framework_Test $test)
         if ($this->convertErrorsToExceptions) {
             $oldErrorHandler = set_error_handler(
               array('PHPUnit_Util_ErrorHandler', 'handleError'),
-              E_ALL | E_STRICT
+              E_ALL
             );
 
             if ($oldErrorHandler === NULL) {
diff --git a/PHPUnit/Framework/TestSuite.php b/PHPUnit/Framework/TestSuite.php
@@ -625,7 +625,7 @@ public function getGroups()
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
+    public function run(?PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
     {
         if ($result === NULL) {
             $result = $this->createResult();
diff --git a/PHPUnit/TextUI/TestRunner.php b/PHPUnit/TextUI/TestRunner.php
@@ -86,7 +86,7 @@ class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
      * @param PHP_CodeCoverage_Filter        $filter
      * @since Method available since Release 3.4.0
      */
-    public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = NULL, PHP_CodeCoverage_Filter $filter = NULL)
+    public function __construct(?PHPUnit_Runner_TestSuiteLoader $loader = NULL, ?PHP_CodeCoverage_Filter $filter = NULL)
     {
         if ($filter === NULL) {
             $filter = new PHP_CodeCoverage_Filter;
diff --git a/PHPUnit/Util/ErrorHandler.php b/PHPUnit/Util/ErrorHandler.php
@@ -99,7 +99,7 @@ public static function handleError($errno, $errstr, $errfile, $errline)
             }
         }
 
-        if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) {
+        if ($errno == E_NOTICE || $errno == E_USER_NOTICE) {
             if (PHPUnit_Framework_Error_Notice::$enabled !== TRUE) {
                 return FALSE;
             }
diff --git a/PHPUnit/Util/GlobalState.php b/PHPUnit/Util/GlobalState.php
@@ -343,7 +343,7 @@ public static function restoreStaticAttributes()
             foreach ($staticAttributes as $name => $value) {
                 $reflector = new ReflectionProperty($className, $name);
                 $reflector->setAccessible(TRUE);
-                $reflector->setValue(unserialize($value));
+                $reflector->setValue(null, unserialize($value));
             }
         }
 
diff --git a/README.md b/README.md
@@ -4,3 +4,9 @@ This version of PHPUnit bases on release 3.7.38 and is adjusted for compatibilit
 The package was created especially for testing https://github.com/zf1s packages.
 
 All credits go to original PHPUnit author and contributors.
+
+### Running tests
+Run all tests:  
+```
+php phpunit.php --color --stop-on-error --stop-on-failure --stop-on-incomplete
+```
diff --git a/Tests/Framework/AssertTest.php b/Tests/Framework/AssertTest.php
@@ -66,6 +66,7 @@
 class Framework_AssertTest extends PHPUnit_Framework_TestCase
 {
     protected $filesDirectory;
+    protected $html;
 
     protected function setUp()
     {
diff --git a/Tests/_files/DoubleTestCase.php b/Tests/_files/DoubleTestCase.php
@@ -14,7 +14,7 @@ public function count()
         return 2;
     }
 
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(?PHPUnit_Framework_TestResult $result = NULL)
     {
         $result->startTest($this);
 
diff --git a/composer.json b/composer.json
@@ -25,12 +25,6 @@
     "support": {
         "issues": "https://github.com/zf1s/phpunit/issues"
     },
-    "repositories": [
-        {
-            "type": "pear",
-            "url": "https://pear.php.net"
-        }
-    ],
     "require": {
         "php": ">=5.3.3",
         "phpunit/php-text-template": "^1.2.1",
@@ -44,10 +38,8 @@
         "ext-json": "*",
         "ext-pcre": "*",
         "ext-reflection": "*",
-        "ext-spl": "*"
-    },
-    "require-dev": {
-        "pear-pear.php.net/pear": "~1.9|~1.10"
+        "ext-spl": "*",
+        "pear/pear": "^1.10"
     },
     "suggest": {
         "phpunit/php-invoker": "~1.1"

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function count()`
`119`	`119`	`* @param array $options`
`120`	`120`	`* @return PHPUnit_Framework_TestResult`
`121`	`121`	`*/`
`122`		`- public function run(PHPUnit_Framework_TestResult $result = NULL, array $options = array())`
	`122`	`+ public function run(?PHPUnit_Framework_TestResult $result = NULL, array $options = array())`
`123`	`123`	`{`
`124`	`124`	`if (!class_exists('PEAR_RunTest', FALSE)) {`
`125`	`125`	`throw new PHPUnit_Framework_Exception('Class PEAR_RunTest not found.');`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function count()`
`129`	`129`	`* @return PHPUnit_Framework_TestResult`
`130`	`130`	`* @throws PHPUnit_Framework_Exception`
`131`	`131`	`*/`
`132`		`- public function run(PHPUnit_Framework_TestResult $result = NULL)`
	`132`	`+ public function run(?PHPUnit_Framework_TestResult $result = NULL)`
`133`	`133`	`{`
`134`	`134`	`if ($result === NULL) {`
`135`	`135`	`$result = $this->createResult();`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function getTest()`
`137`	`137`	`* @param PHPUnit_Framework_TestResult $result`
`138`	`138`	`* @return PHPUnit_Framework_TestResult`
`139`	`139`	`*/`
`140`		`- public function run(PHPUnit_Framework_TestResult $result = NULL)`
	`140`	`+ public function run(?PHPUnit_Framework_TestResult $result = NULL)`
`141`	`141`	`{`
`142`	`142`	`if ($result === NULL) {`
`143`	`143`	`$result = $this->createResult();`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function count()`
`126`	`126`	`* @param PHPUnit_Framework_ComparisonFailure $comparisonFailure`
`127`	`127`	`* @throws PHPUnit_Framework_ExpectationFailedException`
`128`	`128`	`*/`
`129`		`- protected function fail($other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)`
	`129`	`+ protected function fail($other, $description, ?PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)`
`130`	`130`	`{`
`131`	`131`	`$failureDescription = sprintf(`
`132`	`132`	`'Failed asserting that %s.',`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class PHPUnit_Framework_Error extends Exception`
`65`	`65`	`* @param integer $line`
`66`	`66`	`* @param Exception $previous`
`67`	`67`	`*/`
`68`		`- public function __construct($message, $code, $file, $line, Exception $previous = NULL)`
	`68`	`+ public function __construct($message, $code, $file, $line, ?Exception $previous = NULL)`
`69`	`69`	`{`
`70`	`70`	`parent::__construct($message, $code, $previous);`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,5 @@ interface PHPUnit_Framework_Test extends Countable`
`62`	`62`	`* @param PHPUnit_Framework_TestResult $result`
`63`	`63`	`* @return PHPUnit_Framework_TestResult`
`64`	`64`	`*/`
`65`		`- public function run(PHPUnit_Framework_TestResult $result = NULL);`
	`65`	`+ public function run(?PHPUnit_Framework_TestResult $result = NULL);`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,7 @@ public function hasFailed()`
`676`	`676`	`* @return PHPUnit_Framework_TestResult`
`677`	`677`	`* @throws PHPUnit_Framework_Exception`
`678`	`678`	`*/`
`679`		`- public function run(PHPUnit_Framework_TestResult $result = NULL)`
	`679`	`+ public function run(?PHPUnit_Framework_TestResult $result = NULL)`
`680`	`680`	`{`
`681`	`681`	`if ($result === NULL) {`
`682`	`682`	`$result = $this->createResult();`
Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ public function getGroups()`
`625`	`625`	`* @return PHPUnit_Framework_TestResult`
`626`	`626`	`* @throws PHPUnit_Framework_Exception`
`627`	`627`	`*/`
`628`		`- public function run(PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)`
	`628`	`+ public function run(?PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)`
`629`	`629`	`{`
`630`	`630`	`if ($result === NULL) {`
`631`	`631`	`$result = $this->createResult();`