Merge branch 'include-pattern-specific-data' of https://github.com/aleksip/patternengine-php-twig into hotfix-prs

Author: dmolsen

README.md

@@ -148,7 +148,7 @@ The requirements for using filters with Pattern Lab:
 * The filter **must** set the variable `$filter`
 * Only one filter per file (_e.g. can only set `$filter` once per file_)
 
-An example function called `rot13.filter.twig` in `source/_twig-components/filters`:
+An example function called `rot13.filter.php` in `source/_twig-components/filters`:
 
 ```php
 <?php
@@ -175,7 +175,7 @@ The requirements for using functions with Pattern Lab:
 * The function **must** set the variable `$function`
 * Only one function per file (_e.g. can only set `$function` once per file_)
 
-An example function called `boo.function.twig` in `source/_twig-components/functions`:
+An example function called `boo.function.php` in `source/_twig-components/functions`:
 
 ```php
 <?php
@@ -202,7 +202,7 @@ The requirements for using tests with Pattern Lab:
 * The test **must** set the variable `$test`
 * Only one test per file (_e.g. can only set `$test` once per file_)
 
-An example of a simple test called `red.test.twig` in `source/_twig-components/tests`:
+An example of a simple test called `red.test.php` in `source/_twig-components/tests`:
 
 ```php
 <?php
@@ -254,7 +254,7 @@ Tags are the most complicated extension to set-up with Pattern Lab. Three steps
 
 Pattern Lab takes care of the registering for you based on the file name.
 
-An example of a simple tag called `setdupe.tag.twig` in `source/_twig-components/tags` that mimics the default `set` tag. Please note all of the locations where class names incorporate the filename, `setdupe`.
+An example of a simple tag called `setdupe.tag.php` in `source/_twig-components/tags` that mimics the default `set` tag. Please note all of the locations where class names incorporate the filename, `setdupe`.
 
 ```php
 <?php
@@ -328,11 +328,11 @@ You can modify the default date and interval formats for Twig by editing the `tw
 
 To disable extensions that you're no longer using simply add an underscore to the beginning of a filename and then re-generate your site. For example, the enabled rot13 filter:
 
-    source/_twig-components/filters/rot13.filter.twig
+    source/_twig-components/filters/rot13.filter.php
 
 And the disabled rot13 filter:
 
-    source/_twig-components/filters/_rot13.filter.twig
+    source/_twig-components/filters/_rot13.filter.php
 
 Then re-generate your Pattern Lab site with:
 

composer.json

@@ -25,8 +25,8 @@
 	},
 	"require": {
 		"php":              ">=5.3.6",
-		"twig/twig":        "~1.15",
-		"pattern-lab/core": "dev-dev"
+		"pattern-lab/core": "0.*",
+		"twig/twig":        "1.*"
 	},
 	"extra": {
 		"patternlab": {

src/PatternLab/PatternEngine/Twig/IncludeNodeVisitor.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace PatternLab\PatternEngine\Twig;
+
+use PatternLab\Data;
+
+class IncludeNodeVisitor extends \Twig_BaseNodeVisitor
+{
+    protected function doEnterNode(\Twig_Node $node, \Twig_Environment $env)
+    {
+        return $node;
+    }
+
+    protected function doLeaveNode(\Twig_Node $node, \Twig_Environment $env)
+    {
+        if ($node instanceof \Twig_Node_Include) {
+            if ($node->hasNode('expr') && $node->getNode('expr')->hasAttribute('value')) {
+                $patternStoreKey = $node->getNode('expr')->getAttribute('value');
+                $data = Data::getPatternSpecificData($patternStoreKey);
+                $dataNode = new PatternDataIncludeNode($node, $data);
+
+                return $dataNode;
+            }
+        }
+
+        return $node;
+    }
+
+    public function getPriority()
+    {
+        return 0;
+    }
+}

src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php

@@ -14,6 +14,7 @@
 namespace PatternLab\PatternEngine\Twig\Loaders;
 
 use \PatternLab\Config;
+use \PatternLab\PatternEngine\Twig\IncludeNodeVisitor;
 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;
@@ -66,7 +67,9 @@ public function __construct($options = array()) {
 		$this->instance       = TwigUtil::loadDateFormats($this->instance);
 		$this->instance       = TwigUtil::loadDebug($this->instance);
 		$this->instance       = TwigUtil::loadMacros($this->instance);
-		
+
+		// add node visitor
+		$this->instance->addNodeVisitor(new IncludeNodeVisitor());
 	}
 
 	/**

src/PatternLab/PatternEngine/Twig/PatternDataIncludeNode.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace PatternLab\PatternEngine\Twig;
+
+class PatternDataIncludeNode extends \Twig_Node_Include
+{
+    protected $data;
+
+    public function __construct(\Twig_Node_Include $originalNode, $data)
+    {
+        \Twig_Node::__construct($originalNode->nodes, $originalNode->attributes, $originalNode->lineno, $originalNode->tag);
+        $this->data = $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'));
+        }
+    }
+}