Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d73b6c0

Browse filesBrowse files
committed
8.3 highlight_file fixes
1 parent 2bac801 commit d73b6c0
Copy full SHA for d73b6c0

File tree

1 file changed

+16
-5
lines changed
Filter options

1 file changed

+16
-5
lines changed

‎src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php
+16-5Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,22 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri
262262
// highlight_file could throw warnings
263263
// see https://bugs.php.net/25725
264264
$code = @highlight_file($file, true);
265-
// remove main code/span tags
266-
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
267-
// split multiline spans
268-
$code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn ($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
269-
$content = explode('<br />', $code);
265+
266+
if (\PHP_VERSION_ID >= 80300) {
267+
// remove main pre/code tags
268+
$code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
269+
// split multiline code tags
270+
$code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', fn($m) => "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>', $code);
271+
// Convert spaces to html entities to preserve indentation when rendered
272+
$code = str_replace(' ','&nbsp;', $code);
273+
$content = explode("\n", $code);
274+
} else {
275+
// remove main code/span tags
276+
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
277+
// split multiline spans
278+
$code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
279+
$content = explode('<br />', $code);
280+
}
270281

271282
$lines = [];
272283
if (0 > $srcContext) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.