PHP 8.4 compatibility: Fixes "Creation of dynamic property is deprecated", removes E_STRICT, sets PHP 7.1 as minimum version

marcing · marcing · commit 89d1bebabd64 · 2025-04-10T20:05:53.000+02:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,17 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - "5.3"
-          - "5.4"
-          - "5.5"
-          - "5.6"
-          - "7.0"
           - "7.1"
           - "7.2"
           - "7.3"
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         php_invoker: [true, false]
         coverage: [false]
         experimental: [false]
diff --git a/PHPUnit/Extensions/PhptTestCase.php b/PHPUnit/Extensions/PhptTestCase.php
@@ -115,11 +115,11 @@ public function count()
     /**
      * Runs a test and collects its result in a TestResult instance.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  ?PHPUnit_Framework_TestResult $result
      * @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
@@ -125,11 +125,11 @@ public function count()
      * Runs the decorated test and collects the
      * result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  ?PHPUnit_Framework_TestResult $result
      * @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
@@ -134,10 +134,10 @@ public function getTest()
      * Runs the decorated test and collects the
      * result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @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
@@ -123,10 +123,10 @@ public function count()
      *
      * @param  mixed $other Evaluated value or object.
      * @param  string $description Additional information about the test
-     * @param  PHPUnit_Framework_ComparisonFailure $comparisonFailure
+     * @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
@@ -63,9 +63,9 @@ class PHPUnit_Framework_Error extends Exception
      * @param  integer    $code
      * @param  string     $file
      * @param  integer    $line
-     * @param  Exception  $previous
+     * @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
@@ -59,8 +59,8 @@ interface PHPUnit_Framework_Test extends Countable
     /**
      * Runs a test and collects its result in a TestResult instance.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @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
@@ -672,11 +672,11 @@ public function hasFailed()
      * Runs the test case and collects the results in a TestResult object.
      * If no TestResult object is passed a new one will be created.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  ?PHPUnit_Framework_TestResult $result
      * @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
@@ -617,15 +617,15 @@ public function getGroups()
     /**
      * Runs the tests and collects their result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  ?PHPUnit_Framework_TestResult $result
      * @param  mixed                        $filter
      * @param  array                        $groups
      * @param  array                        $excludeGroups
      * @param  boolean                      $processIsolation
      * @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
@@ -82,11 +82,11 @@ class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
     protected static $versionStringPrinted = FALSE;
 
     /**
-     * @param PHPUnit_Runner_TestSuiteLoader $loader
-     * @param PHP_CodeCoverage_Filter        $filter
+     * @param ?PHPUnit_Runner_TestSuiteLoader $loader
+     * @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/PHPUnit/Util/PHP.php b/PHPUnit/Util/PHP.php
@@ -154,12 +154,12 @@ public static function factory()
      * Runs a single job (PHP code) using a separate PHP process.
      *
      * @param  string                       $job
-     * @param  PHPUnit_Framework_TestCase   $test
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param  ?PHPUnit_Framework_TestCase   $test
+     * @param  ?PHPUnit_Framework_TestResult $result
      * @return array|null
      * @throws PHPUnit_Framework_Exception
      */
-    public function runJob($job, PHPUnit_Framework_Test $test = NULL, PHPUnit_Framework_TestResult $result = NULL)
+    public function runJob($job, ?PHPUnit_Framework_Test $test = NULL, ?PHPUnit_Framework_TestResult $result = NULL)
     {
         $process = proc_open(
           $this->getPhpBinary(),
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,14 +25,8 @@
     "support": {
         "issues": "https://github.com/zf1s/phpunit/issues"
     },
-    "repositories": [
-        {
-            "type": "pear",
-            "url": "https://pear.php.net"
-        }
-    ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=7.1",
         "phpunit/php-text-template": "^1.2.1",
         "phpunit/phpunit-mock-objects": "^1.2.3",
         "phpunit/php-file-iterator": "^1.4.5",
@@ -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
`@@ -115,11 +115,11 @@ public function count()`
`115`	`115`	`/**`
`116`	`116`	`* Runs a test and collects its result in a TestResult instance.`
`117`	`117`	`*`
`118`		`- * @param PHPUnit_Framework_TestResult $result`
	`118`	`+ * @param ?PHPUnit_Framework_TestResult $result`
`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
`@@ -125,11 +125,11 @@ public function count()`
`125`	`125`	`* Runs the decorated test and collects the`
`126`	`126`	`* result in a TestResult.`
`127`	`127`	`*`
`128`		`- * @param PHPUnit_Framework_TestResult $result`
	`128`	`+ * @param ?PHPUnit_Framework_TestResult $result`
`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
`@@ -134,10 +134,10 @@ public function getTest()`
`134`	`134`	`* Runs the decorated test and collects the`
`135`	`135`	`* result in a TestResult.`
`136`	`136`	`*`
`137`		`- * @param PHPUnit_Framework_TestResult $result`
	`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
`@@ -123,10 +123,10 @@ public function count()`
`123`	`123`	`*`
`124`	`124`	`* @param mixed $other Evaluated value or object.`
`125`	`125`	`* @param string $description Additional information about the test`
`126`		`- * @param PHPUnit_Framework_ComparisonFailure $comparisonFailure`
	`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_ExpectationFailedException extends PHPUnit_Framework_Ass`
`65`	`65`	`*/`
`66`	`66`	`protected $comparisonFailure;`
`67`	`67`
`68`		`- public function __construct($message, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL, Exception $previous = NULL)`
	`68`	`+ public function __construct($message, ?PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL, ?Exception $previous = NULL)`
`69`	`69`	`{`
`70`	`70`	`$this->comparisonFailure = $comparisonFailure;`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ interface PHPUnit_Framework_Test extends Countable`
`59`	`59`	`/**`
`60`	`60`	`* Runs a test and collects its result in a TestResult instance.`
`61`	`61`	`*`
`62`		`- * @param PHPUnit_Framework_TestResult $result`
	`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
`@@ -672,11 +672,11 @@ public function hasFailed()`
`672`	`672`	`* Runs the test case and collects the results in a TestResult object.`
`673`	`673`	`* If no TestResult object is passed a new one will be created.`
`674`	`674`	`*`
`675`		`- * @param PHPUnit_Framework_TestResult $result`
	`675`	`+ * @param ?PHPUnit_Framework_TestResult $result`
`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();`