Merge pull request #10 from nanasess/fix-final-private

PHP8-RC1 support
php5friends · Oct 17, 2020 · b9db698 · b9db698
2 parents dd7ca37 + d9b2ad6
commit b9db698
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -966,10 +966,11 @@ protected function runTest()
             $this->fail($e->getMessage());
         }
 
+        $testArguments = array_merge($this->data, $this->dependencyInput);
         try {
             $testResult = $method->invokeArgs(
                 $this,
-                array_merge($this->data, $this->dependencyInput)
+                array_values($testArguments)
             );
         } catch (Throwable $_e) {
             $e = $_e;

diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -162,7 +162,7 @@ protected function __construct($filename)
     /**
      * @since  Method available since Release 3.4.0
      */
-    final private function __clone()
+    private function __clone()
     {
     }
 

diff --git a/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php b/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
@@ -42,9 +42,13 @@ public function testDetermineJsonError($expected, $error, $prefix)
 
     public static function determineJsonErrorDataprovider()
     {
+        $unknown_error = null;
+        if (PHP_VERSION_ID >= 80000) {
+            $unknown_error = 'Unknown error';
+        }
         return array(
             'JSON_ERROR_NONE'  => array(
-                null, 'json_error_none', ''
+                $unknown_error, 'json_error_none', ''
             ),
             'JSON_ERROR_DEPTH' => array(
                 'Maximum stack depth exceeded', JSON_ERROR_DEPTH, ''

diff --git a/tests/Framework/ConstraintTest.php b/tests/Framework/ConstraintTest.php
@@ -2882,7 +2882,12 @@ public function testConstraintArrayContainsCheckForObjectIdentity()
         // Default case.
         $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
 
-        $this->assertTrue($constraint->evaluate(array(0), '', true));
+        if (PHP_VERSION_ID >= 80000) {
+            // see https://wiki.php.net/rfc/string_to_number_comparison
+            $this->assertFalse($constraint->evaluate(array(0), '', true));
+        } else {
+            $this->assertTrue($constraint->evaluate(array(0), '', true));
+        }
         $this->assertTrue($constraint->evaluate(array(true), '', true));
     }
 

diff --git a/tests/Regression/GitHub/873-php7.phpt b/tests/Regression/GitHub/873-php7.phpt
@@ -2,7 +2,7 @@
 GH-873: PHPUnit suppresses exceptions thrown outside of test case function
 --SKIPIF--
 <?php
-if (PHP_MAJOR_VERSION < 7) {
+if (PHP_MAJOR_VERSION != 7) {
     print 'skip: PHP 7 is required';
 }
 ?>

diff --git a/tests/TextUI/fatal-isolation.phpt b/tests/TextUI/fatal-isolation.phpt
@@ -1,5 +1,8 @@
 --TEST--
 phpunit FatalTest --process-isolation ../_files/FatalTest.php
+--SKIPIF--
+<?php
+if (PHP_VERSION_ID >= 80000) die('Skipped: xdebug_disable() is obsolete in PHP8 or later'); ?>
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';

diff --git a/tests/_files/FatalTest.php b/tests/_files/FatalTest.php
@@ -4,7 +4,7 @@ class FatalTest extends PHPUnit_Framework_TestCase
 {
     public function testFatalError()
     {
-        if (extension_loaded('xdebug')) {
+        if (extension_loaded('xdebug') && function_exists('xdebug_disable')) {
             xdebug_disable();
         }
 

diff --git a/tests/_files/Singleton.php b/tests/_files/Singleton.php
@@ -7,7 +7,7 @@ protected function __construct()
     {
     }
 
-    final private function __clone()
+    private function __clone()
     {
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -162,7 +162,7 @@ protected function __construct($filename) @@
         /**
          * @since  Method available since Release 3.4.0
          */
-        final private function __clone()
+        private function __clone()
         {
         }
@@ Expand Down @@