bug #30976 [Debug] Fixed error handling when an error is already handled when another error is already handled (5) (lyrixx)

fabpot · fabpot · commit cd54e0f2324a · 2019-04-07T15:50:27.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [Debug] Fixed error handling when an error is already handled when another error is already handled (5) | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | --- Please, don't ask how to reproduce it :) Commits ------- a36c731 [Debug] Fixed error handling when an error is already handled when another error is already handled (5)
diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -372,7 +372,7 @@ private function formatPath($path, $line)
         $fmt = $this->fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
 
         if (!$fmt) {
-            return sprintf('<span class="block trace-file-path">in <a title="%s%3$s"><strong>%s</strong>%s</a></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
+            return sprintf('<span class="block trace-file-path">in <span title="%s%3$s"><strong>%s</strong>%s</span></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
         }
 
         if (\is_string($fmt)) {
@@ -388,7 +388,11 @@ private function formatPath($path, $line)
 
             $link = strtr($fmt[0], ['%f' => $path, '%l' => $line]);
         } else {
-            $link = $fmt->format($path, $line);
+            try {
+                $link = $fmt->format($path, $line);
+            } catch (\Exception $e) {
+                return sprintf('<span class="block trace-file-path">in <span title="%s%3$s"><strong>%s</strong>%s</span></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');
+            }
         }
 
         return sprintf('<span class="block trace-file-path">in <a href="%s" title="Go to source"><strong>%s</string>%s</a></span>', $this->escapeHtml($link), $file, 0 < $line ? ' line '.$line : '');
