Skip to content

Commit

Permalink
[Bridge\Twig] Lazy-load deps
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Nov 7, 2017
1 parent 2dbe17b commit 3fc766f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/Symfony/Bridge/Twig/Extension/DumpExtension.php
Expand Up @@ -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()
Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 2 additions & 6 deletions src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 3fc766f

Please sign in to comment.