Dumper: fixed missing escape for & (#187)

nette · May 21, 2016 · b4ecf43 · b4ecf43
1 parent 01cfbcc
commit b4ecf43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Tracy/Dumper.php b/src/Tracy/Dumper.php
@@ -111,7 +111,7 @@ public static function toHtml($var, array $options = NULL)
 
 		return '<pre class="tracy-dump' . ($live && $options[self::COLLAPSE] === TRUE ? ' tracy-collapsed' : '') . '"'
 			. $locAttrs
-			. ($live ? " data-tracy-dump='" . str_replace("'", '&#039;', json_encode(self::toJson($var, $options))) . "'>" : '>')
+			. ($live ? " data-tracy-dump='" . json_encode(self::toJson($var, $options), JSON_HEX_APOS | JSON_HEX_AMP) . "'>" : '>')
 			. ($live ? '' : self::dumpVar($var, $options))
 			. ($file && $loc & self::LOCATION_LINK ? '<small>in ' . Helpers::editorLink($file, $line) . '</small>' : '')
 			. "</pre>\n";

diff --git a/tests/Tracy/Dumper.toHtml().live.phpt b/tests/Tracy/Dumper.toHtml().live.phpt
@@ -33,8 +33,8 @@ Assert::match('<pre class="tracy-dump"><span class="tracy-dump-number">0</span>
 </pre>', Dumper::toHtml(0, $options));
 
 Assert::match(
-	'<pre class="tracy-dump" data-tracy-dump=\'[[0,null],[1,true],[2,false],[3,0],[4,{"number":"0.0"}],[5,"string"],[6,"\\\\x00"],[7,{"type":"INF"}],[8,{"type":"-INF"}],[9,{"type":"NAN"}]]\'></pre>',
-	Dumper::toHtml([NULL, TRUE, FALSE, 0, 0.0, 'string', "\x00", INF, -INF, NAN], $options)
+	'<pre class="tracy-dump" data-tracy-dump=\'[[0,null],[1,true],[2,false],[3,0],[4,{"number":"0.0"}],[5,"string"],[6,"\u0027\u0026\""],[7,"\\\\x00"],[8,{"type":"INF"}],[9,{"type":"-INF"}],[10,{"type":"NAN"}]]\'></pre>',
+	Dumper::toHtml([NULL, TRUE, FALSE, 0, 0.0, 'string', "'&\"", "\x00", INF, -INF, NAN], $options)
 );
 
 Assert::match('<pre class="tracy-dump"><span class="tracy-dump-array">array</span> ()