Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 2fb303bb4fa8 · 2017-11-07T19:08:05.000+01:00
* 3.4:
  [Bridge\Twig] Lazy-load deps
diff --git 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class DumpExtension extends AbstractExtension`
`32`	`32`	`public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)`
`33`	`33`	`{`
`34`	`34`	`$this->cloner = $cloner;`
`35`		`- $this->dumper = $dumper ?: new HtmlDumper();`
	`35`	`+ $this->dumper = $dumper;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public function getFunctions()`
`@@ -73,6 +73,7 @@ public function dump(Environment $env, $context)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`$dump = fopen('php://memory', 'r+b');`
	`76`	`+ $this->dumper = $this->dumper ?: new HtmlDumper();`
`76`	`77`	`$this->dumper->setCharset($env->getCharset());`
`77`	`78`
`78`	`79`	`foreach ($vars as $value) {`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,6 @@ class TranslationExtension extends AbstractExtension`
`34`	`34`
`35`	`35`	`public function __construct(TranslatorInterface $translator = null, NodeVisitorInterface $translationNodeVisitor = null)`
`36`	`36`	`{`
`37`		`- if (!$translationNodeVisitor) {`
`38`		`- $translationNodeVisitor = new TranslationNodeVisitor();`
`39`		`- }`
`40`		`-`
`41`	`37`	`$this->translator = $translator;`
`42`	`38`	`$this->translationNodeVisitor = $translationNodeVisitor;`
`43`	`39`	`}`
`@@ -84,12 +80,12 @@ public function getTokenParsers()`
`84`	`80`	`*/`
`85`	`81`	`public function getNodeVisitors()`
`86`	`82`	`{`
`87`		`- return array($this->translationNodeVisitor, new TranslationDefaultDomainNodeVisitor());`
	`83`	`+ return array($this->getTranslationNodeVisitor(), new TranslationDefaultDomainNodeVisitor());`
`88`	`84`	`}`
`89`	`85`
`90`	`86`	`public function getTranslationNodeVisitor()`
`91`	`87`	`{`
`92`		`- return $this->translationNodeVisitor;`
	`88`	`+ return $this->translationNodeVisitor ?: $this->translationNodeVisitor = new TranslationNodeVisitor();`
`93`	`89`	`}`
`94`	`90`
`95`	`91`	`public function trans($message, array $arguments = array(), $domain = null, $locale = null)`