LogoKolab Groupware OBS > Projects
Log In

View File phpunit-php8.patch of Package php-phpunit-PHPUnit (Project home:mollekopf:branches:Kolab:Winterfell)

diff -up ./PHPUnit/Framework/TestCase.php.php8 ./PHPUnit/Framework/TestCase.php
--- ./PHPUnit/Framework/TestCase.php.php8	2021-03-19 12:29:00.122960437 +0100
+++ ./PHPUnit/Framework/TestCase.php	2021-03-19 12:29:16.926880988 +0100
@@ -1059,7 +1059,7 @@ abstract class PHPUnit_Framework_TestCas
         $this->registerMockObjectsFromTestArguments($testArguments);
 
         try {
-            $testResult = $method->invokeArgs($this, $testArguments);
+            $testResult = $method->invokeArgs($this, array_values($testArguments));
         } catch (Throwable $_e) {
             $e = $_e;
         } catch (Exception $_e) {
diff -up ./PHPUnit/Util/Configuration.php.php8 ./PHPUnit/Util/Configuration.php
--- ./PHPUnit/Util/Configuration.php.php8	2018-02-01 06:50:59.000000000 +0100
+++ ./PHPUnit/Util/Configuration.php	2021-03-19 12:28:10.627194461 +0100
@@ -159,7 +159,7 @@ class PHPUnit_Util_Configuration
         $this->xpath    = new DOMXPath($this->document);
     }
 
-    final private function __clone()
+    private function __clone()
     {
     }
 
diff -up ./tests/_files/Singleton.php.php8 ./tests/_files/Singleton.php
--- ./tests/_files/Singleton.php.php8	2018-02-01 06:50:59.000000000 +0100
+++ ./tests/_files/Singleton.php	2021-03-19 12:28:10.627194461 +0100
@@ -7,7 +7,7 @@ class Singleton
     {
     }
 
-    final private function __clone()
+    private function __clone()
     {
     }
 
diff -up ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php.php8 ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
--- ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php.php8	2018-02-01 06:50:59.000000000 +0100
+++ ./tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php	2021-03-19 12:28:10.627194461 +0100
@@ -39,7 +39,7 @@ class Framework_Constraint_JsonMatches_E
     {
         return [
             'JSON_ERROR_NONE'  => [
-                null, 'json_error_none', ''
+                null, JSON_ERROR_NONE, ''
             ],
             'JSON_ERROR_DEPTH' => [
                 'Maximum stack depth exceeded', JSON_ERROR_DEPTH, ''
diff -up ./tests/Framework/ConstraintTest.php.php8 ./tests/Framework/ConstraintTest.php
--- ./tests/Framework/ConstraintTest.php.php8	2018-02-01 06:50:59.000000000 +0100
+++ ./tests/Framework/ConstraintTest.php	2021-03-19 12:28:10.627194461 +0100
@@ -1233,7 +1233,7 @@ EOF
 
         $this->assertTrue($constraint->evaluate($resource, '', true));
 
-        @fclose($resource);
+        if (is_resource($resource)) @fclose($resource);
     }
 
     public function testConstraintIsNotType()
@@ -2547,7 +2547,6 @@ EOF
         // Default case.
         $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
 
-        $this->assertTrue($constraint->evaluate([0], '', true));
         $this->assertTrue($constraint->evaluate([true], '', true));
     }
 
diff -up ./PHPUnit/Util/Configuration.php.old ./PHPUnit/Util/Configuration.php
--- ./PHPUnit/Util/Configuration.php.old	2021-09-10 07:36:55.786834316 +0200
+++ ./PHPUnit/Util/Configuration.php	2021-09-10 07:38:02.485723035 +0200
@@ -501,21 +501,23 @@ class PHPUnit_Util_Configuration
             // See https://github.com/sebastianbergmann/phpunit/issues/277
             switch ($array) {
                 case 'var':
-                    $target = &$GLOBALS;
+                    foreach ($configuration[$array] as $name => $value) {
+                        $GLOBALS[$name] = $value;
+                    }
                     break;
 
                 case 'server':
-                    $target = &$_SERVER;
+                    foreach ($configuration[$array] as $name => $value) {
+                        $_SERVER[$name] = $value;
+                    }
                     break;
 
                 default:
-                    $target = &$GLOBALS['_' . strtoupper($array)];
+                    foreach ($configuration[$array] as $name => $value) {
+                        $GLOBALS['_' . strtoupper($array)][$name] = $value;
+                    }
                     break;
             }
-
-            foreach ($configuration[$array] as $name => $value) {
-                $target[$name] = $value;
-            }
         }
 
         foreach ($configuration['env'] as $name => $value) {
diff -up ./PHPUnit/Util/PHP/Template/TestCaseMethod.tpl.dist.old ./PHPUnit/Util/PHP/Template/TestCaseMethod.tpl.dist
--- ./PHPUnit/Util/PHP/Template/TestCaseMethod.tpl.dist.old	2021-09-10 07:43:43.165206553 +0200
+++ ./PHPUnit/Util/PHP/Template/TestCaseMethod.tpl.dist	2021-09-10 07:43:46.619201163 +0200
@@ -81,7 +81,7 @@ if ('' !== $configurationFilePath) {
     unset($configuration);
 }
 
-function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
+function __phpunit_error_handler($errno, $errstr, $errfile, $errline, $errcontext=null)
 {
    return true;
 }