[TwigBridge] add Twig dump() function + tests and fixes

nicolas-grekas · nicolas-grekas · commit f2633f7844de · 2014-09-23T16:26:00.000+02:00
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -169,7 +169,7 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
             $dumper->dump(
                 $dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth),
                 function ($line, $depth) use (&$data) {
-                    if (false !==$depth) {
+                    if (-1 !== $depth) {
                         $data .= str_repeat('  ', $depth).$line."\n";
                     }
                 }
diff --git a/Tests/DataCollector/DumpDataCollectorTest.php b/Tests/DataCollector/DumpDataCollectorTest.php
@@ -34,14 +34,17 @@ public function testDump()
 
         $xDump = array(
             array(
-              'data' => "<!DOCTYPE html><style> pre.sf-dump { background-color: #300a24; white-space: pre; line-height: 1.2em; color: #eee8d5; font-family: monospace, sans-serif; padding: 5px; } .sf-dump span { display: inline; }a.sf-dump-ref {color:#444444}span.sf-dump-num {font-weight:bold;color:#0087FF}span.sf-dump-const {font-weight:bold;color:#0087FF}span.sf-dump-str {font-weight:bold;color:#00D7FF}span.sf-dump-cchr {font-style: italic}span.sf-dump-note {color:#D7AF00}span.sf-dump-ref {color:#444444}span.sf-dump-public {color:#008700}span.sf-dump-protected {color:#D75F00}span.sf-dump-private {color:#D70000}span.sf-dump-meta {color:#005FFF}</style><pre class=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</pre>\n",
+              'data' => "<pre id=sf-dump><span class=sf-dump-0><span class=sf-dump-num>123</span>\n</span></pre><script>Sfjs.dump.instrument()</script>\n",
               'name' => 'DumpDataCollectorTest.php',
               'file' => __FILE__,
               'line' => $line,
               'fileExcerpt' => false,
             ),
         );
-        $this->assertSame($xDump, $collector->getDumps('html'));
+        $dump = $collector->getDumps('html');
+        $this->assertTrue(isset($dump[0]['data']));
+        $dump[0]['data'] = preg_replace('/^.*?<pre/', '<pre', $dump[0]['data']);
+        $this->assertSame($xDump, $dump);
 
         $this->assertStringStartsWith(
             'a:1:{i:0;a:5:{s:4:"data";O:39:"Symfony\Component\VarDumper\Cloner\Data":3:{s:45:"Symfony\Component\VarDumper\Cloner\Datadata";a:1:{i:0;a:1:{i:0;i:123;}}s:49:"Symfony\Component\VarDumper\Cloner\DatamaxDepth";i:-1;s:57:"Symfony\Component\VarDumper\Cloner\DatamaxItemsPerDepth";i:-1;}s:4:"name";s:25:"DumpDataCollectorTest.php";s:4:"file";s:',

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)`
`169`	`169`	`$dumper->dump(`
`170`	`170`	`$dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth),`
`171`	`171`	`function ($line, $depth) use (&$data) {`
`172`		`- if (false !==$depth) {`
	`172`	`+ if (-1 !== $depth) {`
`173`	`173`	`$data .= str_repeat(' ', $depth).$line."\n";`
`174`	`174`	`}`
`175`	`175`	`}`