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

Author: partikus

.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

.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

PHPUnit/Extensions/PhptTestCase.php

@@ -106,6 +106,7 @@ public function __construct($filename, array $options = array())
      *
      * @return integer
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 1;

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);

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);

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;

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;

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);

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;

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);