Twig 1.25 fix

Author: aleksip

src/aleksip/DataTransformPlugin/Twig/PatternDataEmbedNode.php

@@ -8,10 +8,14 @@ class PatternDataEmbedNode extends \Twig_Node_Embed
 
     public function __construct(\Twig_Node_Embed $originalNode, $data)
     {
+        $variables = $originalNode->hasNode('variables')
+            ? $originalNode->getNode('variables')
+            : null
+        ;
         parent::__construct(
           $originalNode->getAttribute('filename'),
           $originalNode->getAttribute('index'),
-          $originalNode->getNode('variables'),
+          $variables,
           $originalNode->getAttribute('only'),
           $originalNode->getAttribute('ignore_missing'),
           $originalNode->getLine(),

src/aleksip/DataTransformPlugin/Twig/PatternDataIncludeNode.php

@@ -8,9 +8,13 @@ class PatternDataIncludeNode extends \Twig_Node_Include
 
     public function __construct(\Twig_Node_Include $originalNode, $data)
     {
+        $variables = $originalNode->hasNode('variables')
+            ? $originalNode->getNode('variables')
+            : null
+        ;
         parent::__construct(
           $originalNode->getNode('expr'),
-          $originalNode->getNode('variables'),
+          $variables,
           $originalNode->getAttribute('only'),
           $originalNode->getAttribute('ignore_missing'),
           $originalNode->getLine(),

src/aleksip/DataTransformPlugin/Twig/PatternDataNodeTrait.php

@@ -48,7 +48,11 @@ public function setData($data)
 
     protected function addTemplateArguments(\Twig_Compiler $compiler)
     {
-        if (null === $this->getNode('variables')) {
+        $variables = $this->hasNode('variables')
+            ? $this->getNode('variables')
+            : null
+        ;
+        if (null === $variables) {
             if (false === $this->getAttribute('only')) {
                 $compiler
                     ->raw('array_merge($context, ')
@@ -64,11 +68,11 @@ protected function addTemplateArguments(\Twig_Compiler $compiler)
                 ->raw('array_merge($context, ')
                 ->raw($this->data)
                 ->raw(', ')
-                ->subcompile($this->getNode('variables'))
+                ->subcompile($variables)
                 ->raw(')')
             ;
         } else {
-            $compiler->subcompile($this->getNode('variables'));
+            $compiler->subcompile($variables);
         }
     }
 }