Skip to content

Commit

Permalink
[TwigBridge] Fix namespaced classes
Browse files Browse the repository at this point in the history
  • Loading branch information
ogizanagi authored and fabpot committed Jun 6, 2017
1 parent 621b769 commit a1cdc2d
Showing 1 changed file with 5 additions and 3 deletions.
Expand Up @@ -14,13 +14,15 @@
use Symfony\Bridge\Twig\Node\TransNode;
use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
use Twig\Environment;
use Twig\Node\BlockNode;
use Twig\Node\Expression\ArrayExpression;
use Twig\Node\Expression\AssignNameExpression;
use Twig\Node\Expression\ConstantExpression;
use Twig\Node\Expression\FilterExpression;
use Twig\Node\Expression\NameExpression;
use Twig\Node\ModuleNode;
use Twig\Node\Node;
use Twig\Node\SetNode;
use Twig\NodeVisitor\AbstractNodeVisitor;

/**
Expand Down Expand Up @@ -48,7 +50,7 @@ public function __construct()
*/
protected function doEnterNode(Node $node, Environment $env)
{
if ($node instanceof Node_Block || $node instanceof ModuleNode) {
if ($node instanceof BlockNode || $node instanceof ModuleNode) {
$this->scope = $this->scope->enter();
}

Expand All @@ -62,7 +64,7 @@ protected function doEnterNode(Node $node, Environment $env)
$name = new AssignNameExpression($var, $node->getTemplateLine());
$this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));

return new Node_Set(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());
return new SetNode(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());
}
}

Expand Down Expand Up @@ -104,7 +106,7 @@ protected function doLeaveNode(Node $node, Environment $env)
return false;
}

if ($node instanceof Node_Block || $node instanceof ModuleNode) {
if ($node instanceof BlockNode || $node instanceof ModuleNode) {
$this->scope = $this->scope->leave();
}

Expand Down

0 comments on commit a1cdc2d

Please sign in to comment.