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/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/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,

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);

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;

lib/Dwoo/Adapters/ZendFramework/Dwoo.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 			return $this->getPluginProxy()->view->$name;
 		}
 		$trace = debug_backtrace();
-		trigger_error('Undefined property via __get(): ' . $name .
-					  ' in ' . $trace[0]['file'] .
-					  ' on line ' . $trace[0]['line'], E_USER_NOTICE);
+		trigger_error('Undefined property via __get(): '.$name.
+					  ' in '.$trace[0]['file'].
+					  ' on line '.$trace[0]['line'], E_USER_NOTICE);
 		return null;
 	}
 }
\ No newline at end of file

lib/Dwoo/Adapters/ZendFramework/View.php

Spacing +8 added lines, -8 removed lines

@@ -97,26 +97,26 @@ 
 
 		// Setting options to Dwoo objects...
 		foreach ($opt as $type => $settings) {
-			if (!method_exists($this, 'set' . $type)) {
+			if (!method_exists($this, 'set'.$type)) {
 				throw new Dwoo_Exception("Unknown type $type");
 			}
 
 			if (is_string($settings) || is_object($settings)) {
-				call_user_func(array($this, 'set' . $type), $settings);
+				call_user_func(array($this, 'set'.$type), $settings);
 			} elseif (is_array($settings)) {
 				// Set requested class
 				if (array_key_exists('type', $settings)) {
-					call_user_func(array($this, 'set' . $type), $settings['type']);
+					call_user_func(array($this, 'set'.$type), $settings['type']);
 				}
 
 				if (in_array($type, $classes)) {
 					// Call get so that the class is initialized
-					$rel = call_user_func(array($this, 'get' . $type));
+					$rel = call_user_func(array($this, 'get'.$type));
 
 					// Call set*() methods so that all the settings are set.
 					foreach ($settings as $method => $value) {
-						if (method_exists($rel, 'set' . $method)) {
-							call_user_func(array($rel, 'set' . $method), $value);
+						if (method_exists($rel, 'set'.$method)) {
+							call_user_func(array($rel, 'set'.$method), $value);
 						}
 					}
 				} elseif ('templateFile' == $type) {
@@ -356,8 +356,8 @@ 
 		}
 
 		foreach ($this->_templateFileSettings as $method => $value) {
-			if (method_exists($dwooTemplateFile, 'set' . $method)) {
-				call_user_func(array($dwooTemplateFile, 'set' . $method), $value);
+			if (method_exists($dwooTemplateFile, 'set'.$method)) {
+				call_user_func(array($dwooTemplateFile, 'set'.$method), $value);
 			}
 		}