minor #36909 [ErrorHandler] Apply php8 fixes from Debug component (derrabus)

nicolas-grekas · nicolas-grekas · commit f32c2c15d95e · 2020-05-23T10:32:54.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [ErrorHandler] Apply php8 fixes from Debug component | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #36872 | License | MIT | Doc PR | N/A The changes of #36898 and #36897 ported to the ErrorHandler component. Commits ------- 54f1869 [ErrorHandler] Apply php8 fixes from Debug component.
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -91,9 +91,14 @@ public function testNotice()
             $this->fail('ErrorException expected');
         } catch (\ErrorException $exception) {
             // if an exception is thrown, the test passed
-            $this->assertEquals(E_NOTICE, $exception->getSeverity());
+            if (\PHP_VERSION_ID < 80000) {
+                $this->assertEquals(E_NOTICE, $exception->getSeverity());
+                $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
+            } else {
+                $this->assertEquals(E_WARNING, $exception->getSeverity());
+                $this->assertRegExp('/^Warning: Undefined variable \$(foo|bar)/', $exception->getMessage());
+            }
             $this->assertEquals(__FILE__, $exception->getFile());
-            $this->assertRegExp('/^Notice: Undefined variable: (foo|bar)/', $exception->getMessage());
 
             $trace = $exception->getTrace();
 
@@ -121,7 +126,7 @@ public static function triggerNotice($that)
     public function testFailureCall()
     {
         $this->expectException(\ErrorException::class);
-        $this->expectExceptionMessage('fopen(unknown.txt): failed to open stream: No such file or directory');
+        $this->expectExceptionMessageMatches('/^fopen\(unknown\.txt\): [Ff]ailed to open stream: No such file or directory$/');
 
         ErrorHandler::call('fopen', 'unknown.txt', 'r');
     }
@@ -149,9 +154,14 @@ public function testCallErrorExceptionInfo()
             $this->fail('An \ErrorException should have been raised');
         } catch (\ErrorException $e) {
             $trace = $e->getTrace();
-            $this->assertSame(E_NOTICE, $e->getSeverity());
+            if (\PHP_VERSION_ID < 80000) {
+                $this->assertEquals(E_NOTICE, $e->getSeverity());
+                $this->assertSame('Undefined variable: foo', $e->getMessage());
+            } else {
+                $this->assertEquals(E_WARNING, $e->getSeverity());
+                $this->assertSame('Undefined variable $foo', $e->getMessage());
+            }
             $this->assertSame(__FILE__, $e->getFile());
-            $this->assertSame('Undefined variable: foo', $e->getMessage());
             $this->assertSame(0, $e->getCode());
             $this->assertSame('Symfony\Component\ErrorHandler\{closure}', $trace[0]['function']);
             $this->assertSame(ErrorHandler::class, $trace[0]['class']);
@@ -288,11 +298,18 @@ public function testHandleError()
 
             $line = null;
             $logArgCheck = function ($level, $message, $context) use (&$line) {
-                $this->assertEquals('Notice: Undefined variable: undefVar', $message);
                 $this->assertArrayHasKey('exception', $context);
                 $exception = $context['exception'];
+
+                if (\PHP_VERSION_ID < 80000) {
+                    $this->assertEquals('Notice: Undefined variable: undefVar', $message);
+                    $this->assertSame(E_NOTICE, $exception->getSeverity());
+                } else {
+                    $this->assertEquals('Warning: Undefined variable $undefVar', $message);
+                    $this->assertSame(E_WARNING, $exception->getSeverity());
+                }
+
                 $this->assertInstanceOf(SilencedErrorContext::class, $exception);
-                $this->assertSame(E_NOTICE, $exception->getSeverity());
                 $this->assertSame(__FILE__, $exception->getFile());
                 $this->assertSame($line, $exception->getLine());
                 $this->assertNotEmpty($exception->getTrace());
@@ -306,8 +323,13 @@ public function testHandleError()
             ;
 
             $handler = ErrorHandler::register();
-            $handler->setDefaultLogger($logger, E_NOTICE);
-            $handler->screamAt(E_NOTICE);
+            if (\PHP_VERSION_ID < 80000) {
+                $handler->setDefaultLogger($logger, E_NOTICE);
+                $handler->screamAt(E_NOTICE);
+            } else {
+                $handler->setDefaultLogger($logger, E_WARNING);
+                $handler->screamAt(E_WARNING);
+            }
             unset($undefVar);
             $line = __LINE__ + 1;
             @$undefVar++;
diff --git a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/ErrorHandlerThatUsesThePreviousOne.php
@@ -15,8 +15,8 @@ public static function register()
         return $handler;
     }
 
-    public function handleError($type, $message, $file, $line, $context)
+    public function handleError()
     {
-        return \call_user_func(self::$previous, $type, $message, $file, $line, $context);
+        return \call_user_func_array(self::$previous, \func_get_args());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public static function register()`
`15`	`15`	`return $handler;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function handleError($type, $message, $file, $line, $context)`
	`18`	`+ public function handleError()`
`19`	`19`	`{`
`20`		`- return \call_user_func(self::$previous, $type, $message, $file, $line, $context);`
	`20`	`+ return \call_user_func_array(self::$previous, \func_get_args());`
`21`	`21`	`}`
`22`	`22`	`}`