Merge pull request #21 from pattern-lab/fix-twig-embed

Fix broken Twig embed
pattern-lab · Apr 25, 2016 · 26c4a93 · 26c4a93
2 parents 8260750 + b890a3a
commit 26c4a93
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 32 deletions.
diff --git a/src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php b/src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php
@@ -14,7 +14,7 @@
 namespace PatternLab\PatternEngine\Twig\Loaders;
 
 use \PatternLab\Config;
-use \PatternLab\PatternEngine\Twig\IncludeNodeVisitor;
+use \PatternLab\PatternEngine\Twig\PatternDataNodeVisitor;
 use \PatternLab\PatternEngine\Twig\Loaders\Twig\PatternPartialLoader as Twig_Loader_PatternPartialLoader;
 use \PatternLab\PatternEngine\Twig\Loaders\Twig\PatternStringLoader as Twig_Loader_PatternStringLoader;
 use \PatternLab\PatternEngine\Loader;
@@ -85,7 +85,7 @@ public function __construct($options = array()) {
 		$this->instance       = TwigUtil::loadMacros($this->instance);
 
 		// add node visitor
-		$this->instance->addNodeVisitor(new IncludeNodeVisitor());
+		$this->instance->addNodeVisitor(new PatternDataNodeVisitor());
 	}
 
 	/**

diff --git a/src/PatternLab/PatternEngine/Twig/PatternDataEmbedNode.php b/src/PatternLab/PatternEngine/Twig/PatternDataEmbedNode.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace PatternLab\PatternEngine\Twig;
+
+class PatternDataEmbedNode extends \Twig_Node_Embed
+{
+    use PatternDataNodeTrait;
+
+    public function __construct(\Twig_Node_Embed $originalNode, $data)
+    {
+        parent::__construct(
+          $originalNode->getAttribute('filename'),
+          $originalNode->getAttribute('index'),
+          $originalNode->getNode('variables'),
+          $originalNode->getAttribute('only'),
+          $originalNode->getAttribute('ignore_missing'),
+          $originalNode->getLine(),
+          $originalNode->getNodeTag()
+        );
+
+        $this->data = $data;
+    }
+}
diff --git a/src/PatternLab/PatternEngine/Twig/PatternDataIncludeNode.php b/src/PatternLab/PatternEngine/Twig/PatternDataIncludeNode.php
@@ -4,37 +4,19 @@
 
 class PatternDataIncludeNode extends \Twig_Node_Include
 {
-    protected $data;
+    use PatternDataNodeTrait;
 
     public function __construct(\Twig_Node_Include $originalNode, $data)
     {
-        \Twig_Node::__construct($originalNode->nodes, $originalNode->attributes, $originalNode->lineno, $originalNode->tag);
-        $this->data = $data;
-    }
+        parent::__construct(
+          $originalNode->getNode('expr'),
+          $originalNode->getNode('variables'),
+          $originalNode->getAttribute('only'),
+          $originalNode->getAttribute('ignore_missing'),
+          $originalNode->getLine(),
+          $originalNode->getNodeTag()
+        );
 
-    protected function addTemplateArguments(\Twig_Compiler $compiler)
-    {
-        if (null === $this->getNode('variables')) {
-            if (false === $this->getAttribute('only')) {
-                $compiler
-                    ->raw('array_merge($context, ')
-                    ->repr($this->data)
-                    ->raw(')')
-                ;
-            }
-            else {
-                $compiler->raw('array()');
-            }
-        } elseif (false === $this->getAttribute('only')) {
-            $compiler
-                ->raw('array_merge($context, ')
-                ->repr($this->data)
-                ->raw(', ')
-                ->subcompile($this->getNode('variables'))
-                ->raw(')')
-            ;
-        } else {
-            $compiler->subcompile($this->getNode('variables'));
-        }
+        $this->data = $data;
     }
 }
diff --git a/src/PatternLab/PatternEngine/Twig/PatternDataNodeTrait.php b/src/PatternLab/PatternEngine/Twig/PatternDataNodeTrait.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace PatternLab\PatternEngine\Twig;
+
+trait PatternDataNodeTrait
+{
+    protected $data;
+
+    protected function addTemplateArguments(\Twig_Compiler $compiler)
+    {
+        if (null === $this->getNode('variables')) {
+            if (false === $this->getAttribute('only')) {
+                $compiler
+                    ->raw('array_merge($context, ')
+                    ->repr($this->data)
+                    ->raw(')')
+                ;
+            }
+            else {
+                $compiler->raw('array()');
+            }
+        } elseif (false === $this->getAttribute('only')) {
+            $compiler
+                ->raw('array_merge($context, ')
+                ->repr($this->data)
+                ->raw(', ')
+                ->subcompile($this->getNode('variables'))
+                ->raw(')')
+            ;
+        } else {
+            $compiler->subcompile($this->getNode('variables'));
+        }
+    }
+}
diff --git a/...PatternEngine/Twig/IncludeNodeVisitor.php → ...ernEngine/Twig/PatternDataNodeVisitor.php b/...PatternEngine/Twig/IncludeNodeVisitor.php → ...ernEngine/Twig/PatternDataNodeVisitor.php
@@ -4,7 +4,7 @@
 
 use PatternLab\Data;
 
-class IncludeNodeVisitor extends \Twig_BaseNodeVisitor
+class PatternDataNodeVisitor extends \Twig_BaseNodeVisitor
 {
     protected function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
     {
@@ -17,7 +17,12 @@ protected function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
             if ($node->hasNode('expr') && $node->getNode('expr')->hasAttribute('value')) {
                 $patternStoreKey = $node->getNode('expr')->getAttribute('value');
                 $data = Data::getPatternSpecificData($patternStoreKey);
-                $dataNode = new PatternDataIncludeNode($node, $data);
+                if ($node instanceof \Twig_Node_Embed) {
+                    $dataNode = new PatternDataEmbedNode($node, $data);
+                }
+                else {
+                    $dataNode = new PatternDataIncludeNode($node, $data);
+                }
 
                 return $dataNode;
             }