Merge pull request #9 from zf1s/Make_Php_8.1_Compatiable

zf1s · Oct 10, 2022 · 253f4b3 · 253f4b3
2 parents c0bc7ab + 7bcaf94
commit 253f4b3
Show file tree

Hide file tree

Showing 141 changed files with 9,941 additions and 46 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,13 +8,11 @@ on:
 
 jobs:
   test:
-    name: PHP:${{ matrix.php }} PHP_INVOKER:${{ toJSON(matrix.php_invoker) }} ALLOW_FAILURES:${{ toJSON(matrix.experimental) }} COVERAGE:${{ toJSON(matrix.coverage) }}
+    name: PHP:${{ matrix.php }} php-invoker:${{ toJSON(matrix.php_invoker) }}${{ matrix.coverage && ' (with coverage)' || '' }}${{ matrix.experimental && ' (allowing failures - php version not supported yet)' || '' }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        experimental: [false]
-        coverage: [false]
         php:
           - "5.3"
           - "5.4"
@@ -24,32 +22,20 @@ jobs:
           - "7.1"
           - "7.2"
           - "7.3"
-        php_invoker:
-          - true
-          - false
+          - "8.0"
+          - "8.1"
+          - "8.2"
+        php_invoker: [true, false]
+        coverage: [false]
+        experimental: [false]
         include:
-          - php: "7.4"
-            php_invoker: true
-            coverage: true
+          # run coverage only on PHP 7.4
           - php: "7.4"
             php_invoker: false
             coverage: true
-          - php: "8.0"
-            php_invoker: true
-            experimental: false
-            coverage: false
-          - php: "8.0"
-            php_invoker: false
-            coverage: false
-            experimental: false
-          - php: "8.1"
+          - php: "7.4"
             php_invoker: true
-            experimental: true
-            coverage: false
-          - php: "8.1"
-            php_invoker: false
-            experimental: true
-            coverage: false
+            coverage: true
 
     steps:
       - name: Checkout Code

diff --git a/.gitignore b/.gitignore
@@ -12,9 +12,9 @@ Tests/TextUI/*.log
 Tests/TextUI/*.out
 Tests/TextUI/*.php
 /bin
-/vendor
-/composer.lock
-/composer.phar
+vendor
+composer.lock
+composer.phar
 phpunit.xml
 cache.properties
 .idea
diff --git a/PHPUnit/Extensions/PhptTestCase.php b/PHPUnit/Extensions/PhptTestCase.php
@@ -106,6 +106,7 @@ public function __construct($filename, array $options = array())
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 1;

diff --git a/PHPUnit/Extensions/RepeatedTest.php b/PHPUnit/Extensions/RepeatedTest.php
@@ -115,6 +115,7 @@ public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $fil
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->timesRepeat * count($this->test);

diff --git a/PHPUnit/Extensions/TestDecorator.php b/PHPUnit/Extensions/TestDecorator.php
@@ -104,6 +104,7 @@ public function basicRun(PHPUnit_Framework_TestResult $result)
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->test);

diff --git a/PHPUnit/Framework/Constraint.php b/PHPUnit/Framework/Constraint.php
@@ -112,6 +112,7 @@ protected function matches($other)
      * @return integer
      * @since  Method available since Release 3.4.0
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 1;

diff --git a/PHPUnit/Framework/Constraint/And.php b/PHPUnit/Framework/Constraint/And.php
@@ -151,6 +151,7 @@ public function toString()
      * @return integer
      * @since  Method available since Release 3.4.0
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         $count = 0;

diff --git a/PHPUnit/Framework/Constraint/Composite.php b/PHPUnit/Framework/Constraint/Composite.php
@@ -107,6 +107,7 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->innerConstraint);

diff --git a/PHPUnit/Framework/Constraint/IsAnything.php b/PHPUnit/Framework/Constraint/IsAnything.php
@@ -95,6 +95,7 @@ public function toString()
      * @return integer
      * @since  Method available since Release 3.5.0
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 0;

diff --git a/PHPUnit/Framework/Constraint/Not.php b/PHPUnit/Framework/Constraint/Not.php
@@ -196,6 +196,7 @@ public function toString()
      * @return integer
      * @since  Method available since Release 3.4.0
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->constraint);

diff --git a/PHPUnit/Framework/Constraint/Or.php b/PHPUnit/Framework/Constraint/Or.php
@@ -144,6 +144,7 @@ public function toString()
      * @return integer
      * @since  Method available since Release 3.4.0
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         $count = 0;

diff --git a/PHPUnit/Framework/Constraint/Xor.php b/PHPUnit/Framework/Constraint/Xor.php
@@ -149,6 +149,7 @@ public function toString()
      * @return integer
      * @since  Method available since Release 3.4.0
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         $count = 0;

diff --git a/PHPUnit/Framework/TestCase.php b/PHPUnit/Framework/TestCase.php
@@ -328,6 +328,7 @@ public function toString()
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 1;

diff --git a/PHPUnit/Framework/TestResult.php b/PHPUnit/Framework/TestResult.php
@@ -729,6 +729,7 @@ public function run(PHPUnit_Framework_Test $test)
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->runTests;

diff --git a/PHPUnit/Framework/TestSuite.php b/PHPUnit/Framework/TestSuite.php
@@ -422,6 +422,7 @@ public function addTestFiles($filenames)
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         if ($this->numTests > -1) {
@@ -925,6 +926,7 @@ public function setBackupStaticAttributes($backupStaticAttributes)
      * @return RecursiveIteratorIterator
      * @since  Method available since Release 3.1.0
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new RecursiveIteratorIterator(

diff --git a/PHPUnit/Util/Configuration.php b/PHPUnit/Util/Configuration.php
@@ -538,8 +538,10 @@ public function handlePHPConfiguration()
             // See https://github.com/sebastianbergmann/phpunit/issues/277
             switch ($array) {
                 case 'var':
-                    $target = &$GLOBALS;
-                    break;
+                    foreach ($configuration[$array] as $name => $value) {
+                        $GLOBALS[$name] = $value;
+                    }
+                    continue 2;
 
                 case 'env':
                     $target = &$_ENV;
@@ -550,8 +552,10 @@ public function handlePHPConfiguration()
                     break;
 
                 default:
-                    $target = &$GLOBALS['_' . strtoupper($array)];
-                    break;
+                    foreach ($configuration[$array] as $name => $value) {
+                        $GLOBALS['_' . strtoupper($array)][$name] = $value;
+                    }
+                    continue 2;
             }
 
             foreach ($configuration[$array] as $name => $value) {

diff --git a/PHPUnit/Util/Getopt.php b/PHPUnit/Util/Getopt.php
@@ -181,7 +181,7 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args)
 
             if (substr($long_opt, -1) == '=') {
                 if (substr($long_opt, -2) != '==') {
-                    if (!strlen($opt_arg)) {
+                    if ($opt_arg === null || !strlen($opt_arg)) {
                         if (false === $opt_arg = current($args)) {
                             throw new PHPUnit_Framework_Exception(
                                 "option --$opt requires an argument"

diff --git a/PHPUnit/Util/TestSuiteIterator.php b/PHPUnit/Util/TestSuiteIterator.php
@@ -80,6 +80,7 @@ public function __construct(PHPUnit_Framework_TestSuite $testSuite)
      * Rewinds the Iterator to the first element.
      *
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->position = 0;
@@ -90,6 +91,7 @@ public function rewind()
      *
      * @return boolean
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->position < count($this->tests);
@@ -100,6 +102,7 @@ public function valid()
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
@@ -110,6 +113,7 @@ public function key()
      *
      * @return PHPUnit_Framework_Test
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->valid() ? $this->tests[$this->position] : NULL;
@@ -119,6 +123,7 @@ public function current()
      * Moves forward to next element.
      *
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         $this->position++;

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# PHPUnit 3.7.x php 5.3-8.0 compatible
+# PHPUnit 3.7.x php 5.3-8.2 compatible
 
-This version of PHPUnit bases on release 3.7.38 and is adjusted for compatibility with PHP 5.3-8.0.
+This version of PHPUnit bases on release 3.7.38 and is adjusted for compatibility with PHP 5.3-8.2.
 The package was created especially for testing https://github.com/zf1s packages.
 
 All credits go to original PHPUnit author and contributors.
diff --git a/Tests/_files/DoubleTestCase.php b/Tests/_files/DoubleTestCase.php
@@ -8,6 +8,7 @@ public function __construct(PHPUnit_Framework_TestCase $testCase)
         $this->testCase = $testCase;
     }
 
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 2;

diff --git a/Tests/_files/SampleArrayAccess.php b/Tests/_files/SampleArrayAccess.php
@@ -13,19 +13,23 @@ class SampleArrayAccess implements ArrayAccess
     public function __construct() {
         $this->container = array();
     }
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value) {
         if (is_null($offset)) {
             $this->container[] = $value;
         } else {
             $this->container[$offset] = $value;
         }
     }
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset) {
         return isset($this->container[$offset]);
     }
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset) {
         unset($this->container[$offset]);
     }
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset) {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }

diff --git a/Tests/_files/TestIterator.php b/Tests/_files/TestIterator.php
@@ -9,26 +9,31 @@ public function __construct($array = array())
         $this->array = $array;
     }
 
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->position = 0;
     }
 
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return $this->position < count($this->array);
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->array[$this->position];
     }
 
+    #[\ReturnTypeWillChange]
     public function next()
     {
         $this->position++;

diff --git a/Tests/_files/TestIterator2.php b/Tests/_files/TestIterator2.php
@@ -8,26 +8,31 @@ public function __construct(array $array)
         $this->data = $array;
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function next()
     {
         next($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return key($this->data) !== null;
     }
 
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->data);