8000 [ErrorHandler] fix html W3C compliance · symfony/symfony@7f9237e · GitHub
[go: up one dir, main page]
Skip to content

Commit 7f9237e

Browse files
awoimbeenicolas-grekas
awoimbee
authored and
nicolas-grekas
committed
[ErrorHandler] fix html W3C compliance
1 parent 219d511 commit 7f9237e

File tree

6 files changed

+29
-20
lines changed

6 files changed

+29
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function fileExcerpt(string $file, int $line, int $srcContext = 3): ?stri
137137
}
138138

139139
for ($i = max($line - $srcContext, 1), $max = min($line + $srcContext, \count($content)); $i <= $max; ++$i) {
140-
$lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><a class="anchor" name="line'.$i.'"></a><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
140+
$lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><a class="anchor" id="line'.$i.'"></a><code>'.self::fixCodeMarkup($content[$i - 1]).'</code></li>';
141141
}
142142

143143
return '<ol start="'.max($line - $srcContext, 1).'">'.implode("\n", $lines).'</ol>';

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ private function fileExcerpt(string $file, int $line, int $srcContext = 3): stri
283283
}
284284

285285
for ($i = max($line - $srcContext, 1), $max = min($line + $srcContext, \count($content)); $i <= $max; ++$i) {
286-
$lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><a class="anchor" name="line'.$i.'"></a><code>'.$this->fixCodeMarkup($content[$i - 1]).'</code></li>';
286+
$lines[] = '<li'.($i == $line ? ' class="selected"' : '').'><code>'.$this->fixCodeMarkup($content[$i - 1]).'</code></li>';
287287
}
288288

289289
return '<ol start="'.max($line - $srcContext, 1).'">'.implode("\n", $lines).'</ol>';
@@ -302,9 +302,9 @@ private function fixCodeMarkup(string $line)
302302
}
303303

304304
// missing </span> tag at the end of line
305-
$opening = strpos($line, '<span');
306-
$closing = strpos($line, '</span>');
307-
if (false !== $opening && (false === $closing || $closing > $opening)) {
305+
$opening = strrpos($line, '<span');
306+
$closing = strrpos($line, '</span>');
307+
if (false !== $opening && (false === $closing || $closing < $opening)) {
308308
$line .= '</span>';
309309
}
310310

‎src/Symfony/Component/ErrorHandler/Resources/assets/css/exception.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ tr.status-error td, tr.status-warning td { border-bottom: 1px solid var(--base-2
124124
.status-warning .colored { color: #A46A1F; }
125125
.status-error .colored { color: var(--color-error); }
126126

127-
.sf-toggle { cursor: pointer; }
127+
.sf-toggle { cursor: pointer; position: relative; }
128128
.sf-toggle-content { -moz-transition: display .25s ease; -webkit-transition: display .25s ease; transition: display .25s ease; }
129129
.sf-toggle-content.sf-toggle-hidden { display: none; }
130130
.sf-toggle-content.sf-toggle-visible { display: block; }

‎src/Symfony/Component/ErrorHandler/Resources/views/logs.html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$status = \E_DEPRECATED === $severity || \E_USER_DEPRECATED === $severity ? 'warning' : 'normal';
2424
} ?>
2525
<tr class="status-<?= $status; ?>" data-filter-level="<?= strtolower($this->escape($log['priorityName'])); ?>"<?php if ($channelIsDefined) { ?> data-filter-channel="<?= $this->escape($log['channel']); ?>"<?php } ?>>
26-
<td class="text-small" nowrap>
26+
<td class="text-small nowrap">
2727
<span class="colored text-bold"><?= $this->escape($log['priorityName']); ?></span>
2828
<span class="text-muted newline"><?= date('H:i:s', $log['timestamp']); ?></span>
2929
</td>

‎src/Symfony/Component/ErrorHandler/Resources/views/traces.html.php

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
<div class="trace trace-as-html" id="trace-box-<?= $index; ?>">
22
<div class="trace-details">
33
<div class="trace-head">
4-
<span class="sf-toggle" data-toggle-selector="#trace-html-<?= $index; ?>" data-toggle-initial="<?= $expand ? 'display' : ''; ?>">
5-
<h3 class="trace-class">
6-
<span class="icon icon-close"><?= $this->include('assets/images/icon-minus-square-o.svg'); ?></span>
7-
<span class="icon icon-open"><?= $this->include('assets/images/icon-plus-square-o.svg'); ?></span>
8-
9-
<span class="trace-namespace">
10-
<?= implode('\\', array_slice(explode('\\', $exception['class']), 0, -1)); ?><?= count(explode('\\', $exception['class'])) > 1 ? '\\' : ''; ?>
11-
</span>
12-
<?= ($parts = explode('\\', $exception['class'])) ? end($parts) : ''; ?>
13-
</h3>
4+
<div class="sf-toggle" data-toggle-selector="#trace-html-<?= $index; ?>" data-toggle-initial="<?= $expand ? 'display' : ''; ?>">
5+
<span class="icon icon-close"><?= $this->include('assets/images/icon-minus-square-o.svg'); ?></span>
6+
<span class="icon icon-open"><?= $this->include('assets/images/icon-plus-square-o.svg'); ?></span>
7+
<?php
8+
$separator = strrpos($exception['class'], '\\');
9+
$separator = false === $separator ? 0 : $separator + 1;
1410

11+
$namespace = substr($exception['class'], 0, $separator);
12+
$class = substr($exception['class'], $separator);
13+
?>
14+
<?php if ('' === $class) { ?>
15+
</br>
16+
<?php } else { ?>
17+
<h3 class="trace-class">
18+
<?php if ('' !== $namespace) { ?>
19+
<span class="trace-namespace"><?= $namespace; ?></span>
20+
<?php } ?>
21+
<?= $class; ?>
22+
</h3>
23+
<?php } ?>
1524
<?php if ($exception['message'] && $index > 1) { ?>
1625
<p class="break-long-words trace-message"><?= $this->escape($exception['message']); ?></p>
1726
<?php } ?>
18-
</span>
27+
</div>
1928
</div>
2029

2130
<div id="trace-html-<?= $index; ?>" class="sf-toggle-content">

‎src/Symfony/Component/ErrorHandler/Resources/views/traces_text.html.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<thead class="trace-head">
33
<tr>
44
<th class="sf-toggle" data-toggle-selector="#trace-text-<?= $index; ?>" data-toggle-initial="<?= 1 === $index ? 'display' : ''; ?>">
5-
<h3 class="trace-class">
5+
<div class="trace-class">
66
<?php if ($numExceptions > 1) { ?>
77
<span class="text-muted">[<?= $numExceptions - $index + 1; ?>/<?= $numExceptions; ?>]</span>
88
<?php } ?>
99
<?= ($parts = explode('\\', $exception['class'])) ? end($parts) : ''; ?>
1010
<span class="icon icon-close"><?= $this->include('assets/images/icon-minus-square-o.svg'); ?></span>
1111
<span class="icon icon-open"><?= $this->include('assets/images/icon-plus-square-o.svg'); ?></span>
12-
</h3>
12+
</div>
1313
</th>
1414
</tr>
1515
</thead>

0 commit comments

Comments
 (0)
0