From ef7122eb4fceff2682a4b2f0aee868fabf3351e6 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 16 Aug 2016 10:16:14 +0200 Subject: [PATCH] [Bridge/Twig] Simplify dumping snippet --- src/Symfony/Bridge/Twig/Extension/DumpExtension.php | 9 ++------- src/Symfony/Bridge/Twig/composer.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php index 6c7a9c9a34..693e993eb5 100644 --- a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php @@ -69,16 +69,11 @@ class DumpExtension extends \Twig_Extension } $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 index cb73d998a6..96d074cb2b 100644 --- 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": {