adding a getter setter for an instance. Updating methods as appropriate

Author: dmolsen

src/PatternLab/PatternEngine/Twig/TwigUtil.php

@@ -18,6 +18,37 @@
 
 class TwigUtil {
 
+	protected $instance    = '';
+	
+	/**
+	* Get an instance of the Twig environment
+	*
+	* @return {Instance}       an instance of the Twig environment
+	*/
+	public static function getInstance() {
+		
+		if (empty($this->instance)) {
+			return false;
+		}
+		
+		return $this->instance;
+		
+	}
+	
+	/**
+	* Set an instance of the Twig environment
+	* @param  {Instance}       an instance of the Twig environment
+	*/
+	public static function setInstance($instance = "") {
+		
+		if (empty($instance) || !method_exists($instance,'addGlobal')) {
+			Console::writeError("please set the instance");
+		}
+		
+		$this->instance = $instance;
+		
+	}
+	
 	/**
 	* Registering each directory under `_patterns/` as a namespace. For example, `_patterns/00-atoms/` as `@atoms`
 	* @param  {Instance}       an instance of the filesystem Loader
@@ -38,48 +69,36 @@ public static function addPaths($filesystemLoader, $patternSourceDir) {
 		return $filesystemLoader;
 
 	}
+	
 	/**
 	* Load custom date formats for Twig
-	* @param  {Instance}       an instance of the twig engine
-	*
-	* @return {Instance}       an instance of the twig engine
 	*/
-	public static function loadDateFormats($instance) {
+	public static function loadDateFormats() {
 
 		$dateFormat     = Config::getOption("twigDefaultDateFormat");
 		$intervalFormat = Config::getOption("twigDefaultIntervalFormat");
 
 		if ($dateFormat && $intervalFormat && !empty($dateFormat) && !empty($intervalFormat)) {
-			$instance->getExtension("core")->setDateFormat($dateFormat, $intervalFormat);
+			$this->instance->getExtension("core")->setDateFormat($dateFormat, $intervalFormat);
 		}
 
-		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) {
+	public static function loadDebug() {
 
 		if (Config::getOption("twigDebug")) {
-			$instance->addExtension(new \Twig_Extension_Debug());
+			$this->instance->addExtension(new \Twig_Extension_Debug());
 		}
 
-		return $instance;
-		
 	}
 
 	/**
 	* Load filters for the Twig PatternEngine
-	* @param  {Instance}       an instance of the twig engine
-	*
-	* @return {Instance}       an instance of the twig engine
 	*/
-	public static function loadFilters($instance) {
+	public static function loadFilters() {
 
 		// load defaults
 		$filterDir = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_twig-components/filters";
@@ -102,7 +121,7 @@ public static function loadFilters($instance) {
 
 					// $filter should be defined in the included file
 					if (isset($filter)) {
-						$instance->addFilter($filter);
+						$this->instance->addFilter($filter);
 						unset($filter);
 					}
 
@@ -112,17 +131,12 @@ public static function loadFilters($instance) {
 
 		}
 
-		return $instance;
-		
 	}
 
 	/**
 	* Load functions for the Twig PatternEngine
-	* @param  {Instance}       an instance of the twig engine
-	*
-	* @return {Instance}       an instance of the twig engine
 	*/
-	public static function loadFunctions($instance) {
+	public static function loadFunctions() {
 
 		// load defaults
 		$functionDir = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_twig-components/functions";
@@ -145,7 +159,7 @@ public static function loadFunctions($instance) {
 
 					// $function should be defined in the included file
 					if (isset($function)) {
-						$instance->addFunction($function);
+						$this->instance->addFunction($function);
 						unset($function);
 					}
 
@@ -155,17 +169,12 @@ public static function loadFunctions($instance) {
 
 		}
 
-		return $instance;
-		
 	}
 
 	/**
 	* Load macros for the Twig PatternEngine
-	* @param  {Instance}       an instance of the twig engine
-	*
-	* @return {Instance}       an instance of the twig engine
 	*/
-	public static function loadMacros($instance) {
+	public static function loadMacros() {
 
 		// load defaults
 		$macroDir = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_macros";
@@ -185,25 +194,20 @@ public static function loadMacros($instance) {
 				if ($baseName[0] != "_") {
 
 					// add the macro to the global context
-					$instance->addGlobal($file->getBasename(".".$macroExt), $instance->loadTemplate($baseName));
+					$this->instance->addGlobal($file->getBasename(".".$macroExt), $this->instance->loadTemplate($baseName));
 
 				}
 
 			}
 
 		}
 
-		return $instance;
-		
 	}
 
 	/**
 	* Load tags for the Twig PatternEngine
-	* @param  {Instance}       an instance of the twig engine
-	*
-	* @return {Instance}       an instance of the twig engine
 	*/
-	public static function loadTags($instance) {
+	public static function loadTags() {
 
 		// load defaults
 		$tagDir = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_twig-components/tags";
@@ -226,25 +230,20 @@ public static function loadTags($instance) {
 
 					// Project_{filenameBase}_TokenParser should be defined in the include
 					$className = "Project_".$file->getBasename(".".$tagExt)."_TokenParser";
-					$instance->addTokenParser(new $className());
+					$this->instance->addTokenParser(new $className());
 
 				}
 
 			}
 
 		}
 
-		return $instance;
-		
 	}
 
 	/**
 	* Load functions for the Twig PatternEngine
-	* @param  {Instance}       an instance of the twig engine
-	*
-	* @return {Instance}       an instance of the twig engine
 	*/
-	public static function loadTests($instance) {
+	public static function loadTests() {
 
 		// load defaults
 		$testDir = Config::getOption("sourceDir").DIRECTORY_SEPARATOR."_twig-components/tests";
@@ -267,7 +266,7 @@ public static function loadTests($instance) {
 
 					// $test should be defined in the included file
 					if (isset($test)) {
-						$instance->addTest($test);
+						$this->instance->addTest($test);
 						unset($test);
 					}
 
@@ -277,8 +276,6 @@ public static function loadTests($instance) {
 
 		}
 
-		return $instance;
-		
 	}
 
 }