Merge pull request #531 from franmomu/not_use_node_index

Use array access to twig argument nodes

Author: goetas

Translation/Extractor/File/TwigFileExtractor.php

@@ -99,12 +99,12 @@ protected function doEnterNode(Node $node, Environment $env)
                 }
                 $id = $idNode->getAttribute('value');
 
-                $index = 'trans' === $name ? 1 : 2;
-                $domain = 'messages';
-                $arguments = $node->getNode('arguments');
-                if ($arguments->hasNode($index)) {
-                    $argument = $arguments->getNode($index);
-                    if (!$argument instanceof ConstantExpression) {
+                $index     = $name === 'trans' ? 1 : 2;
+                $domain    = 'messages';
+                $arguments = iterator_to_array($node->getNode('arguments'));
+                if (isset($arguments[$index])) {
+                    $argument = $arguments[$index];
+                    if (! $argument instanceof ConstantExpression) {
                         return $node;
                         // FIXME: Throw exception if there is some way for the user to turn this off
                         //        on a case-by-case basis, similar to @Ignore in PHP
@@ -122,14 +122,14 @@ protected function doEnterNode(Node $node, Environment $env)
                     }
 
                     $name = $this->stack[$i]->getNode('filter')->getAttribute('value');
-                    if ('desc' === $name || 'meaning' === $name) {
-                        $arguments = $this->stack[$i]->getNode('arguments');
-                        if (!$arguments->hasNode(0)) {
+                    if ($name === 'desc' || $name === 'meaning') {
+                        $arguments = iterator_to_array($this->stack[$i]->getNode('arguments'));
+                        if (! isset($arguments[0])) {
                             throw new RuntimeException(sprintf('The "%s" filter requires exactly one argument, the description text.', $name));
                         }
 
-                        $text = $arguments->getNode(0);
-                        if (!$text instanceof ConstantExpression) {
+                        $text = $arguments[0];
+                        if (! $text instanceof ConstantExpression) {
                             throw new RuntimeException(sprintf('The first argument of the "%s" filter must be a constant expression, such as a string.', $name));
                         }
 

Twig/DefaultApplyingNodeVisitor.php

@@ -75,8 +75,10 @@ public function doEnterNode(Node $node, Environment $env)
             }
 
             $wrappingNode = $node->getNode('node');
-            $testNode = clone $wrappingNode;
-            $defaultNode = $node->getNode('arguments')->getNode(0);
+
+            $testNode     = clone $wrappingNode;
+            $arguments    = iterator_to_array($node->getNode('arguments'));
+            $defaultNode  = $arguments[0];
 
             // if the |transchoice filter is used, delegate the call to the TranslationExtension
             // so that we can catch a possible exception when the default translation has not yet
@@ -95,22 +97,23 @@ public function doEnterNode(Node $node, Environment $env)
                 return $node;
             }
 
+            $wrappingNodeArguments = iterator_to_array($wrappingNode->getNode('arguments'));
+
             // if the |trans filter has replacements parameters
             // (e.g. |trans({'%foo%': 'bar'}))
-            if ($wrappingNode->getNode('arguments')->hasNode(0)) {
+            if (isset($wrappingNodeArguments[0])) {
                 $lineno =  $wrappingNode->getTemplateLine();
 
                 // remove the replacements from the test node
-                $testNode->setNode('arguments', clone $testNode->getNode('arguments'));
-                $testNode->getNode('arguments')->setNode(0, new ArrayExpression(array(), $lineno));
+                $testNodeArguments    = iterator_to_array($testNode->getNode('arguments'));
+                $testNodeArguments[0] = new ArrayExpression([], $lineno);
+                $testNode->setNode('arguments', new Node($testNodeArguments));
 
                 // wrap the default node in a |replace filter
                 $defaultNode = new FilterExpression(
-                    clone $node->getNode('arguments')->getNode(0),
+                    $arguments[0],
                     new ConstantExpression('replace', $lineno),
-                    new Node(array(
-                        clone $wrappingNode->getNode('arguments')->getNode(0)
-                    )),
+                    new Node([$wrappingNodeArguments[0]]),
                     $lineno
                 );
             }