diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php index 767163f87da1c..2cc3f1a4b0440 100644 --- a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php @@ -32,7 +32,7 @@ class DumpExtension extends AbstractExtension public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null) { $this->cloner = $cloner; - $this->dumper = $dumper ?: new HtmlDumper(); + $this->dumper = $dumper; } public function getFunctions() @@ -73,6 +73,7 @@ public function dump(Environment $env, $context) } $dump = fopen('php://memory', 'r+b'); + $this->dumper = $this->dumper ?: new HtmlDumper(); $this->dumper->setCharset($env->getCharset()); foreach ($vars as $value) { diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index 01d0f6c6442e3..f1131c52df614 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -34,10 +34,6 @@ class TranslationExtension extends AbstractExtension public function __construct(TranslatorInterface $translator = null, NodeVisitorInterface $translationNodeVisitor = null) { - if (!$translationNodeVisitor) { - $translationNodeVisitor = new TranslationNodeVisitor(); - } - $this->translator = $translator; $this->translationNodeVisitor = $translationNodeVisitor; } @@ -84,12 +80,12 @@ public function getTokenParsers() */ public function getNodeVisitors() { - return array($this->translationNodeVisitor, new TranslationDefaultDomainNodeVisitor()); + return array($this->getTranslationNodeVisitor(), new TranslationDefaultDomainNodeVisitor()); } public function getTranslationNodeVisitor() { - return $this->translationNodeVisitor; + return $this->translationNodeVisitor ?: $this->translationNodeVisitor = new TranslationNodeVisitor(); } public function trans($message, array $arguments = array(), $domain = null, $locale = null)