Add namespaces in custom views

= · = · commit 4c2f1bb1c79f · 2012-09-09T20:27:26.000-04:00
diff --git a/Views/Dwoo.php b/Views/Dwoo.php
@@ -83,10 +83,10 @@ private function getInstance()
 	{
 		if (!self::$dwooInstance) {
             if (!is_dir(self::$dwooDirectory)) {
-                throw new RuntimeException('Cannot set the Dwoo lib directory : ' . self::$dwooDirectory . '. Directory does not exist.');
+                throw new \RuntimeException('Cannot set the Dwoo lib directory : ' . self::$dwooDirectory . '. Directory does not exist.');
             }
 			require_once self::$dwooDirectory . '/dwooAutoload.php';
-			self::$dwooInstance = new Dwoo();
+			self::$dwooInstance = new \Dwoo();
 		}
 
 		return self::$dwooInstance;
diff --git a/Views/Extension/Smarty/function.urlFor.php b/Views/Extension/Smarty/function.urlFor.php
@@ -13,7 +13,7 @@ function smarty_function_urlFor($params, $template)
 	$name = isset($params['name']) ? $params['name'] : '';
     $appName = isset($params['appname']) ? $params['appname'] : 'default';
 
-	$url = Slim::getInstance($appName)->urlFor($name);
+	$url = \Slim\Slim::getInstance($appName)->urlFor($name);
 
 	if (isset($params['options']))
 	{
@@ -23,7 +23,7 @@ function smarty_function_urlFor($params, $template)
 			$opts[$key] = $value;
 		}
 
-		$url = Slim::getInstance($appName)->urlFor($name, $opts);
+		$url = \Slim\Slim::getInstance($appName)->urlFor($name, $opts);
 	}
 
 	return $url;
diff --git a/Views/Extension/Twig/Extensions/Slim.php b/Views/Extension/Twig/Extensions/Slim.php
@@ -1,6 +1,6 @@
 <?php
 
-class Twig_Extensions_Slim extends Twig_Extension
+class Twig_Extensions_Slim extends \Twig_Extension
 {
     public function getName()
     {
@@ -10,7 +10,7 @@ public function getName()
     public function getFunctions()
     {
         return array(
-            'urlFor' => new Twig_Function_Method($this, 'urlFor'),
+            'urlFor' => new \Twig_Function_Method($this, 'urlFor'),
         );
     }
 
diff --git a/Views/H2o.php b/Views/H2o.php
@@ -61,7 +61,7 @@ public function render($template)
 			self::$h2o_options['searchpath'] = $this->getTemplatesDirectory() . '/';
 		}
 		$this->_load_h2o();
-		$h2o = new H2o($template, self::$h2o_options);
+		$h2o = new \H2o($template, self::$h2o_options);
 
 		return $h2o->render($this->data);
 	}
@@ -75,11 +75,11 @@ public function render($template)
 	 */
 	private function _load_h2o()
 	{
-		if (class_exists('H2o')) {
+		if (class_exists('\H2o')) {
 			return;
 		}
 		if (!is_dir(self::$h2o_directory)) {
-			throw new RuntimeException('h2o directory is invalid');
+			throw new \RuntimeException('h2o directory is invalid');
 		}
 		require_once self::$h2o_directory . 'h2o.php';
 	}
diff --git a/Views/Haanga.php b/Views/Haanga.php
@@ -59,7 +59,7 @@ class Haanga extends \Slim\View
     public function __construct($haangaDir, $templatesDir, $compiledDir)
     {
         require_once $haangaDir . '/lib/Haanga.php';
-        Haanga::configure(array(
+        \Haanga::configure(array(
             'template_dir' => $templatesDir,
             'cache_dir' => $compiledDir
         ));
@@ -75,6 +75,6 @@ public function __construct($haangaDir, $templatesDir, $compiledDir)
      */
     public function render($template)
     {
-        return Haanga::load($template, $this->data);
+        return \Haanga::load($template, $this->data);
     }
 }
diff --git a/Views/Haml.php b/Views/Haml.php
@@ -72,12 +72,12 @@ class Haml extends \Slim\View
 	public function render($template)
 	{
         if (!is_dir(self::$hamlDirectory)) {
-            throw new RuntimeException('Cannot set the HamlPHP lib directory : ' . self::$hamlDirectory . '. Directory does not exist.');
+            throw new \RuntimeException('Cannot set the HamlPHP lib directory : ' . self::$hamlDirectory . '. Directory does not exist.');
         }
 		require_once self::$hamlDirectory . '/HamlPHP/HamlPHP.php';
 		require_once self::$hamlDirectory . '/HamlPHP/Storage/FileStorage.php';
-		$parser = new HamlPHP(new FileStorage(self::$hamlCacheDirectory));
+		$parser = new \HamlPHP(new \FileStorage(self::$hamlCacheDirectory));
 
-		return $parser->parseFile(self::$hamlTemplatesDirectory.$template, $this->data);
+		return $parser->parseFile(self::$hamlTemplatesDirectory . $template, $this->data);
 	}
 }
diff --git a/Views/Mustache.php b/Views/Mustache.php
@@ -59,7 +59,7 @@ class Mustache extends \Slim\View
     public function render($template)
     {
         require_once self::$mustacheDirectory . '/Mustache.php';
-        $m = new Mustache();
+        $m = new \Mustache();
         $contents = file_get_contents($this->getTemplatesDirectory() . '/' . ltrim($template, '/'));
 
         return $m->render($contents, $this->data);
diff --git a/Views/Rain.php b/Views/Rain.php
@@ -90,12 +90,12 @@ private function getInstance()
 	{
 		if (!self::$rainInstance) {
             if (!is_dir(self::$rainDirectory)) {
-                throw new RuntimeException('Cannot set the Rain lib directory : ' . self::$rainDirectory . '. Directory does not exist.');
+                throw new \RuntimeException('Cannot set the Rain lib directory : ' . self::$rainDirectory . '. Directory does not exist.');
             }
 			require_once self::$rainDirectory . '/rain.tpl.class.php';
 			raintpl::$tpl_dir = self::$rainTemplatesDirectory;
 			raintpl::$cache_dir = self::$rainCacheDirectory;
-			self::$rainInstance = new raintpl();
+			self::$rainInstance = new \raintpl();
 		}
 
 		return self::$rainInstance;
diff --git a/Views/Savant.php b/Views/Savant.php
@@ -84,10 +84,10 @@ private function getInstance()
 	{
 		if (!self::$savantInstance) {
             if (!is_dir(self::$savantDirectory)) {
-                throw new RuntimeException('Cannot set the Savant lib directory : ' . self::$savantDirectory . '. Directory does not exist.');
+                throw new \RuntimeException('Cannot set the Savant lib directory : ' . self::$savantDirectory . '. Directory does not exist.');
             }
 			require_once self::$savantDirectory . '/Savant3.php';
-			self::$savantInstance = new Savant3(self::$savantOptions);
+			self::$savantInstance = new \Savant3(self::$savantOptions);
 		}
 
 		return self::$savantInstance;
diff --git a/Views/Smarty.php b/Views/Smarty.php
@@ -101,12 +101,12 @@ public function render($template)
      */
     public static function getInstance()
     {
-        if (!(self::$smartyInstance instanceof Smarty)) {
+        if (!(self::$smartyInstance instanceof \Smarty)) {
             if (!is_dir(self::$smartyDirectory)) {
-                throw new RuntimeException('Cannot set the Smarty lib directory : ' . self::$smartyDirectory . '. Directory does not exist.');
+                throw new \RuntimeException('Cannot set the Smarty lib directory : ' . self::$smartyDirectory . '. Directory does not exist.');
             }
             require_once self::$smartyDirectory . '/Smarty.class.php';
-            self::$smartyInstance = new Smarty();
+            self::$smartyInstance = new \Smarty();
             self::$smartyInstance->template_dir = is_null(self::$smartyTemplatesDirectory) ? $this->getTemplatesDirectory() : self::$smartyTemplatesDirectory;
             if (self::$smartyExtensions) {
                 self::$smartyInstance->addPluginsDir(self::$smartyExtensions);
diff --git a/Views/Sugar.php b/Views/Sugar.php
@@ -93,10 +93,10 @@ private function getInstance()
 	{
 		if (!self::$sugarInstance) {
             if (!is_dir(self::$sugarDirectory)) {
-                throw new RuntimeException('Cannot set the Sugar lib directory : ' . self::$sugarDirectory . '. Directory does not exist.');
+                throw new \RuntimeException('Cannot set the Sugar lib directory : ' . self::$sugarDirectory . '. Directory does not exist.');
             }
 			require_once self::$sugarDirectory . '/Sugar.php';
-			self::$sugarInstance = new Sugar();
+			self::$sugarInstance = new \Sugar();
 			self::$sugarInstance->templateDir = self::$sugarTemplatesDirectory;
 			self::$sugarInstance->cacheDir = self::$sugarCacheDirectory;
 		}
diff --git a/Views/Twig.php b/Views/Twig.php
@@ -87,25 +87,25 @@ public function getEnvironment()
     {
         if (!$this->twigEnvironment) {
             // Check for Composer Package Autoloader class loading
-            if (!class_exists('Twig_Autoloader')) {
+            if (!class_exists('\Twig_Autoloader')) {
                 require_once self::$twigDirectory . '/Autoloader.php';
             }
 
-            Twig_Autoloader::register();
-            $loader = new Twig_Loader_Filesystem($this->getTemplatesDirectory());
-            $this->twigEnvironment = new Twig_Environment(
+            \Twig_Autoloader::register();
+            $loader = new \Twig_Loader_Filesystem($this->getTemplatesDirectory());
+            $this->twigEnvironment = new \Twig_Environment(
                 $loader,
                 self::$twigOptions
             );
 
             // Check for Composer Package Autoloader class loading
-            if (!class_exists('Twig_Extensions_Autoloader')) {
+            if (!class_exists('\Twig_Extensions_Autoloader')) {
                 $extension_autoloader = dirname(__FILE__) . '/Extension/TwigAutoloader.php';
                 if (file_exists($extension_autoloader)) require_once $extension_autoloader;
             }
 
-            if (class_exists('Twig_Extensions_Autoloader')) {
-                Twig_Extensions_Autoloader::register();
+            if (class_exists('\Twig_Extensions_Autoloader')) {
+                \Twig_Extensions_Autoloader::register();
 
                 foreach (self::$twigExtensions as $ext) {
                     $extension = is_object($ext) ? $ext : new $ext;

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,10 @@ private function getInstance()`
`83`	`83`	`{`
`84`	`84`	`if (!self::$dwooInstance) {`
`85`	`85`	`if (!is_dir(self::$dwooDirectory)) {`
`86`		`- throw new RuntimeException('Cannot set the Dwoo lib directory : ' . self::$dwooDirectory . '. Directory does not exist.');`
	`86`	`+ throw new \RuntimeException('Cannot set the Dwoo lib directory : ' . self::$dwooDirectory . '. Directory does not exist.');`
`87`	`87`	`}`
`88`	`88`	`require_once self::$dwooDirectory . '/dwooAutoload.php';`
`89`		`- self::$dwooInstance = new Dwoo();`
	`89`	`+ self::$dwooInstance = new \Dwoo();`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`return self::$dwooInstance;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ function smarty_function_urlFor($params, $template)`
`13`	`13`	`$name = isset($params['name']) ? $params['name'] : '';`
`14`	`14`	`$appName = isset($params['appname']) ? $params['appname'] : 'default';`
`15`	`15`
`16`		`- $url = Slim::getInstance($appName)->urlFor($name);`
	`16`	`+ $url = \Slim\Slim::getInstance($appName)->urlFor($name);`
`17`	`17`
`18`	`18`	`if (isset($params['options']))`
`19`	`19`	`{`
`@@ -23,7 +23,7 @@ function smarty_function_urlFor($params, $template)`
`23`	`23`	`$opts[$key] = $value;`
`24`	`24`	`}`
`25`	`25`
`26`		`- $url = Slim::getInstance($appName)->urlFor($name, $opts);`
	`26`	`+ $url = \Slim\Slim::getInstance($appName)->urlFor($name, $opts);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`return $url;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-class Twig_Extensions_Slim extends Twig_Extension`
	`3`	`+class Twig_Extensions_Slim extends \Twig_Extension`
`4`	`4`	`{`
`5`	`5`	`public function getName()`
`6`	`6`	`{`
`@@ -10,7 +10,7 @@ public function getName()`
`10`	`10`	`public function getFunctions()`
`11`	`11`	`{`
`12`	`12`	`return array(`
`13`		`- 'urlFor' => new Twig_Function_Method($this, 'urlFor'),`
	`13`	`+ 'urlFor' => new \Twig_Function_Method($this, 'urlFor'),`
`14`	`14`	`);`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function render($template)`
`61`	`61`	`self::$h2o_options['searchpath'] = $this->getTemplatesDirectory() . '/';`
`62`	`62`	`}`
`63`	`63`	`$this->_load_h2o();`
`64`		`- $h2o = new H2o($template, self::$h2o_options);`
	`64`	`+ $h2o = new \H2o($template, self::$h2o_options);`
`65`	`65`
`66`	`66`	`return $h2o->render($this->data);`
`67`	`67`	`}`
`@@ -75,11 +75,11 @@ public function render($template)`
`75`	`75`	`*/`
`76`	`76`	`private function _load_h2o()`
`77`	`77`	`{`
`78`		`- if (class_exists('H2o')) {`
	`78`	`+ if (class_exists('\H2o')) {`
`79`	`79`	`return;`
`80`	`80`	`}`
`81`	`81`	`if (!is_dir(self::$h2o_directory)) {`
`82`		`- throw new RuntimeException('h2o directory is invalid');`
	`82`	`+ throw new \RuntimeException('h2o directory is invalid');`
`83`	`83`	`}`
`84`	`84`	`require_once self::$h2o_directory . 'h2o.php';`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class Haanga extends \Slim\View`
`59`	`59`	`public function __construct($haangaDir, $templatesDir, $compiledDir)`
`60`	`60`	`{`
`61`	`61`	`require_once $haangaDir . '/lib/Haanga.php';`
`62`		`- Haanga::configure(array(`
	`62`	`+ \Haanga::configure(array(`
`63`	`63`	`'template_dir' => $templatesDir,`
`64`	`64`	`'cache_dir' => $compiledDir`
`65`	`65`	`));`
`@@ -75,6 +75,6 @@ public function __construct($haangaDir, $templatesDir, $compiledDir)`
`75`	`75`	`*/`
`76`	`76`	`public function render($template)`
`77`	`77`	`{`
`78`		`- return Haanga::load($template, $this->data);`
	`78`	`+ return \Haanga::load($template, $this->data);`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,12 @@ class Haml extends \Slim\View`
`72`	`72`	`public function render($template)`
`73`	`73`	`{`
`74`	`74`	`if (!is_dir(self::$hamlDirectory)) {`
`75`		`- throw new RuntimeException('Cannot set the HamlPHP lib directory : ' . self::$hamlDirectory . '. Directory does not exist.');`
	`75`	`+ throw new \RuntimeException('Cannot set the HamlPHP lib directory : ' . self::$hamlDirectory . '. Directory does not exist.');`
`76`	`76`	`}`
`77`	`77`	`require_once self::$hamlDirectory . '/HamlPHP/HamlPHP.php';`
`78`	`78`	`require_once self::$hamlDirectory . '/HamlPHP/Storage/FileStorage.php';`
`79`		`- $parser = new HamlPHP(new FileStorage(self::$hamlCacheDirectory));`
	`79`	`+ $parser = new \HamlPHP(new \FileStorage(self::$hamlCacheDirectory));`
`80`	`80`
`81`		`- return $parser->parseFile(self::$hamlTemplatesDirectory.$template, $this->data);`
	`81`	`+ return $parser->parseFile(self::$hamlTemplatesDirectory . $template, $this->data);`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class Mustache extends \Slim\View`
`59`	`59`	`public function render($template)`
`60`	`60`	`{`
`61`	`61`	`require_once self::$mustacheDirectory . '/Mustache.php';`
`62`		`- $m = new Mustache();`
	`62`	`+ $m = new \Mustache();`
`63`	`63`	`$contents = file_get_contents($this->getTemplatesDirectory() . '/' . ltrim($template, '/'));`
`64`	`64`
`65`	`65`	`return $m->render($contents, $this->data);`
Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ private function getInstance()`
`90`	`90`	`{`
`91`	`91`	`if (!self::$rainInstance) {`
`92`	`92`	`if (!is_dir(self::$rainDirectory)) {`
`93`		`- throw new RuntimeException('Cannot set the Rain lib directory : ' . self::$rainDirectory . '. Directory does not exist.');`
	`93`	`+ throw new \RuntimeException('Cannot set the Rain lib directory : ' . self::$rainDirectory . '. Directory does not exist.');`
`94`	`94`	`}`
`95`	`95`	`require_once self::$rainDirectory . '/rain.tpl.class.php';`
`96`	`96`	`raintpl::$tpl_dir = self::$rainTemplatesDirectory;`
`97`	`97`	`raintpl::$cache_dir = self::$rainCacheDirectory;`
`98`		`- self::$rainInstance = new raintpl();`
	`98`	`+ self::$rainInstance = new \raintpl();`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`return self::$rainInstance;`
Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,10 @@ private function getInstance()`
`84`	`84`	`{`
`85`	`85`	`if (!self::$savantInstance) {`
`86`	`86`	`if (!is_dir(self::$savantDirectory)) {`
`87`		`- throw new RuntimeException('Cannot set the Savant lib directory : ' . self::$savantDirectory . '. Directory does not exist.');`
	`87`	`+ throw new \RuntimeException('Cannot set the Savant lib directory : ' . self::$savantDirectory . '. Directory does not exist.');`
`88`	`88`	`}`
`89`	`89`	`require_once self::$savantDirectory . '/Savant3.php';`
`90`		`- self::$savantInstance = new Savant3(self::$savantOptions);`
	`90`	`+ self::$savantInstance = new \Savant3(self::$savantOptions);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`return self::$savantInstance;`