Skip to content

Support rendering release pages with PHP 8.3+ #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
+24 −14
Merged

Support rendering release pages with PHP 8.3+ #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions include/layout.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,33 @@ ini_set('highlight.keyword', 'keyword');
ini_set('highlight.string', 'string');
ini_set('highlight.html', 'html');

// convert PHP 8.2 highlight_string() output to match PHP 8.3+
function normalize_highlight_string(string $html): string
{
$search = ["\r\n", "\n", '<br />', '&nbsp;'];
$replace = ["\n", '', "\n", ' '];
$result = str_replace($search, $replace, $html);

// strip extra span tag
$result = substr_replace($result, '', 5, 6);
$result = substr_replace($result, '', -14, 7);

return '<pre>' . $result . '</pre>';
}

// Highlight PHP code
function highlight_php($code, $return = false)
{
$highlighted = highlight_string($code, true);

// Use this ugly hack for now to avoid code snippets with bad syntax screwing up the highlighter
if (strstr($highlighted, "include/layout.inc</b>")) {
$highlighted = '<span class="html">' . nl2br(htmlentities($code, ENT_HTML5), false) . "</span>";
if (PHP_VERSION_ID < 80300) {
$highlighted = normalize_highlight_string($highlighted);
}

// Fix output to use CSS classes and wrap well
$highlighted = '<div class="phpcode">' . strtr(
$highlighted,
[
'&nbsp;' => ' ',
"\n" => '',

'<span style="color: ' => '<span class="',
],
) . '</div>';
// Fix output to use CSS classes
$search = ['<code style="color: ', '<span style="color: '];
$replace = ['<code class="', '<span class="'];
$highlighted = '<div class="phpcode">' . str_replace($search, $replace, $highlighted) . '</div>';

if ($return) { return $highlighted; }
echo $highlighted;
Expand All @@ -45,7 +52,7 @@ function highlight_php_trimmed($code, $return = false)
{
$code = "<?php\n" . $code;
$highlighted_code = highlight_php($code, true);
$highlighted_code = preg_replace("!&lt;\?php(<br />)+!", '', $highlighted_code, 1);
$highlighted_code = preg_replace("!&lt;\?php(\\n)+!", '', $highlighted_code, 1);

// add syntax highlighting for variables
$variableReplacer = function (array $matches) {
Expand Down
3 changes: 3 additions & 0 deletions styles/theme-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,9 @@ div.tip p:first-child {
margin-bottom: 1.5rem;
}

.phpcode pre {
margin: 0;
}
.phpcode code {
display: block;
overflow-x: auto;
Expand Down
Loading