fixes

nicolas-grekas · nicolas-grekas · commit 85e7f767a023 · 2014-12-02T20:45:04.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -22,7 +22,9 @@
  */
 class DumpExtension extends \Twig_Extension
 {
-    public function __construct(ClonerInterface $cloner = null)
+    private $cloner;
+
+    public function __construct(ClonerInterface $cloner)
     {
         $this->cloner = $cloner;
     }
@@ -46,7 +48,7 @@ public function getName()
 
     public function dump(\Twig_Environment $env, $context)
     {
-        if (!$env->isDebug() || !$this->cloner) {
+        if (!$env->isDebug()) {
             return;
         }
 
@@ -64,17 +66,14 @@ public function dump(\Twig_Environment $env, $context)
             unset($vars[0], $vars[1]);
         }
 
-        $html = '';
-        $dumper = new HtmlDumper(function ($line, $depth) use (&$html) {
-            if (-1 !== $depth) {
-                $html .= str_repeat('  ', $depth).$line."\n";
-            }
-        });
+        $dump = fopen('php://memory', 'r+b');
+        $dumper = new HtmlDumper($dump);
 
         foreach ($vars as $value) {
             $dumper->dump($this->cloner->cloneVar($value));
         }
+        rewind($dump);
 
-        return $html;
+        return stream_get_contents($dump);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -34,7 +34,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
 
     public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null)
     {
-        $this->data = array();
+        $this->data || $this->data = array();
         $this->stopwatch = $stopwatch;
         $this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
 
@@ -156,24 +156,21 @@ public function getDumpsCount()
 
     public function getDumps($format, $maxDepthLimit = -1, $maxItemsPerDepth = -1)
     {
+        $data = fopen('php://memory', 'r+b');
+
         if ('html' === $format) {
-            $dumper = new HtmlDumper();
+            $dumper = new HtmlDumper($data);
         } else {
             throw new \InvalidArgumentException(sprintf('Invalid dump format: %s', $format));
         }
         $dumps = array();
 
         foreach ($this->data as $dump) {
-            $data = '';
-            $dumper->dump(
-                $dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth),
-                function ($line, $depth) use (&$data) {
-                    if (-1 !== $depth) {
-                        $data .= str_repeat('  ', $depth).$line."\n";
-                    }
-                }
-            );
-            $dump['data'] = $data;
+            $dumper->dump($dump['data']->getLimitedClone($maxDepthLimit, $maxItemsPerDepth));
+            rewind($data);
+            $dump['data'] = stream_get_contents($data);
+            ftruncate($data, 0);
+            rewind($data);
             $dumps[] = $dump;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@`
`22`	`22`	`*/`
`23`	`23`	`class DumpExtension extends \Twig_Extension`
`24`	`24`	`{`
`25`		`- public function __construct(ClonerInterface $cloner = null)`
	`25`	`+ private $cloner;`
	`26`	`+`
	`27`	`+ public function __construct(ClonerInterface $cloner)`
`26`	`28`	`{`
`27`	`29`	`$this->cloner = $cloner;`
`28`	`30`	`}`
`@@ -46,7 +48,7 @@ public function getName()`
`46`	`48`
`47`	`49`	`public function dump(\Twig_Environment $env, $context)`
`48`	`50`	`{`
`49`		`- if (!$env->isDebug() \|\| !$this->cloner) {`
	`51`	`+ if (!$env->isDebug()) {`
`50`	`52`	`return;`
`51`	`53`	`}`
`52`	`54`
`@@ -64,17 +66,14 @@ public function dump(\Twig_Environment $env, $context)`
`64`	`66`	`unset($vars[0], $vars[1]);`
`65`	`67`	`}`
`66`	`68`
`67`		`- $html = '';`
`68`		`- $dumper = new HtmlDumper(function ($line, $depth) use (&$html) {`
`69`		`- if (-1 !== $depth) {`
`70`		`- $html .= str_repeat(' ', $depth).$line."\n";`
`71`		`- }`
`72`		`- });`
	`69`	`+ $dump = fopen('php://memory', 'r+b');`
	`70`	`+ $dumper = new HtmlDumper($dump);`
`73`	`71`
`74`	`72`	`foreach ($vars as $value) {`
`75`	`73`	`$dumper->dump($this->cloner->cloneVar($value));`
`76`	`74`	`}`
	`75`	`+ rewind($dump);`
`77`	`76`
`78`		`- return $html;`
	`77`	`+ return stream_get_contents($dump);`
`79`	`78`	`}`
`80`	`79`	`}`