bug #23073 [TwigBridge] Fix namespaced classes (ogizanagi)

fabpot · fabpot · commit 658236b34474 · 2017-06-05T19:47:47.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [TwigBridge] Fix namespaced classes | Q | A | ------------- | --- | Branch? | 2.7  | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #23072  | License | MIT | Doc PR | N/A Commits ------- a1cdc2d [TwigBridge] Fix namespaced classes
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -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;
 
 /**
@@ -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();
         }
 
@@ -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());
             }
         }
 
@@ -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();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,15 @@`
`14`	`14`	`use Symfony\Bridge\Twig\Node\TransNode;`
`15`	`15`	`use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;`
`16`	`16`	`use Twig\Environment;`
	`17`	`+use Twig\Node\BlockNode;`
`17`	`18`	`use Twig\Node\Expression\ArrayExpression;`
`18`	`19`	`use Twig\Node\Expression\AssignNameExpression;`
`19`	`20`	`use Twig\Node\Expression\ConstantExpression;`
`20`	`21`	`use Twig\Node\Expression\FilterExpression;`
`21`	`22`	`use Twig\Node\Expression\NameExpression;`
`22`	`23`	`use Twig\Node\ModuleNode;`
`23`	`24`	`use Twig\Node\Node;`
	`25`	`+use Twig\Node\SetNode;`
`24`	`26`	`use Twig\NodeVisitor\AbstractNodeVisitor;`
`25`	`27`
`26`	`28`	`/**`
`@@ -48,7 +50,7 @@ public function __construct()`
`48`	`50`	`*/`
`49`	`51`	`protected function doEnterNode(Node $node, Environment $env)`
`50`	`52`	`{`
`51`		`- if ($node instanceof Node_Block \|\| $node instanceof ModuleNode) {`
	`53`	`+ if ($node instanceof BlockNode \|\| $node instanceof ModuleNode) {`
`52`	`54`	`$this->scope = $this->scope->enter();`
`53`	`55`	`}`
`54`	`56`
`@@ -62,7 +64,7 @@ protected function doEnterNode(Node $node, Environment $env)`
`62`	`64`	`$name = new AssignNameExpression($var, $node->getTemplateLine());`
`63`	`65`	`$this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));`
`64`	`66`
`65`		`- return new Node_Set(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());`
	`67`	`+ return new SetNode(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
`@@ -104,7 +106,7 @@ protected function doLeaveNode(Node $node, Environment $env)`
`104`	`106`	`return false;`
`105`	`107`	`}`
`106`	`108`
`107`		`- if ($node instanceof Node_Block \|\| $node instanceof ModuleNode) {`
	`109`	`+ if ($node instanceof BlockNode \|\| $node instanceof ModuleNode) {`
`108`	`110`	`$this->scope = $this->scope->leave();`
`109`	`111`	`}`
`110`	`112`