8000 PHP 8.3 highlight_file function output changes · symfony/symfony@5f260a3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5f260a3

Browse files
PhilETaylorPhilETaylor
committed
PHP 8.3 highlight_file function output changes
1 parent fcb754a commit 5f260a3

File tree

2 files changed

+30
-14
lines changed

2 files changed

+30
-14
lines changed

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,21 @@ public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?stri
123123
// highlight_file could throw warnings
124124
// see https://bugs.php.net/25725
125125
$code = @highlight_file($file, true);
126-
// remove main code/span tags
127-
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
128-
// split multiline spans
129-
$code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', function ($m) {
130-
return "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>';
131-
}, $code);
132-
$content = explode('<br />', $code);
126+
if (\PHP_VERSION_ID >= 80300) {
127+
// remove main pre/code tags
128+
$code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
129+
// split multiline code tags
130+
$code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', fn($m) => "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>', $code);
131+
// Convert spaces to html entities to preserve indentation when rendered
132+
$code = str_replace(' ','&nbsp;', $code);
133+
$content = explode("\n", $code);
134+
} else {
135+
// remove main code/span tags
136+
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
137+
// split multiline spans
138+
$code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
139+
$content = explode('<br />', $code);
140+
}
133141

134142
$lines = [];
135143
if (0 > $srcContext) {

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,21 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri
269269
// highlight_file could throw warnings
270270
// see https://bugs.php.net/25725
271271
$code = @highlight_file($file, true);
272-
// remove main code/span tags
273-
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
274-
// split multiline spans
275-
$code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', function ($m) {
276-
return "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>';
277-
}, $code);
278-
$content = explode('<br />', $code);
272+
if (\PHP_VERSION_ID >= 80300) {
273+
// remove main pre/code tags
274+
$code = preg_replace('#^<pre.*?>\s*<code.*?>(.*)</code>\s*</pre>#s', '\\1', $code);
275+
// split multiline code tags
276+
$code = preg_replace_callback('#<code ([^>]++)>((?:[^<]*+\\n)++[^<]*+)</code>#', fn($m) => "<code $m[1]>".str_replace("\n", "</code>\n<code $m[1]>", $m[2]).'</code>', $code);
277+
// Convert spaces to html entities to preserve indentation when rendered
278+
$code = str_replace(' ','&nbsp;', $code);
279+
$content = explode("\n", $code);
280+
} else {
281+
// remove main code/span tags
282+
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
283+
// split multiline spans
284+
$code = preg_replace_callback('#<span ([^>]++)>((?:[^<]*+<br \/>)++[^<]*+)</span>#', fn($m) => "<span $m[1]>".str_replace('<br />', "</span><br /><span $m[1]>", $m[2]).'</span>', $code);
285+
$content = explode('<br />', $code);
286+
}
279287

280288
$lines = [];
281289
if (0 > $srcContext) {

0 commit comments

Comments
 (0)
0