enabling twig debug

Author: dmolsen

composer.json

@@ -31,7 +31,8 @@
 		"patternlab": {
 			"config": [
 				{ 
-					"patternExtension": "twig"
+					"patternExtension": "twig",
+					"twigDebug": false,
 					"twigDefaultDateFormat": "",
 					"twigDefaultIntervalFormat": "",
 					"twigMacroExt": "macro"

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

@@ -23,11 +23,16 @@ class FilesystemLoader extends Loader {
 	*/
 	public function __construct($options = array()) {
 
+		// set-up the loader
+		$twigDebug      = Config::getOption("twigDebug");
 		$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");
+		$this->instance = new \Twig_Environment($twigLoader, array("debug" => $twigDebug));
+		
+		// customize the loader
 		$this->instance = TwigUtil::loadDateFormats();
+		$this->instance = TwigUtil::loadDebug();
+		$this->instance = TwigUtil::loadMacros($this->instance, "filesystem");
 
 	}
 

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

@@ -26,16 +26,20 @@ class PatternLoader extends Loader {
 	*/
 	public function __construct($options = array()) {
 
-		//default var
+		// set-up the loader
+		$twigDebug            = Config::getOption("twigDebug");
 		$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();
 		$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");
+		$this->instance       = new \Twig_Environment($twigLoader, array("debug" => $twigDebug));
+		
+		// customize the loader
 		$this->instance       = TwigUtil::loadDateFormats();
+		$this->instance       = TwigUtil::loadDebug();
+		$this->instance       = TwigUtil::loadMacros($this->instance, "pattern");
 
 	}
 

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

@@ -23,13 +23,18 @@ class StringLoader extends Loader {
 	*/
 	public function __construct($options = array()) {
 
+		// set-up the loader
+		$twigDebug      = Config::getOption("twigDebug");
 		$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");
+		$this->instance = new \Twig_Environment($twigLoader, array("debug" => $twigDebug));
+		
+		// customize the loader
 		$this->instance = TwigUtil::loadDateFormats();
+		$this->instance = TwigUtil::loadDebug();
+		$this->instance = TwigUtil::loadMacros($this->instance, "string");
 
 	}
 

src/PatternLab/PatternEngine/Twig/TwigUtil.php

@@ -34,6 +34,23 @@ public static function loadDateFormats($instance) {
 		}
 
 		return $instance;
+		
+	}
+	
+	/**
+	* Enable the debug options for Twig
+	* @param  {Instance}       an instance of the twig engine
+	*
+	* @return {Instance}       an instance of the twig engine
+	*/
+	public static function loadDebug($instance) {
+		
+		if (Config::getOption("twigDebug")) {
+			$twig->addExtension(new Twig_Extension_Debug());
+		}
+		
+		return $instance;
+		
 	}
 
 	/**