Skip to content

Commit c2eba50

Browse files
committed
feature #23921 make control characters non-selectable in HTML
1 parent 2ae7ad9 commit c2eba50

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class HtmlDumper extends CliDumper
4444
'key' => 'color:#56DB3A',
4545
'index' => 'color:#1299DA',
4646
'ellipsis' => 'color:#FF8400',
47+
'ctrl' => 'color:#AAA; user-select:none;',
4748
);
4849

4950
private $displayOptions = array(
@@ -837,7 +838,7 @@ protected function style($style, $value, $attr = array())
837838
}
838839

839840
$v = "<span class=sf-dump-{$style}>".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) {
840-
$s = '<span class=sf-dump-default>';
841+
$s = '<span class=sf-dump-ctrl>';
841842
$c = $c[$i = 0];
842843
do {
843844
$s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));

src/Symfony/Component/VarDumper/Resources/css/htmlDescriptor.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,4 @@ pre.sf-dump {
129129
.dumped-tag > .sf-dump .sf-dump-ref { color: #6E6E6E; }
130130
.dumped-tag > .sf-dump .sf-dump-ellipsis { color: #CC7832; max-width: 100em; }
131131
.dumped-tag > .sf-dump .sf-dump-ellipsis-path { max-width: 5em; }
132+
.dumped-tag > .sf-dump .sf-dump-ctrl { color:#AAA; user-select:none; }

src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public function testGet()
6363
<span class=sf-dump-key>4</span> => <span class=sf-dump-num>INF</span>
6464
<span class=sf-dump-key>5</span> => <span class=sf-dump-num>-INF</span>
6565
<span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
66-
"<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class=sf-dump-default>\\n</span></span>"
67-
<span class=sf-dump-key>7</span> => b"<span class=sf-dump-str title="2 binary or non-UTF-8 characters">&%s;<span class=sf-dump-default>\\x00</span></span>"
66+
"<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class=sf-dump-ctrl>\\n</span></span>"
67+
<span class=sf-dump-key>7</span> => b"<span class=sf-dump-str title="2 binary or non-UTF-8 characters">&%s;<span class=sf-dump-ctrl>\\x00</span></span>"
6868
"<span class=sf-dump-key>[]</span>" => []
6969
"<span class=sf-dump-key>res</span>" => <span class=sf-dump-note>stream resource</span> <a class=sf-dump-ref>@{$res}</a><samp>
7070
%A <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"

0 commit comments

Comments
 (0)