[Bridge/Twig] Simplify dumping snippet

nicolas-grekas · nicolas-grekas · commit ef7122eb4fce · 2016-08-16T18:19:38.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -69,16 +69,11 @@ public function dump(\Twig_Environment $env, $context)
         }
 
         $dump = fopen('php://memory', 'r+b');
-        $prevOutput = $this->dumper->setOutput($dump);
 
         foreach ($vars as $value) {
-            $this->dumper->dump($this->cloner->cloneVar($value));
+            $this->dumper->dump($this->cloner->cloneVar($value), $dump);
         }
 
-        $this->dumper->setOutput($prevOutput);
-
-        rewind($dump);
-
-        return stream_get_contents($dump);
+        return stream_get_contents($dump, -1, 0);
     }
 }
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -33,7 +33,7 @@
         "symfony/security-acl": "~2.8|~3.0",
         "symfony/stopwatch": "~2.8|~3.0",
         "symfony/console": "~2.8|~3.0",
-        "symfony/var-dumper": "~2.8.9|~3.0.9|~3.1.3|~3.2",
+        "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2",
         "symfony/expression-language": "~2.8|~3.0"
     },
     "suggest": {

Original file line number	Diff line number	Diff line change
`@@ -69,16 +69,11 @@ public function dump(\Twig_Environment $env, $context)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`$dump = fopen('php://memory', 'r+b');`
`72`		`- $prevOutput = $this->dumper->setOutput($dump);`
`73`	`72`
`74`	`73`	`foreach ($vars as $value) {`
`75`		`- $this->dumper->dump($this->cloner->cloneVar($value));`
	`74`	`+ $this->dumper->dump($this->cloner->cloneVar($value), $dump);`
`76`	`75`	`}`
`77`	`76`
`78`		`- $this->dumper->setOutput($prevOutput);`
`79`		`-`
`80`		`- rewind($dump);`
`81`		`-`
`82`		`- return stream_get_contents($dump);`
	`77`	`+ return stream_get_contents($dump, -1, 0);`
`83`	`78`	`}`
`84`	`79`	`}`