Fix merge
This commit is contained in:
parent
d994a748dc
commit
9d67841a9e
@ -46,7 +46,7 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
|
|||||||
$dumpId = $dumpId[0];
|
$dumpId = $dumpId[0];
|
||||||
$res = (int) $var['res'];
|
$res = (int) $var['res'];
|
||||||
|
|
||||||
$r = defined('HHVM_VERSION') ? '' : '#%d';
|
$r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
|
||||||
$this->assertStringMatchesFormat(
|
$this->assertStringMatchesFormat(
|
||||||
<<<EOTXT
|
<<<EOTXT
|
||||||
<foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
|
<foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
|
||||||
@ -79,7 +79,7 @@ class HtmlDumperTest extends \PHPUnit_Framework_TestCase
|
|||||||
</samp>}
|
</samp>}
|
||||||
"<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
|
"<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
|
||||||
<span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="48 characters">Symfony\Component\VarDumper\Tests\HtmlDumperTest</span>"
|
<span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="48 characters">Symfony\Component\VarDumper\Tests\HtmlDumperTest</span>"
|
||||||
<span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {<a class=sf-dump-ref>#%d</a> …}
|
<span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} …}
|
||||||
<span class=sf-dump-meta>parameters</span>: <span class=sf-dump-note>array:2</span> [<samp>
|
<span class=sf-dump-meta>parameters</span>: <span class=sf-dump-note>array:2</span> [<samp>
|
||||||
"<span class=sf-dump-key>\$a</span>" => []
|
"<span class=sf-dump-key>\$a</span>" => []
|
||||||
"<span class=sf-dump-key>&\$b</span>" => <span class=sf-dump-note>array:2</span> [<samp>
|
"<span class=sf-dump-key>&\$b</span>" => <span class=sf-dump-note>array:2</span> [<samp>
|
||||||
|
Reference in New Issue
Block a user