adding a filesystem loader to each loader so grab macros

Author: dmolsen

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

@@ -23,7 +23,8 @@ class FilesystemLoader extends Loader {
 	*/
 	public function __construct($options = array()) {
 
-		$twigLoader     = new \Twig_Loader_Filesystem(array($options["templatePath"],$options["partialsPath"]));
+		$macroPath      = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_macros";
+		$twigLoader     = new \Twig_Loader_Filesystem(array($options["templatePath"],$options["partialsPath"],$macroPath));
 		$this->instance = new \Twig_Environment($twigLoader);
 		$this->instance = TwigUtil::loadMacros($this->instance, "filesystem");
 

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

@@ -28,9 +28,11 @@ public function __construct($options = array()) {
 
 		//default var
 		$patternSourceDir     = Config::getOption("patternSourceDir");
+		$macroPath            = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_macros";
 		$patternPartialLoader = new Twig_Loader_PatternPartialLoader($patternSourceDir,array("patternPaths" => $options["patternPaths"]));
 		$patternStringLoader  = new \Twig_Loader_String();
-		$twigLoader           = new \Twig_Loader_Chain(array($patternPartialLoader, $patternStringLoader));
+		$macroLoader          = new \Twig_Loader_Filesystem(array($macroPath));
+		$twigLoader           = new \Twig_Loader_Chain(array($patternPartialLoader, $macroLoader, $patternStringLoader));
 		$this->instance       = new \Twig_Environment($twigLoader);
 		$this->instance       = TwigUtil::loadMacros($this->instance, "pattern");
 

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

@@ -12,6 +12,7 @@
 
 namespace PatternLab\PatternEngine\Twig\Loaders;
 
+use \PatternLab\Config;
 use \PatternLab\PatternEngine\Loader;
 use \PatternLab\PatternEngine\Twig\TwigUtil;
 
@@ -22,7 +23,10 @@ class StringLoader extends Loader {
 	*/
 	public function __construct($options = array()) {
 
-		$twigLoader     = new \Twig_Loader_String();
+		$macroPath      = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_macros";
+		$macroLoader    = new \Twig_Loader_Filesystem(array($macroPath));
+		$stringLoader   = new \Twig_Loader_String();
+		$twigLoader     = new \Twig_Loader_Chain(array($macroLoader, $stringLoader));
 		$this->instance = new \Twig_Environment($twigLoader);
 		$this->instance = TwigUtil::loadMacros($this->instance, "string");