dwoo-project / dwoo

lib/Dwoo/Template/File.php

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
 	 * @return boolean True cache file existance and it's modification time
 	 */
 	protected function isValidCompiledFile($file) {
-		return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+		return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 			foreach ($this->includePath as $path) {
 				$path = rtrim($path, DIRECTORY_SEPARATOR);
 				if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
-					$this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+					$this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
 					return $this->resolvedPath;
 				}
 			}
@@ -250,10 +250,10 @@ 
 	protected function getCompiledFilename(Dwoo_Core $dwoo)
 	{
 		// no compile id was provided, set default
-		if ($this->compileId===null) {
+		if ($this->compileId === null) {
 			$this->compileId = str_replace('../', '__', strtr($this->getResourceIdentifier(), '\\:', '/-'));
 		}
-		return $dwoo->getCompileDir() . $this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		return $dwoo->getCompileDir().$this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 	}
 
 	/**

lib/Dwoo/Core.php

Braces +3 added lines, -2 removed lines

@@ -1538,8 +1538,9 @@
                 array_pop($this->scopeTree);
                 $this->scope =& $this->data;
                 $cnt = count($this->scopeTree);
-                for ($i=0;$i<$cnt;$i++)
-                    $this->scope =& $this->scope[$this->scopeTree[$i]];
+                for ($i=0;$i<$cnt;$i++) {
+                                    $this->scope =& $this->scope[$this->scopeTree[$i]];
+                }
             } elseif ($bit === '__' || $bit === '_root') {
                 $this->scope =& $this->data;
                 $this->scopeTree = array();

Spacing +65 added lines, -69 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!defined('DWOO_DIRECTORY')) {
-	define('DWOO_DIRECTORY', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
+	define('DWOO_DIRECTORY', dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR);
 }
 /**
  * main dwoo class, allows communication between the compiler, template and data classes
@@ -162,15 +162,12 @@ 
      *
      * @var array
      */
-    protected $resources = array
-    (
-        'file'      =>  array
-        (
+    protected $resources = array(
+        'file'      =>  array(
             'class'     =>  'Dwoo_Template_File',
             'compiler'  =>  null
         ),
-        'string'    =>  array
-        (
+        'string'    =>  array(
             'class'     =>  'Dwoo_Template_String',
             'compiler'  =>  null
         )
@@ -437,8 +434,7 @@ 
      */
     protected function initGlobals()
     {
-        $this->globals = array
-        (
+        $this->globals = array(
             'version'   =>  self::VERSION,
             'ad'        =>  '<a href="http://dwoo.org/">Powered by Dwoo</a>',
             'now'       =>  $_SERVER['REQUEST_TIME'],
@@ -457,7 +453,7 @@ 
     protected function initRuntimeVars(Dwoo_ITemplate $tpl)
     {
         $this->runtimePlugins = array();
-        $this->scope =& $this->data;
+        $this->scope = & $this->data;
         $this->scopeTree = array();
         $this->stack = array();
         $this->curBlock = null;
@@ -487,7 +483,7 @@ 
             } else {
                 $this->plugins[$name] = array('type'=>self::CLASS_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>(is_object($callback[0]) ? get_class($callback[0]) : $callback[0]), 'function'=>$callback[1]);
             }
-        } elseif(is_string($callback)) {
+        } elseif (is_string($callback)) {
 			if (class_exists($callback)) {
 				if (is_subclass_of($callback, 'Dwoo_Block_Plugin')) {
 					$this->plugins[$name] = array('type'=>self::BLOCK_PLUGIN | $compilable, 'callback'=>$callback, 'class'=>$callback);
@@ -499,7 +495,7 @@ 
 			} else {
 				throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
 			}
-		} elseif($callback instanceof \Closure) {
+		} elseif ($callback instanceof \Closure) {
 			$this->plugins[$name] = array('type'=>self::FUNC_PLUGIN | $compilable, 'callback'=>$callback);
 		} else {
             throw new Dwoo_Exception('Callback could not be processed correctly, please check that the function/class you used exists');
@@ -566,8 +562,8 @@ 
             unset($this->filters[$index]);
         } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
             unset($this->filters[$index]);
-        } else  {
-            $class = 'Dwoo_Filter_' . $callback;
+        } else {
+            $class = 'Dwoo_Filter_'.$callback;
             foreach ($this->filters as $index=>$filter) {
                 if (is_array($filter) && $filter[0] instanceof $class) {
                     unset($this->filters[$index]);
@@ -610,7 +606,7 @@ 
     public function removeResource($name)
     {
         unset($this->resources[$name]);
-        if ($name==='file') {
+        if ($name === 'file') {
             $this->resources['file'] = array('class'=>'Dwoo_Template_File', 'compiler'=>null);
         }
     }
@@ -862,7 +858,7 @@ 
 			new \RecursiveDirectoryIterator($this->getCompileDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-		$count    = 0;
+		$count = 0;
 		/** @var \SplFileInfo $file */
 		foreach ($iterator as $file) {
 			if ($file->isFile()) {
@@ -878,13 +874,13 @@ 
      * @param int $olderThan minimum time (in seconds) required for a cached template to be cleared
      * @return int the amount of templates cleared
      */
-    public function clearCache($olderThan=-1)
+    public function clearCache($olderThan = -1)
     {
 		$iterator = new \RecursiveIteratorIterator(
 			new \RecursiveDirectoryIterator($this->getCacheDir()),
 			\RecursiveIteratorIterator::SELF_FIRST
 		);
-        $expired = time() - $olderThan;
+        $expired = time()-$olderThan;
         $count = 0;
 		/** @var \SplFileInfo $file */
         foreach ($iterator as $file) {
@@ -924,7 +920,7 @@ 
      *                              and return true only if it's not empty
      * @return int|bool true if it's an array|arrayaccess (or the item count if $checkIsEmpty is true) or false if it's not an array|arrayaccess (or 0 if $checkIsEmpty is true)
      */
-    public function isArray($value, $checkIsEmpty=false)
+    public function isArray($value, $checkIsEmpty = false)
     {
         if (is_array($value) === true || $value instanceof ArrayAccess) {
             if ($checkIsEmpty === false) {
@@ -943,7 +939,7 @@ 
      *                              and return true only if it's not empty
      * @return int|bool true if it's an array|traversable (or the item count if $checkIsEmpty is true) or false if it's not an array|traversable (or 0 if $checkIsEmpty is true)
      */
-    public function isTraversable($value, $checkIsEmpty=false)
+    public function isTraversable($value, $checkIsEmpty = false)
     {
         if (is_array($value) === true) {
             if ($checkIsEmpty === false) {
@@ -993,7 +989,7 @@ 
      * @param string $message the error message
      * @param int $level the error level, one of the PHP's E_* constants
      */
-    public function triggerError($message, $level=E_USER_NOTICE)
+    public function triggerError($message, $level = E_USER_NOTICE)
     {
         if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
             $tplIdentifier = $this->template->getResourceName();
@@ -1012,7 +1008,7 @@ 
      * @param array $args the arguments to be passed to the block's init() function
      * @return Dwoo_Block_Plugin the newly created block
      */
-    public function addStack($blockName, array $args=array())
+    public function addStack($blockName, array $args = array())
     {
         if (isset($this->plugins[$blockName])) {
             $class = $this->plugins[$blockName]['class'];
@@ -1031,18 +1027,18 @@ 
         $block = new $class($this);
 
         $cnt = count($args);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             $block->init();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             $block->init($args[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             $block->init($args[0], $args[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             $block->init($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             $block->init($args[0], $args[1], $args[2], $args[3]);
         } else {
-            call_user_func_array(array($block,'init'), $args);
+            call_user_func_array(array($block, 'init'), $args);
         }
 
         $this->stack[] = $this->curBlock = $block;
@@ -1063,15 +1059,15 @@ 
         ob_clean();
 
         $cnt = count($args);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             $this->curBlock->end();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             $this->curBlock->end($args[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             $this->curBlock->end($args[0], $args[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             $this->curBlock->end($args[0], $args[1], $args[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             $this->curBlock->end($args[0], $args[1], $args[2], $args[3]);
         } else {
             call_user_func_array(array($this->curBlock, 'end'), $args);
@@ -1083,7 +1079,7 @@ 
             $this->curBlock = end($this->stack);
             $this->curBlock->buffer($tmp->process());
         } else {
-            if($this->buffer !== '') {
+            if ($this->buffer !== '') {
                 echo $this->buffer;
                 $this->buffer = '';
             }
@@ -1164,15 +1160,15 @@ 
         $plugin = $this->getObjectPlugin($class);
 
         $cnt = count($params);
-        if ($cnt===0) {
+        if ($cnt === 0) {
             return $plugin->process();
-        } elseif ($cnt===1) {
+        } elseif ($cnt === 1) {
             return $plugin->process($params[0]);
-        } elseif ($cnt===2) {
+        } elseif ($cnt === 2) {
             return $plugin->process($params[0], $params[1]);
-        } elseif ($cnt===3) {
+        } elseif ($cnt === 3) {
             return $plugin->process($params[0], $params[1], $params[2]);
-        } elseif ($cnt===4) {
+        } elseif ($cnt === 4) {
             return $plugin->process($params[0], $params[1], $params[2], $params[3]);
         } else {
             return call_user_func_array(array($plugin, 'process'), $params);
@@ -1208,23 +1204,23 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1=>$items[$i])+$params);
                     }
-                } elseif ($cnt===1) {
+                } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i]);
                     }
-                } elseif ($cnt===2) {
+                } elseif ($cnt === 2) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i], $params[2]);
                     }
-                } elseif ($cnt===3) {
+                } elseif ($cnt === 3) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($this, $items[$i], $params[2], $params[3]);
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1=>$items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1=>$items[$i])+$params);
                     }
                 }
             } else {
@@ -1233,27 +1229,27 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
-                } elseif ($cnt===1) {
+                } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i]);
                     }
-                } elseif ($cnt===2) {
+                } elseif ($cnt === 2) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1]);
                     }
-                } elseif ($cnt===3) {
+                } elseif ($cnt === 3) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1], $params[2]);
                     }
-                } elseif ($cnt===4) {
+                } elseif ($cnt === 4) {
                     while (($i = array_shift($keys)) !== null) {
                         $out[] = $callback($items[$i], $params[1], $params[2], $params[3]);
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
                 }
             }
@@ -1318,7 +1314,7 @@ 
         $tree = $this->scopeTree;
         $cur = $this->data;
 
-        while ($parentLevels--!==0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1330,7 +1326,7 @@ 
             }
         }
 
-        if ($varstr!==null) {
+        if ($varstr !== null) {
             return $this->readVarInto($varstr, $cur);
         } else {
             return $cur;
@@ -1345,14 +1341,14 @@ 
      */
     public function readVar($varstr)
     {
-        if (is_array($varstr)===true) {
+        if (is_array($varstr) === true) {
             $m = $varstr;
             unset($varstr);
         } else {
             if (strstr($varstr, '.') === false && strstr($varstr, '[') === false && strstr($varstr, '->') === false) {
                 if ($varstr === 'dwoo') {
                     return $this->globals;
-                } elseif ($varstr === '__' || $varstr === '_root' ) {
+                } elseif ($varstr === '__' || $varstr === '_root') {
                     return $this->data;
                 } elseif ($varstr === '_' || $varstr === '_parent') {
                     $varstr = '.'.$varstr;
@@ -1488,8 +1484,8 @@ 
      */
     public function assignInScope($value, $scope)
     {
-        $tree =& $this->scopeTree;
-        $data =& $this->data;
+        $tree = & $this->scopeTree;
+        $data = & $this->data;
 
         if (!is_string($scope)) {
             $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
@@ -1500,7 +1496,7 @@ 
             // TODO handle _root/_parent scopes ?
             preg_match_all('#(\[|->|\.)?([^.[\]-]+)\]?#i', $scope, $m);
 
-            $cur =& $this->scope;
+            $cur = & $this->scope;
             $last = array(array_pop($m[1]), array_pop($m[2]));
 
             while (list($k, $sep) = each($m[1])) {
@@ -1508,12 +1504,12 @@ 
                     if (is_array($cur) === false) {
                         $cur = array();
                     }
-                    $cur =& $cur[$m[2][$k]];
+                    $cur = & $cur[$m[2][$k]];
                 } elseif ($sep === '->') {
                     if (is_object($cur) === false) {
                         $cur = new stdClass;
                     }
-                    $cur =& $cur->$m[2][$k];
+                    $cur = & $cur->$m[2][$k];
                 } else {
                     return false;
                 }
@@ -1546,31 +1542,31 @@ 
     {
         $old = $this->scopeTree;
 
-        if (is_string($scope)===true) {
+        if (is_string($scope) === true) {
             $scope = explode('.', $scope);
         }
 
-        if ($absolute===true) {
-            $this->scope =& $this->data;
+        if ($absolute === true) {
+            $this->scope = & $this->data;
             $this->scopeTree = array();
         }
 
         while (($bit = array_shift($scope)) !== null) {
             if ($bit === '_' || $bit === '_parent') {
                 array_pop($this->scopeTree);
-                $this->scope =& $this->data;
+                $this->scope = & $this->data;
                 $cnt = count($this->scopeTree);
-                for ($i=0;$i<$cnt;$i++)
-                    $this->scope =& $this->scope[$this->scopeTree[$i]];
+                for ($i = 0; $i < $cnt; $i++)
+                    $this->scope = & $this->scope[$this->scopeTree[$i]];
             } elseif ($bit === '__' || $bit === '_root') {
-                $this->scope =& $this->data;
+                $this->scope = & $this->data;
                 $this->scopeTree = array();
             } elseif (isset($this->scope[$bit])) {
-                if($this->scope instanceof ArrayAccess) {
+                if ($this->scope instanceof ArrayAccess) {
                     $tmp = $this->scope[$bit];
-                    $this->scope =& $tmp;
+                    $this->scope = & $tmp;
                 } else {
-                    $this->scope =& $this->scope[$bit];
+                    $this->scope = & $this->scope[$bit];
                 }
                 $this->scopeTree[] = $bit;
             } else {

lib/Dwoo/Block/Plugin.php

Spacing +1 added lines, -1 removed lines

@@ -98,6 +98,6 @@
 	 */
 	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
 	{
-		return $content . Dwoo_Compiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.Dwoo_Compiler::PHP_CLOSE;
+		return $content.Dwoo_Compiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.Dwoo_Compiler::PHP_CLOSE;
 	}
 }

lib/Dwoo/Loader.php

Spacing +10 added lines, -10 removed lines

@@ -44,14 +44,14 @@ 
 
 	public function __construct($cacheDir)
 	{
-		$this->corePluginDir = DWOO_DIRECTORY . 'plugins';
-		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$this->corePluginDir = DWOO_DIRECTORY.'plugins';
+		$this->cacheDir = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
 		// include class paths or rebuild paths if the cache file isn't there
 		$cacheFile = $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php';
 		if (file_exists($cacheFile)) {
 			$classpath = file_get_contents($cacheFile);
-			$this->classPath = unserialize($classpath) + $this->classPath;
+			$this->classPath = unserialize($classpath)+$this->classPath;
 		} else {
 			$this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
 		}
@@ -65,25 +65,25 @@ 
 	 */
 	protected function rebuildClassPathCache($path, $cacheFile)
 	{
-		if ($cacheFile!==false) {
+		if ($cacheFile !== false) {
 			$tmp = $this->classPath;
 			$this->classPath = array();
 		}
 
 		// iterates over all files/folders
-		$list = glob(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*');
+		$list = glob(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*');
 		if (is_array($list)) {
 			foreach ($list as $f) {
 				if (is_dir($f)) {
 					$this->rebuildClassPathCache($f, false);
 				} else {
-					$this->classPath[str_replace(array('function.','block.','modifier.','outputfilter.','filter.','prefilter.','postfilter.','pre.','post.','output.','shared.','helper.'), '', basename($f, '.php'))] = $f;
+					$this->classPath[str_replace(array('function.', 'block.', 'modifier.', 'outputfilter.', 'filter.', 'prefilter.', 'postfilter.', 'pre.', 'post.', 'output.', 'shared.', 'helper.'), '', basename($f, '.php'))] = $f;
 				}
 			}
 		}
 
 		// save in file if it's the first call (not recursed)
-		if ($cacheFile!==false) {
+		if ($cacheFile !== false) {
 			if (!file_put_contents($cacheFile, serialize($this->classPath))) {
 				throw new Dwoo_Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
 			}
@@ -109,7 +109,7 @@ 
 			!(include $this->classPath[$class]))
 		{
 			if ($forceRehash) {
-				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
+				$this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php');
 				foreach ($this->paths as $path=>$file) {
 					$this->rebuildClassPathCache($path, $file);
 				}
@@ -142,11 +142,11 @@ 
 		if (!$pluginDir) {
 			throw new Dwoo_Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
 		}
-		$cacheFile = $this->cacheDir . 'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		$cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'), strlen($pluginDir) > 80 ? -80 : 0).'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 		$this->paths[$pluginDir] = $cacheFile;
 		if (file_exists($cacheFile)) {
 			$classpath = file_get_contents($cacheFile);
-			$this->classPath = unserialize($classpath) + $this->classPath;
+			$this->classPath = unserialize($classpath)+$this->classPath;
 		} else {
 			$this->rebuildClassPathCache($pluginDir, $cacheFile);
 		}

lib/Dwoo/Smarty/Adapter.php

Braces +18 added lines, -14 removed lines

@@ -297,9 +297,10 @@ 
 
 	public function unregister_prefilter($callback)
 	{
-		foreach ($this->_filters['pre'] as $index => $processor)
-			if ($processor->callback === $callback) {
+		foreach ($this->_filters['pre'] as $index => $processor) {
+					if ($processor->callback === $callback) {
 				$this->compiler->removePostProcessor($processor);
+		}
 				unset($this->_filters['pre'][$index]);
 			}
 	}
@@ -314,9 +315,10 @@ 
 
 	public function unregister_postfilter($callback)
 	{
-		foreach ($this->_filters['post'] as $index => $processor)
-			if ($processor->callback === $callback) {
+		foreach ($this->_filters['post'] as $index => $processor) {
+					if ($processor->callback === $callback) {
 				$this->compiler->removePostProcessor($processor);
+		}
 				unset($this->_filters['post'][$index]);
 			}
 	}
@@ -331,9 +333,10 @@ 
 
 	public function unregister_outputfilter($callback)
 	{
-		foreach ($this->_filters['output'] as $index => $filter)
-			if ($filter->callback === $callback) {
+		foreach ($this->_filters['output'] as $index => $filter) {
+					if ($filter->callback === $callback) {
 				$this->removeOutputFilter($filter);
+		}
 				unset($this->_filters['output'][$index]);
 			}
 	}
@@ -419,10 +422,11 @@ 
 		}
 
 		$data = $this->dataProvider->getData();
-   		if ($name === null)
-   			return $data;
-   		elseif (isset($data[$name]))
-   			return $data[$name];
+   		if ($name === null) {
+   		   			return $data;
+   		} elseif (isset($data[$name])) {
+   		   			return $data[$name];
+   		}
    		return null;
    	}
 
@@ -450,8 +454,9 @@ 
 
 	protected function makeTemplate($file, $cacheId, $compileId)
 	{
-   		if ($compileId === null)
-   			$compileId = $this->compile_id;
+   		if ($compileId === null) {
+   		   			$compileId = $this->compile_id;
+   		}
 
 		$hash = bin2hex(md5($file.$cacheId.$compileId, true));
 		if (!isset(self::$tplCache[$hash])) {
@@ -511,8 +516,7 @@ 
 {
 	interface Smarty {}
 	class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter implements Smarty {}
-}
-else
+} else
 {
 	class Dwoo_Smarty_Adapter extends Dwoo_Smarty__Adapter {}
 }

Spacing +20 added lines, -25 removed lines

@@ -5,10 +5,10 @@ 
 }
 
 if (!defined('SMARTY_PHP_PASSTHRU')) {
-	define('SMARTY_PHP_PASSTHRU',   0);
-	define('SMARTY_PHP_QUOTE',      1);
-	define('SMARTY_PHP_REMOVE',     2);
-	define('SMARTY_PHP_ALLOW',      3);
+	define('SMARTY_PHP_PASSTHRU', 0);
+	define('SMARTY_PHP_QUOTE', 1);
+	define('SMARTY_PHP_REMOVE', 2);
+	define('SMARTY_PHP_ALLOW', 3);
 }
 
 /**
@@ -32,11 +32,11 @@ 
 	// magic get/set/call functions that handle unsupported features
 	public function __set($p, $v)
 	{
-		if ($p==='scope') {
+		if ($p === 'scope') {
 			$this->scope = $v;
 			return;
 		}
-		if ($p==='data') {
+		if ($p === 'data') {
 			$this->data = $v;
 			return;
 		}
@@ -80,15 +80,12 @@ 
 	}
 
 	// list of unsupported properties and methods
-	protected $compat = array
-	(
-		'methods' => array
-		(
+	protected $compat = array(
+		'methods' => array(
 			'register_resource', 'unregister_resource', 'load_filter', 'clear_compiled_tpl',
 			'clear_config', 'get_config_vars', 'config_load'
 		),
-		'properties' => array
-		(
+		'properties' => array(
 			'cache_handler_func' => null,
 			'debugging' => false,
 			'error_reporting' => null,
@@ -115,11 +112,9 @@ 
 	public $trusted_dir = array();
 	public $secure_dir = array();
 	public $php_handling = SMARTY_PHP_PASSTHRU;
-	public $security_settings = array
-	(
+	public $security_settings = array(
 		'PHP_HANDLING'    => false,
-		'IF_FUNCS'        => array
-		(
+		'IF_FUNCS'        => array(
 			'list', 'empty', 'count', 'sizeof',
 			'in_array', 'is_array',
 		),
@@ -162,12 +157,12 @@ 
 		$this->compiler = new Dwoo_Compiler();
 	}
 
-	public function display($filename, $cacheId=null, $compileId=null)
+	public function display($filename, $cacheId = null, $compileId = null)
 	{
 		$this->fetch($filename, $cacheId, $compileId, true);
 	}
 
-	public function fetch($filename, $cacheId=null, $compileId=null, $display=false)
+	public function fetch($filename, $cacheId = null, $compileId = null, $display = false)
 	{
 		$this->setCacheDir($this->cache_dir);
 		$this->setCompileDir($this->compile_dir);
@@ -180,7 +175,7 @@ 
 			if ($this->security_settings['PHP_TAGS']) {
 				$phpTags = SMARTY_PHP_ALLOW;
 			}
-			switch($phpTags) {
+			switch ($phpTags) {
 				case SMARTY_PHP_ALLOW:
 				case SMARTY_PHP_PASSTHRU:
 					$phpTags = Dwoo_Security_Policy::PHP_ALLOW;
@@ -235,7 +230,7 @@ 
 
 		$this->compiler->setDelimiters($this->left_delimiter, $this->right_delimiter);
 
-		return $this->get($tpl, $this->dataProvider, $this->compiler, $display===true);
+		return $this->get($tpl, $this->dataProvider, $this->compiler, $display === true);
 	}
 
 	public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
@@ -246,7 +241,7 @@ 
 		return parent::get($_tpl, $data, $_compiler, $_output);
 	}
 
-	public function register_function($name, $callback, $cacheable=true, $cache_attrs=null)
+	public function register_function($name, $callback, $cacheable = true, $cache_attrs = null)
 	{
 		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_FUNCTION) {
 			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
@@ -259,7 +254,7 @@ 
 		unset($this->plugins[$name]);
 	}
 
-	public function register_block($name, $callback, $cacheable=true, $cache_attrs=null)
+	public function register_block($name, $callback, $cacheable = true, $cache_attrs = null)
 	{
 		if (isset($this->plugins[$name]) && $this->plugins[$name][0] !== self::SMARTY_BLOCK) {
 			throw new Dwoo_Exception('Multiple plugins of different types can not share the same name');
@@ -390,7 +385,7 @@ 
    		return $this->isCached($this->makeTemplate($tpl, $cacheId, $compileId));
    	}
 
-   	public function append_by_ref($var, &$value, $merge=false)
+   	public function append_by_ref($var, &$value, $merge = false)
    	{
    		$this->dataProvider->appendByRef($var, $value, $merge);
    	}
@@ -410,7 +405,7 @@ 
    		$this->dataProvider->clear();
    	}
 
-	public function get_template_vars($name=null)
+	public function get_template_vars($name = null)
 	{
 		if ($this->show_compat_errors) {
 			trigger_error('get_template_vars does not return values by reference, if you try to modify the data that way you should modify your code.', E_USER_NOTICE);
@@ -465,7 +460,7 @@ 
 		return self::$tplCache[$hash];
 	}
 
-	public function triggerError($message, $level=E_USER_NOTICE)
+	public function triggerError($message, $level = E_USER_NOTICE)
 	{
 		if (is_object($this->template)) {
 			return parent::triggerError($message, $level);

lib/Dwoo/Plugin.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 		$out = '';
 		foreach ($params as $attr=>$val) {
 			$out .= ' '.$attr.'=';
-			if (trim($val, '"\'')=='' || $val=='null') {
+			if (trim($val, '"\'') == '' || $val == 'null') {
 				$out .= str_replace($delim, '\\'.$delim, '""');
 			} elseif (substr($val, 0, 1) === $delim && substr($val, -1) === $delim) {
 				$out .= str_replace($delim, '\\'.$delim, '"'.substr($val, 1, -1).'"');
@@ -88,8 +88,8 @@ 
 					$escapedVal = '.'.$val.'.';
 				}
 
-				$out .= str_replace($delim, '\\'.$delim, '"') .
-					$delim . $escapedVal . $delim .
+				$out .= str_replace($delim, '\\'.$delim, '"').
+					$delim.$escapedVal.$delim.
 					str_replace($delim, '\\'.$delim, '"');
 			}
 		}

lib/Dwoo/Security/Policy.php

Spacing +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
 	 *
 	 * @var array
 	 */
-	protected $allowedPhpFunctions = array
-	(
+	protected $allowedPhpFunctions = array(
 		'str_repeat' => true,
 		'number_format' => true,
 		'htmlentities' => true,

Braces +30 added lines, -24 removed lines

@@ -100,11 +100,12 @@ 
 	 */
 	public function allowPhpFunction($func)
 	{
-		if (is_array($func))
-			foreach ($func as $fname)
+		if (is_array($func)) {
+					foreach ($func as $fname)
 				$this->allowedPhpFunctions[strtolower($fname)] = true;
-		else
-			$this->allowedPhpFunctions[strtolower($func)] = true;
+		} else {
+					$this->allowedPhpFunctions[strtolower($func)] = true;
+		}
 	}
 
 	/**
@@ -114,11 +115,12 @@ 
 	 */
 	public function disallowPhpFunction($func)
 	{
-		if (is_array($func))
-			foreach ($func as $fname)
+		if (is_array($func)) {
+					foreach ($func as $fname)
 				unset($this->allowedPhpFunctions[strtolower($fname)]);
-		else
-			unset($this->allowedPhpFunctions[strtolower($func)]);
+		} else {
+					unset($this->allowedPhpFunctions[strtolower($func)]);
+		}
 	}
 
 	/**
@@ -142,11 +144,12 @@ 
 	 */
 	public function allowMethod($class, $method = null)
 	{
-		if (is_array($class))
-			foreach ($class as $elem)
+		if (is_array($class)) {
+					foreach ($class as $elem)
 				$this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])] = true;
-		else
-			$this->allowedMethods[strtolower($class)][strtolower($method)] = true;
+		} else {
+					$this->allowedMethods[strtolower($class)][strtolower($method)] = true;
+		}
 	}
 
 	/**
@@ -157,11 +160,12 @@ 
 	 */
 	public function disallowMethod($class, $method = null)
 	{
-		if (is_array($class))
-			foreach ($class as $elem)
+		if (is_array($class)) {
+					foreach ($class as $elem)
 				unset($this->allowedMethods[strtolower($elem[0])][strtolower($elem[1])]);
-		else
-			unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
+		} else {
+					unset($this->allowedMethods[strtolower($class)][strtolower($method)]);
+		}
 	}
 
 	/**
@@ -185,11 +189,12 @@ 
 	 */
 	public function allowDirectory($path)
 	{
-		if (is_array($path))
-			foreach ($path as $dir)
+		if (is_array($path)) {
+					foreach ($path as $dir)
 				$this->allowedDirectories[realpath($dir)] = true;
-		else
-			$this->allowedDirectories[realpath($path)] = true;
+		} else {
+					$this->allowedDirectories[realpath($path)] = true;
+		}
 	}
 
 	/**
@@ -199,11 +204,12 @@ 
 	 */
 	public function disallowDirectory($path)
 	{
-		if (is_array($path))
-			foreach ($path as $dir)
+		if (is_array($path)) {
+					foreach ($path as $dir)
 				unset($this->allowedDirectories[realpath($dir)]);
-		else
-			unset($this->allowedDirectories[realpath($path)]);
+		} else {
+					unset($this->allowedDirectories[realpath($path)]);
+		}
 	}
 
 	/**

lib/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php

Spacing +2 added lines, -2 removed lines

@@ -97,14 +97,14 @@
         $CI->benchmark->mark('dwoo_parse_start');
 
         // Check if file exists
-        if ( !file_exists($this->template_dir . $sTemplate ) ) {
+        if (!file_exists($this->template_dir.$sTemplate)) {
             $message = sprintf('Template file \'%s\' not found.', $sTemplate);
             show_error($message);
             log_message('error', $message);
         }
 
         // Create new template
-        $tpl = new Dwoo_Template_File($this->template_dir . $sTemplate);
+        $tpl = new Dwoo_Template_File($this->template_dir.$sTemplate);
 
         // render the template
         $template = $this->get($tpl, $this->dwoo_data);

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 require "dwoo/dwooAutoload.php";
 

lib/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php

Spacing +3 added lines, -3 removed lines

@@ -1,12 +1,12 @@
 <?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 // The name of the directory where templates are located.
-$config['template_dir'] = dirname(FCPATH) . '/../application/views/';
+$config['template_dir'] = dirname(FCPATH).'/../application/views/';
 
 // The directory where compiled templates are located
-$config['compileDir']   = dirname(FCPATH) . '/../compile/';
+$config['compileDir']   = dirname(FCPATH).'/../compile/';
 
 //This tells Dwoo whether or not to cache the output of the templates to the $cache_dir.
 $config['caching']      = 0;
-$config['cacheDir']     = dirname(FCPATH) . '/../cache/';
+$config['cacheDir']     = dirname(FCPATH).'/../cache/';
 $config['cacheTime']    = 0;

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 // The name of the directory where templates are located.
 $config['template_dir'] = dirname(FCPATH) . '/../application/views/';