bug #53967 [ErrorHandler] return the unchanged text if preg_replace_callback() fails (xabbuh)

nicolas-grekas · nicolas-grekas · commit 9c6da5ea5370 · 2024-02-20T11:50:05.000-05:00
This PR was merged into the 5.4 branch. Discussion ---------- [ErrorHandler] return the unchanged text if preg_replace_callback() fails | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #51290 | License | MIT Commits ------- db47893 return the unchanged text if preg_replace_callback() fails
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
@@ -329,7 +329,7 @@ private function formatFileFromText(string $text)
     {
         return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) {
             return 'in '.$this->formatFile($match[2], $match[3]);
-        }, $text);
+        }, $text) ?? $text;
     }
 
     private function formatLogMessage(string $message, array $context)

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ private function formatFileFromText(string $text)`
`329`	`329`	`{`
`330`	`330`	`return preg_replace_callback('/in ("\|")?(.+?)\1(?: +(?:on\|at))? +line (\d+)/s', function ($match) {`
`331`	`331`	`return 'in '.$this->formatFile($match[2], $match[3]);`
`332`		`- }, $text);`
	`332`	`+ }, $text) ?? $text;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`private function formatLogMessage(string $message, array $context)`