[ErrorHandler] fix throwing from __toString()

nicolas-grekas · nicolas-grekas · commit fd9b2c9f83be · 2020-06-30T19:26:33.000+02:00
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -401,7 +401,7 @@ public function handleError($type, $message, $file, $line)
         $scope = $this->scopedErrors & $type;
 
         if (4 < $numArgs = \func_num_args()) {
-            $context = $scope ? (func_get_arg(4) ?: []) : [];
+            $context = func_get_arg(4) ?: [];
             $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
         } else {
             $context = [];
@@ -453,7 +453,7 @@ public function handleError($type, $message, $file, $line)
             }
         } else {
             if ($scope) {
-                $errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $context);
+                $errorAsException = new ContextErrorException($logMessage, 0, $type, $file, $line, $scope ? $context : []);
             } else {
                 $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
             }
