fix merge

nicolas-grekas · nicolas-grekas · commit 158482fdc3de · 2019-08-07T14:06:11.000+02:00
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -448,7 +448,7 @@ public function handleError(int $type, string $message, string $file, int $line)
         }
 
         if ($throw) {
-            if (E_USER_ERROR & $type) {
+            if (\PHP_VERSION_ID < 70400 && E_USER_ERROR & $type) {
                 for ($i = 1; isset($backtrace[$i]); ++$i) {
                     if (isset($backtrace[$i]['function'], $backtrace[$i]['type'], $backtrace[$i - 1]['function'])
                         && '__toString' === $backtrace[$i]['function']
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorHandlerTest.php
@@ -283,6 +283,10 @@ public function testHandleError()
 
     public function testHandleUserError()
     {
+        if (\PHP_VERSION_ID >= 70400) {
+            $this->markTestSkipped('PHP 7.4 allows __toString to throw exceptions');
+        }
+
         try {
             $handler = ErrorHandler::register();
             $handler->throwAt(0, true);

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ public function handleError(int $type, string $message, string $file, int $line)`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`if ($throw) {`
`451`		`- if (E_USER_ERROR & $type) {`
	`451`	`+ if (\PHP_VERSION_ID < 70400 && E_USER_ERROR & $type) {`
`452`	`452`	`for ($i = 1; isset($backtrace[$i]); ++$i) {`
`453`	`453`	`if (isset($backtrace[$i]['function'], $backtrace[$i]['type'], $backtrace[$i - 1]['function'])`
`454`	`454`	`&& '__toString' === $backtrace[$i]['function']`