[ErrorHandler] Fix parsing messages that contain anonymous classes on PHP >= 8.3.3

nicolas-grekas · nicolas-grekas · commit 8e75077f4498 · 2024-02-22T06:38:24.000-05:00
diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -1097,7 +1097,7 @@ private function fixReturnStatements(\ReflectionMethod $method, string $returnTy
         $braces = 0;
         for (; $i < $end; ++$i) {
             if (!$inClosure) {
-                $inClosure = str_contains($code[$i], 'function (');
+                $inClosure = false !== strpos($code[$i], 'function (');
             }
 
             if ($inClosure) {
diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php
@@ -457,21 +457,26 @@ public function handleError(int $type, string $message, string $file, int $line)
                 return true;
             }
         } else {
-            if (false !== strpos($message, '@anonymous')) {
+            if (PHP_VERSION_ID < 80303 && false !== strpos($message, '@anonymous')) {
                 $backtrace = debug_backtrace(false, 5);
 
                 for ($i = 1; isset($backtrace[$i]); ++$i) {
                     if (isset($backtrace[$i]['function'], $backtrace[$i]['args'][0])
                         && ('trigger_error' === $backtrace[$i]['function'] || 'user_error' === $backtrace[$i]['function'])
                     ) {
                         if ($backtrace[$i]['args'][0] !== $message) {
-                            $message = $this->parseAnonymousClass($backtrace[$i]['args'][0]);
-                            $logMessage = $this->levels[$type].': '.$message;
+                            $message = $backtrace[$i]['args'][0];
                         }
 
                         break;
                     }
                 }
+
+            }
+
+            if (false !== strpos($message, "@anonymous\0")) {
+                $message = $this->parseAnonymousClass($message);
+                $logMessage = $this->levels[$type].': '.$message;
             }
 
             $errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ private function fixReturnStatements(\ReflectionMethod $method, string $returnTy`
`1097`	`1097`	`$braces = 0;`
`1098`	`1098`	`for (; $i < $end; ++$i) {`
`1099`	`1099`	`if (!$inClosure) {`
`1100`		`- $inClosure = str_contains($code[$i], 'function (');`
	`1100`	`+ $inClosure = false !== strpos($code[$i], 'function (');`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`if ($inClosure) {`
Original file line number	Diff line number	Diff line change
`@@ -457,21 +457,26 @@ public function handleError(int $type, string $message, string $file, int $line)`
`457`	`457`	`return true;`
`458`	`458`	`}`
`459`	`459`	`} else {`
`460`		`- if (false !== strpos($message, '@anonymous')) {`
	`460`	`+ if (PHP_VERSION_ID < 80303 && false !== strpos($message, '@anonymous')) {`
`461`	`461`	`$backtrace = debug_backtrace(false, 5);`
`462`	`462`
`463`	`463`	`for ($i = 1; isset($backtrace[$i]); ++$i) {`
`464`	`464`	`if (isset($backtrace[$i]['function'], $backtrace[$i]['args'][0])`
`465`	`465`	`&& ('trigger_error' === $backtrace[$i]['function'] \|\| 'user_error' === $backtrace[$i]['function'])`
`466`	`466`	`) {`
`467`	`467`	`if ($backtrace[$i]['args'][0] !== $message) {`
`468`		`- $message = $this->parseAnonymousClass($backtrace[$i]['args'][0]);`
`469`		`- $logMessage = $this->levels[$type].': '.$message;`
	`468`	`+ $message = $backtrace[$i]['args'][0];`
`470`	`469`	`}`
`471`	`470`
`472`	`471`	`break;`
`473`	`472`	`}`
`474`	`473`	`}`
	`474`	`+`
	`475`	`+ }`
	`476`	`+`
	`477`	`+ if (false !== strpos($message, "@anonymous\0")) {`
	`478`	`+ $message = $this->parseAnonymousClass($message);`
	`479`	`+ $logMessage = $this->levels[$type].': '.$message;`
`475`	`480`	`}`
`476`	`481`
`477`	`482`	`$errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);`