diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php index 28cf669930..1e4ac12146 100644 --- a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php @@ -44,6 +44,7 @@ class HtmlDumper extends CliDumper 'key' => 'color:#56DB3A', 'index' => 'color:#1299DA', 'ellipsis' => 'color:#FF8400', + 'ns' => 'user-select:none;', ); private $displayOptions = array( @@ -837,9 +838,21 @@ EOHTML } $v = "".preg_replace_callback(static::$controlCharsRx, function ($c) use ($map) { - $s = ''; + $s = $b = ' .sf-dump .sf-dump-ref { color: #6E6E6E; } .dumped-tag > .sf-dump .sf-dump-ellipsis { color: #CC7832; max-width: 100em; } .dumped-tag > .sf-dump .sf-dump-ellipsis-path { max-width: 5em; } +.dumped-tag > .sf-dump .sf-dump-ns { user-select: none; } diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php index 85b0ac05b0..919d4e4a78 100644 --- a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php @@ -61,7 +61,10 @@ array:24 [ 5 => -INF 6 => {$intMax} "str" => "déjà\\n" - 7 => b"é\\x00" + 7 => b""" + é\\x00test\\t\\n + ing + """ "[]" => [] "res" => stream resource {@{$res} %A wrapper_type: "plainfile" diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php index b87bc2a007..af3db4b754 100644 --- a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php @@ -63,8 +63,11 @@ class HtmlDumperTest extends TestCase 4 => INF 5 => -INF 6 => {$intMax} - "str" => "d&%s;j&%s;\\n" - 7 => b"&%s;\\x00" + "str" => "d&%s;j&%s;\\n" + 7 => b""" + é\\x00test\\t\\n + ing + """ "[]" => [] "res" => stream resource @{$res} %A wrapper_type: "plainfile" diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php index 59ee19bdad..780f3b28d1 100644 --- a/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php +++ b/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php @@ -17,7 +17,7 @@ $g = fopen(__FILE__, 'r'); $var = array( 'number' => 1, null, 'const' => 1.1, true, false, NAN, INF, -INF, PHP_INT_MAX, - 'str' => "déjà\n", "\xE9\x00", + 'str' => "déjà\n", "\xE9\x00test\t\ning", '[]' => array(), 'res' => $g, 'obj' => $foo,