dwoo-project / dwoo

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

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      *
      * @param string $sTemplate
      * @param boolean $return
-     * @return mixed
+     * @return null|string
      */
     public function display($sTemplate, $return = FALSE) {
         // Start benchmark

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/ZendFramework/PluginProxy.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	/**
 	 * Dwoo_Adapters_ZendFramework_PluginProxy's constructor.
 	 *
-	 * @param Zend_View_Interface $view
+	 * @param Dwoo_Adapters_ZendFramework_View $view
 	 */
 	public function __construct(Zend_View_Interface $view) {
 		$this->view = $view;

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 * @return string
 	 */
 	public function getCode($name, $params) {
-		return '$this->getPluginProxy()->view->'. $name .'('.Dwoo_Compiler::implode_r($params).')';
+		return '$this->getPluginProxy()->view->'.$name.'('.Dwoo_Compiler::implode_r($params).')';
 	}
 
 	/**

lib/Dwoo/Data.php

Doc Comments -1 removed lines

@@ -66,7 +66,6 @@
 	 * merges the given array(s) with the current data with array_merge
 	 *
 	 * @param array $data the array to merge
-	 * @param array $data2 $data3 ... other arrays to merge, optional, etc.
 	 */
 	public function mergeData(array $data)
 	{

Spacing +6 added lines, -6 removed lines

@@ -92,7 +92,7 @@ 
 	{
 		if (is_array($name)) {
 			reset($name);
-			while (list($k,$v) = each($name))
+			while (list($k, $v) = each($name))
 				$this->data[$k] = $v;
 		} else {
 			$this->data[$name] = $val;
@@ -119,7 +119,7 @@ 
 	 */
 	public function assignByRef($name, &$val)
 	{
-		$this->data[$name] =& $val;
+		$this->data[$name] = & $val;
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 				}
 
 				if ($merge === true && is_array($val)) {
-					$this->data[$key] = $val + $this->data[$key];
+					$this->data[$key] = $val+$this->data[$key];
 				} else {
 					$this->data[$key][] = $val;
 				}
@@ -153,7 +153,7 @@ 
 			}
 
 			if ($merge === true && is_array($val)) {
-				$this->data[$name] = $val + $this->data[$name];
+				$this->data[$name] = $val+$this->data[$name];
 			} else {
 				$this->data[$name][] = $val;
 			}
@@ -176,10 +176,10 @@ 
 
    		if ($merge === true && is_array($val)) {
    			foreach ($val as $key => &$value) {
-   				$this->data[$name][$key] =& $value;
+   				$this->data[$name][$key] = & $value;
    			}
    		} else {
-   			$this->data[$name][] =& $val;
+   			$this->data[$name][] = & $val;
    		}
    	}
    	

lib/Dwoo/ICompiler.php

Doc Comments +3 added lines, -1 removed lines

@@ -24,7 +24,7 @@ 
 	/**
 	 * compiles the provided string down to php code
 	 *
-	 * @param string $templateStr the template to compile
+	 * @param string $template the template to compile
 	 * @return string a compiled php code string
 	 */
 	public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template);
@@ -34,6 +34,7 @@ 
 	 *
 	 * @see Dwoo_Core::addPlugin
 	 * @param array $customPlugins an array of custom plugins
+	 * @return void
 	 */
 	public function setCustomPlugins(array $customPlugins);
 
@@ -44,6 +45,7 @@ 
 	 * set it on the Dwoo object as it will be passed onto the compiler automatically
 	 *
 	 * @param Dwoo_Security_Policy $policy the security policy object
+	 * @return void
 	 */
 	public function setSecurityPolicy(Dwoo_Security_Policy $policy = null);
 }

lib/Dwoo/Loader.php

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
 
 	protected $corePluginDir;
 
+	/**
+	 * @param string $cacheDir
+	 */
 	public function __construct($cacheDir)
 	{
 		$this->corePluginDir = DWOO_DIRECTORY . 'plugins';

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/Template/String.php

Doc Comments +1 added lines, -1 removed lines

@@ -278,7 +278,7 @@
 	 *
 	 * @param Dwoo_Core $dwoo the dwoo instance that requests it
 	 * @param string $output the template output
-	 * @return mixed full path of the cached file or false upon failure
+	 * @return false|string full path of the cached file or false upon failure
 	 */
 	public function cache(Dwoo_Core $dwoo, $output)
 	{

Spacing +8 added lines, -8 removed lines

@@ -267,7 +267,7 @@ 
 		if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
 			// already checked, return cache file
 			return $cachedFile;
-		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
+		} elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
 			// cache is still valid and can be loaded
 			self::$cache['cached'][$this->cacheId] = true;
 			return $cachedFile;
@@ -293,7 +293,7 @@ 
 		// thanks for his help on avoiding concurency issues
 		$temp = tempnam($cacheDir, 'temp');
 		if (!($file = @fopen($temp, 'wb'))) {
-			$temp = $cacheDir . uniqid('temp');
+			$temp = $cacheDir.uniqid('temp');
 			if (!($file = @fopen($temp, 'wb'))) {
 				trigger_error('Error writing temporary file \''.$temp.'\'', E_USER_WARNING);
 				return false;
@@ -329,7 +329,7 @@ 
 	{
 		$cachedFile = $this->getCacheFilename($dwoo);
 
-		return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+		return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
 	}
 
 	/**
@@ -426,10 +426,10 @@ 
 	protected function getCompiledFilename(Dwoo_Core $dwoo)
 	{
 		// no compile id was provided, set default
-		if ($this->compileId===null) {
+		if ($this->compileId === null) {
 			$this->compileId = $this->name;
 		}
-		return $dwoo->getCompileDir() . $this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
+		return $dwoo->getCompileDir().$this->compileId.'.d'.Dwoo_Core::RELEASE_TAG.'.php';
 	}
 
 	/**
@@ -453,9 +453,9 @@ 
 			// force compiled id generation
 			$this->getCompiledFilename($dwoo);
 
-			$this->cacheId = str_replace('../', '__', $this->compileId . strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
+			$this->cacheId = str_replace('../', '__', $this->compileId.strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
 		}
-		return $dwoo->getCacheDir() . $this->cacheId.'.html';
+		return $dwoo->getCacheDir().$this->cacheId.'.html';
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 			$path = strtr(str_replace($baseDir, '', $path), '\\', '/');
 			$folders = explode('/', trim($path, '/'));
 			foreach ($folders as $folder) {
-				$baseDir .= $folder . DIRECTORY_SEPARATOR;
+				$baseDir .= $folder.DIRECTORY_SEPARATOR;
 				if (!chmod($baseDir, $chmod))
 				{
 					throw new Exception("Unable to chmod ".

lib/plugins/builtin/blocks/dynamic.php

Doc Comments +4 added lines

@@ -53,6 +53,10 @@
 		return $output;
 	}
 
+	/**
+	 * @param string $dynamicId
+	 * @param string $compiledFile
+	 */
 	public static function unescape($output, $dynamicId, $compiledFile)
 	{
 		$output = preg_replace_callback('/<dwoo:dynamic_('.$dynamicId.')>(.+?)<\/dwoo:dynamic_'.$dynamicId.'>/s', array('self', 'unescapePhp'), $output, -1, $count);

Spacing +6 added lines, -6 removed lines

@@ -32,23 +32,23 @@
 			return $content;
 		} catch (Dwoo_Compilation_Exception $e) {
 		}
-		$output = Dwoo_Compiler::PHP_OPEN .
+		$output = Dwoo_Compiler::PHP_OPEN.
 			'if($doCache) {'."\n\t".
 				'echo \'<dwoo:dynamic_\'.$dynamicId.\'>'.
-				str_replace('\'', '\\\'', $content) .
+				str_replace('\'', '\\\'', $content).
 				'</dwoo:dynamic_\'.$dynamicId.\'>\';'.
 			"\n} else {\n\t";
-				if(substr($content, 0, strlen(Dwoo_Compiler::PHP_OPEN)) == Dwoo_Compiler::PHP_OPEN) {
+				if (substr($content, 0, strlen(Dwoo_Compiler::PHP_OPEN)) == Dwoo_Compiler::PHP_OPEN) {
 					$output .= substr($content, strlen(Dwoo_Compiler::PHP_OPEN));
 				} else {
-					$output .= Dwoo_Compiler::PHP_CLOSE . $content;
+					$output .= Dwoo_Compiler::PHP_CLOSE.$content;
 				}
-				if(substr($output, -strlen(Dwoo_Compiler::PHP_CLOSE)) == Dwoo_Compiler::PHP_CLOSE) {
+				if (substr($output, -strlen(Dwoo_Compiler::PHP_CLOSE)) == Dwoo_Compiler::PHP_CLOSE) {
 					$output = substr($output, 0, -strlen(Dwoo_Compiler::PHP_CLOSE));
 				} else {
 					$output .= Dwoo_Compiler::PHP_OPEN;
 				}
-			$output .= "\n}". Dwoo_Compiler::PHP_CLOSE;
+			$output .= "\n}".Dwoo_Compiler::PHP_CLOSE;
 
 		return $output;
 	}

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