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

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

lib/Dwoo/Adapters/ZendFramework/View.php

Doc Comments +3 added lines, -4 removed lines

@@ -87,7 +87,6 @@ 
 	 *  - type class name or object for engine, dataProvider or compiler
 	 *  - any set* method (compileDir for setCompileDir ...)
 	 *
-	 * @param  array $options
 	 * @return Dwoo_Adapters_ZendFramework_View
 	 */
 	public function setOptions(array $opt = array())
@@ -272,6 +271,7 @@ 
 	 * Sets Dwoo data object
 	 *
 	 * @param string|Dwoo_Data Object or name of the class
+	 * @param Dwoo_Data $data
 	 */
 	public function setDataProvider($data)
 	{
@@ -329,7 +329,7 @@ 
 	/**
 	 * Return the Dwoo compiler object
 	 *
-	 * @return Dwoo_Data
+	 * @return Dwoo_Compiler
 	 */
 	public function getCompiler()
 	{
@@ -404,7 +404,7 @@ 
 	 * Clears all variables assigned to Zend_View either via {@link assign()} or
 	 * property overloading ({@link __get()}/{@link __set()}).
 	 *
-	 * @return void
+	 * @return Dwoo_Adapters_ZendFramework_View
 	 * @return Dwoo_Adapters_ZendFramework_View
 	 */
 	public function clearVars()
@@ -431,7 +431,6 @@ 
 	 * Processes a view script and outputs it. Output is then
 	 * passed through filters.
 	 *
-	 * @param string $name The script script name to process.
 	 * @return string The script output.
 	 */
 	public function _run()

Braces +4 added lines, -8 removed lines

@@ -248,8 +248,7 @@ 
 		//
 		elseif (is_subclass_of($engine, 'Dwoo') || 'Dwoo' === $engine) {
 			$this->_engine = new $engine();
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom engine must be a subclass of Dwoo");
 		}
 	}
@@ -277,11 +276,9 @@ 
 	{
 		if ($data instanceof Dwoo_IDataProvider) {
 			$this->_dataProvider = $data;
-		}
-		elseif (is_subclass_of($data, 'Dwoo_Data') || 'Dwoo_Data' == $data) {
+		} elseif (is_subclass_of($data, 'Dwoo_Data') || 'Dwoo_Data' == $data) {
 			$this->_dataProvider = new $data();
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom data provider must be a subclass of Dwoo_Data or instance of Dwoo_IDataProvider");
 		}
 	}
@@ -320,8 +317,7 @@ 
 		// if param given as a string
 		elseif (is_subclass_of($compiler, 'Dwoo_Compiler') || 'Dwoo_Compiler' == $compiler) {
 			$this->_compiler = new $compiler;
-		}
-		else {
+		} else {
 			throw new Dwoo_Exception("Custom compiler must be a subclass of Dwoo_Compiler or instance of Dwoo_ICompiler");
 		}
 	}

lib/Dwoo/Compiler.php

Doc Comments +3 added lines, -4 removed lines

@@ -270,7 +270,7 @@ 
 	/**
 	 * returns the left and right template delimiters
 	 *
-	 * @return array containing the left and the right delimiters
+	 * @return string[] containing the left and the right delimiters
 	 */
 	public function getDelimiters()
 	{
@@ -358,7 +358,7 @@ 
 	 * adds a preprocessor to the compiler, it will be called
 	 * before the template is compiled
 	 *
-	 * @param mixed $callback either a valid callback to the preprocessor or a simple name if the autoload is set to true
+	 * @param string $callback either a valid callback to the preprocessor or a simple name if the autoload is set to true
 	 * @param bool $autoload if set to true, the preprocessor is auto-loaded from one of the plugin directories, else you must provide a valid callback
 	 */
 	public function addPreProcessor($callback, $autoload = false)
@@ -685,7 +685,6 @@ 
 	/**
 	 * compiles the provided string down to php code
 	 *
-	 * @param string $tpl the template to compile
 	 * @return string a compiled php string
 	 */
 	public function compile(Dwoo_Core $dwoo, Dwoo_ITemplate $template)
@@ -1215,7 +1214,7 @@ 
 	 * returns the token of each parameter out of the given parameter array
 	 *
 	 * @param array $params parameter array
-	 * @return array tokens
+	 * @return Dwoo_Compiler tokens
 	 */
 	public function getParamTokens(array $params)
 	{

Braces +156 added lines, -57 removed lines

@@ -713,9 +713,13 @@ 
 				$compiled = $this->addBlock('topLevelBlock', array(), 0);
 				$this->stack[0]['buffer'] = '';
 
-				if ($this->debug) echo 'COMPILER INIT<br />';
+				if ($this->debug) {
+					echo 'COMPILER INIT<br />';
+				}
 
-				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')<br>';
+				if ($this->debug) {
+					echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')<br>';
+				}
 
 				// runs preprocessors
 				foreach ($this->processors['pre'] as $preProc) {
@@ -731,7 +735,9 @@ 
 				unset($preProc);
 
 				// show template source if debug
-				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre><hr />';
+				if ($this->debug) {
+					echo '<pre>'.print_r(htmlentities($tpl), true).'</pre><hr />';
+				}
 
 				// strips php tags if required by the security policy
 				if ($this->securityPolicy !== null) {
@@ -820,7 +826,9 @@ 
 
 		$compiled .= $this->removeBlock('topLevelBlock');
 
-		if ($this->debug) echo 'PROCESSING POSTPROCESSORS<br>';
+		if ($this->debug) {
+			echo 'PROCESSING POSTPROCESSORS<br>';
+		}
 
 		foreach ($this->processors['post'] as $postProc) {
 			if (is_array($postProc) && isset($postProc['autoload'])) {
@@ -834,7 +842,9 @@ 
 		}
 		unset($postProc);
 
-		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage().'<br>';
+		if ($this->debug) {
+			echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage().'<br>';
+		}
 
 		$output = "<?php\n/* template head */\n";
 
@@ -902,7 +912,9 @@ 
 				echo ($i+1).'. '.$line."\r\n";
 			}
 		}
-		if ($this->debug) echo '<hr></pre></pre>';
+		if ($this->debug) {
+			echo '<hr></pre></pre>';
+		}
 
 		$this->template = $this->dwoo = null;
 		$tpl = null;
@@ -987,8 +999,9 @@ 
 				reset($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 === '_root' || $bit === '__') {
 				$this->scope =& $this->data;
 				$this->scopeTree = array();
@@ -1253,7 +1266,9 @@ 
 			if ($curBlock === 'root' && substr($in, $from, strlen($this->rd)) === $this->rd) {
 				// end template tag
 				$pointer += strlen($this->rd);
-				if ($this->debug) echo 'TEMPLATE PARSING ENDED<br />';
+				if ($this->debug) {
+					echo 'TEMPLATE PARSING ENDED<br />';
+				}
 				return false;
 			}
 			$from++;
@@ -1272,7 +1287,9 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		if ($this->debug) {
+			echo '<br />PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer.'<br/>';
+		}
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
@@ -1357,7 +1374,9 @@ 
 			$parsed = 'func';
 		} elseif ($first === ';') {
 			// instruction end
-			if ($this->debug) echo 'END OF INSTRUCTION<br />';
+			if ($this->debug) {
+				echo 'END OF INSTRUCTION<br />';
+			}
 			if ($pointer !== null) {
 				$pointer++;
 			}
@@ -1377,20 +1396,28 @@ 
 				if ($this->curBlock['type'] == 'else' || $this->curBlock['type'] == 'elseif') {
 					$pointer -= strlen($match[0]);
 				}
-				if ($this->debug) echo 'TOP BLOCK CLOSED<br />';
+				if ($this->debug) {
+					echo 'TOP BLOCK CLOSED<br />';
+				}
 				return $this->removeTopBlock();
 			} else {
-				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED<br />';
+				if ($this->debug) {
+					echo 'BLOCK OF TYPE '.$match[1].' CLOSED<br />';
+				}
 				return $this->removeBlock($match[1]);
 			}
 		} elseif ($curBlock === 'root' && substr($substr, 0, strlen($this->rd)) === $this->rd) {
 			// end template tag
-			if ($this->debug) echo 'TAG PARSING ENDED<br />';
+			if ($this->debug) {
+				echo 'TAG PARSING ENDED<br />';
+			}
 			$pointer += strlen($this->rd);
 			return false;
 		} elseif (is_array($parsingParams) && preg_match('#^(([\'"]?)[a-z0-9_]+\2\s*='.($curBlock === 'array' ? '>?':'').')(?:\s+|[^=]).*#i', $substr, $match)) {
 			// named parameter
-			if ($this->debug) echo 'NAMED PARAM FOUND<br />';
+			if ($this->debug) {
+				echo 'NAMED PARAM FOUND<br />';
+			}
 			$len = strlen($match[1]);
 			while (substr($in, $from+$len, 1)===' ') {
 				$len++;
@@ -1430,7 +1457,9 @@ 
 		// var parsed, check if any var-extension applies
 		if ($parsed==='var') {
 			if (preg_match('#^\s*([/%+*-])\s*([a-z0-9]|\$)#i', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
+				if($this->debug) {
+					echo 'PARSING POST-VAR EXPRESSION '.$substr.'<br />';
+				}
 				// parse expressions
 				$pointer += strlen($match[0]) - 1;
 				if (is_array($parsingParams)) {
@@ -1460,7 +1489,9 @@ 
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				if($this->debug) {
+					echo 'PARSING POST-VAR ASSIGNMENT '.$substr.'<br />';
+				}
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1502,7 +1533,9 @@ 
 				$out = Dwoo_Compiler::PHP_OPEN. $echo . $out . $operator . implode(' ', $value) . Dwoo_Compiler::PHP_CLOSE;
 			} else if ($curBlock === 'array' && is_array($parsingParams) && preg_match('#^(\s*=>?\s*)#', $substr, $match)) {
 				// parse namedparam with var as name (only for array)
-				if ($this->debug) echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND<br />';
+				if ($this->debug) {
+					echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND<br />';
+				}
 				$len = strlen($match[1]);
 				$var = $out[count($out)-1];
 				$pointer += $len;
@@ -1576,7 +1609,9 @@ 
 			$cmdstr = $match[1];
 		}
 
-		if ($this->debug) echo 'FUNC FOUND ('.$func.')<br />';
+		if ($this->debug) {
+			echo 'FUNC FOUND ('.$func.')<br />';
+		}
 
 		$paramsep = '';
 
@@ -1638,17 +1673,25 @@ 
 							}
 
 							if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif ($paramstr[$ptr] === ';') {
 								$ptr++;
-								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === '/') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							} elseif (substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr.'<br/>';
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr.'<br/>';
+								}
 								break 2;
 							}
 
@@ -1659,7 +1702,9 @@ 
 							}
 						}
 
-						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+						if ($this->debug) {
+							echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+						}
 
 						if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'condition', $ptr);
@@ -1669,7 +1714,9 @@ 
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'function', $ptr);
 						}
 
-						if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')<br/>';
+						}
 					}
 				}
 				$paramstr = substr($paramstr, 0, $ptr);
@@ -1693,7 +1740,9 @@ 
 
 		if ($pointer !== null) {
 			$pointer += (isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func) + (isset($whitespace) ? $whitespace : 0);
-			if ($this->debug) echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER<br/>';
+			if ($this->debug) {
+				echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER<br/>';
+			}
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1931,7 +1980,9 @@ 
 		$substr = substr($in, $from, $to-$from);
 		$first = $substr[0];
 
-		if ($this->debug) echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')<br />';
+		if ($this->debug) {
+			echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')<br />';
+		}
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1944,7 +1995,9 @@ 
 				$strend = false;
 			}
 		}
-		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from).'<br/>';
+		if ($this->debug) {
+			echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from).'<br/>';
+		}
 
 		$srcOutput = substr($in, $from, $strend+1-$from);
 
@@ -2150,11 +2203,15 @@ 
 				}
 				unset($uid, $current, $curTxt, $tree, $chars);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key.'<br>';
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT : '.$key.'<br>';
+				}
 
 				$key = $this->flattenVarTree($parsed);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+				}
 
 				$output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
 			} else {
@@ -2334,8 +2391,9 @@ 
 				$global = 'COOKIE';
 			}
 			$key = '$_'.$global;
-			foreach (explode('.', ltrim($m[2], '.')) as $part)
-				$key .= '['.var_export($part, true).']';
+			foreach (explode('.', ltrim($m[2], '.')) as $part) {
+							$key .= '['.var_export($part, true).']';
+			}
 			if ($curBlock === 'root') {
 				$output = $key;
 			} else {
@@ -2445,7 +2503,9 @@ 
 				} else {
 					$cnt = substr_count($key, '$');
 
-					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key.'<br>';
+					if ($this->debug) {
+						echo 'PARSING SUBVARS IN : '.$key.'<br>';
+					}
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
@@ -2467,7 +2527,9 @@ 
 								$last,
 								$len
 							);
-							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+							if ($this->debug) {
+								echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key.'<br>';
+							}
 						}
 						unset($last);
 
@@ -2548,15 +2610,21 @@ 
 		$substr = trim($substr);
 
 		if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
-			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED<br />';
+			if ($this->debug) {
+				echo 'BOOLEAN(FALSE) PARSED<br />';
+			}
 			$substr = 'false';
 			$type = self::T_BOOL;
 		} elseif (strtolower($substr) === 'true' || strtolower($substr) === 'yes' || strtolower($substr) === 'on') {
-			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED<br />';
+			if ($this->debug) {
+				echo 'BOOLEAN(TRUE) PARSED<br />';
+			}
 			$substr = 'true';
 			$type = self::T_BOOL;
 		} elseif ($substr === 'null' || $substr === 'NULL') {
-			if ($this->debug) echo 'NULL PARSED<br />';
+			if ($this->debug) {
+				echo 'NULL PARSED<br />';
+			}
 			$substr = 'null';
 			$type = self::T_NULL;
 		} elseif (is_numeric($substr)) {
@@ -2565,19 +2633,27 @@ 
 				$substr = (int) $substr;
 			}
 			$type = self::T_NUMERIC;
-			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED<br />';
+			if ($this->debug) {
+				echo 'NUMBER ('.$substr.') PARSED<br />';
+			}
 		} elseif (preg_match('{^-?(\d+|\d*(\.\d+))\s*([/*%+-]\s*-?(\d+|\d*(\.\d+)))+$}', $substr)) {
-			if ($this->debug) echo 'SIMPLE MATH PARSED<br />';
+			if ($this->debug) {
+				echo 'SIMPLE MATH PARSED<br />';
+			}
 			$type = self::T_MATH;
 			$substr = '('.$substr.')';
 		} elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
-			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED<br />';
+			if ($this->debug) {
+				echo 'BREAKCHAR ('.$substr.') PARSED<br />';
+			}
 			$type = self::T_BREAKCHAR;
 			//$substr = '"'.$substr.'"';
 		} else {
 			$substr = $this->replaceStringVars('\''.str_replace('\'', '\\\'', $substr).'\'', '\'', $curBlock);
 			$type = self::T_UNQUOTED_STRING;
-			if ($this->debug) echo 'BLABBER ('.$substr.') CASTED AS STRING<br />';
+			if ($this->debug) {
+				echo 'BLABBER ('.$substr.') CASTED AS STRING<br />';
+			}
 		}
 
 		if (is_array($parsingParams)) {
@@ -2603,7 +2679,9 @@ 
 	protected function replaceStringVars($string, $first, $curBlock='')
 	{
 		$pos = 0;
-		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
+		if ($this->debug) {
+			echo 'STRING VAR REPLACEMENT : '.$string.'<br>';
+		}
 		// replace vars
 		while (($pos = strpos($string, '$', $pos)) !== false) {
 			$prev = substr($string, $pos-1, 1);
@@ -2622,7 +2700,9 @@ 
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
 			}
 			$pos += strlen($var[1]) + 2;
-			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
+			if ($this->debug) {
+				echo 'STRING VAR REPLACEMENT DONE : '.$string.'<br>';
+			}
 		}
 
 		// handle modifiers
@@ -2646,7 +2726,9 @@ 
 	 */
 	protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
 	{
-		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3].'<br />';
+		if ($this->debug) {
+			echo 'PARSING MODIFIERS : '.$m[3].'<br />';
+		}
 
 		if ($pointer !== null) {
 			$pointer += strlen($m[3]);
@@ -2668,7 +2750,9 @@ 
 				continue;
 			}
 			if ($cmdstrsrc[0] === ' ' || $cmdstrsrc[0] === ';' || substr($cmdstrsrc, 0, strlen($this->rd)) === $this->rd) {
-				if ($this->debug) echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND<br/>';
+				if ($this->debug) {
+					echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND<br/>';
+				}
 				$continue = false;
 				if ($pointer !== null) {
 					$pointer -= strlen($cmdstrsrc);
@@ -2687,7 +2771,9 @@ 
 			if ($paramspos === false) {
 				$cmdstrsrc = substr($cmdstrsrc, strlen($func));
 				$params = array();
-				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS<br/>';
+				if ($this->debug) {
+					echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS<br/>';
+				}
 			} else {
 				$paramstr = substr($cmdstr, $paramspos+1);
 				if (substr($paramstr, -1, 1) === $paramsep) {
@@ -2697,18 +2783,28 @@ 
 				$ptr = 0;
 				$params = array();
 				while ($ptr < strlen($paramstr)) {
-					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
-					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier<br/>';
+					if ($this->debug) {
+						echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr.'<br/>';
+					}
+					if ($this->debug) {
+						echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier<br/>';
+					}
 					$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'modifier', $ptr);
-					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.'<br/>';
+					if ($this->debug) {
+						echo 'PARAM PARSED, POINTER AT '.$ptr.'<br/>';
+					}
 
 					if ($ptr >= strlen($paramstr)) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED<br/>';
+						}
 						break;
 					}
 
 					if ($paramstr[$ptr] === ' ' || $paramstr[$ptr] === '|' || $paramstr[$ptr] === ';' || substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr.'<br/>';
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr.'<br/>';
+						}
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
@@ -2769,8 +2865,9 @@ 
 				}
 			} elseif ($pluginType & Dwoo_Core::PROXY_PLUGIN) {
 				$params = $this->mapParams($params, $this->getDwoo()->getPluginProxy()->getCallback($func), $state);
-				foreach ($params as &$p)
-					$p = $p[0];
+				foreach ($params as &$p) {
+									$p = $p[0];
+				}
 				$output = call_user_func(array($this->dwoo->getPluginProxy(), 'getCode'), $func, $params);
 			} elseif ($pluginType & Dwoo_Core::SMARTY_MODIFIER) {
 				$params = $this->mapParams($params, null, $state);
@@ -2812,8 +2909,9 @@ 
 
 				$params = $this->mapParams($params, $callback, $state);
 
-				foreach ($params as &$p)
-					$p = $p[0];
+				foreach ($params as &$p) {
+									$p = $p[0];
+				}
 
 				if ($pluginType & Dwoo_Core::FUNC_PLUGIN) {
 					if ($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) {
@@ -2904,8 +3002,9 @@ 
 		foreach ($params as $k=>$p) {
 			if (is_array($p)) {
 				$out2 = 'array(';
-				foreach ($p as $k2=>$v)
-					$out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
+				foreach ($p as $k2=>$v) {
+									$out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
+				}
 				$p = rtrim($out2, ', ').')';
 			}
 			if ($recursiveCall) {

lib/Dwoo/Core.php

Doc Comments +4 added lines, -4 removed lines

@@ -303,14 +303,14 @@ 
     /**
      * returns the given template rendered using the provided data and optional compiler
      *
-     * @param mixed $tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
+     * @param mixed $_tpl template, can either be a Dwoo_ITemplate object (i.e. Dwoo_Template_File), a valid path to a template, or
      *                   a template as a string it is recommended to provide a Dwoo_ITemplate as it will probably make things faster,
      *                   especially if you render a template multiple times
      * @param mixed $data the data to use, can either be a Dwoo_IDataProvider object (i.e. Dwoo_Data) or an associative array. if you're
      *                    rendering the template from cache, it can be left null
-     * @param Dwoo_ICompiler $compiler the compiler that must be used to compile the template, if left empty a default
+     * @param Dwoo_ICompiler $_compiler the compiler that must be used to compile the template, if left empty a default
      *                                Dwoo_Compiler will be used.
-     * @param bool $output flag that defines whether the function returns the output of the template (false, default) or echoes it directly (true)
+     * @param bool $_output flag that defines whether the function returns the output of the template (false, default) or echoes it directly (true)
      * @return string nothing or the template output if $output is false
      */
     public function get($_tpl, $data = array(), $_compiler = null, $_output = false)
@@ -1462,7 +1462,7 @@ 
      *
      * @param mixed $value the value to assign
      * @param string $scope the variable string, using dwoo variable syntax (i.e. "var.subvar[subsubvar]->property")
-     * @return bool true if assigned correctly or false if a problem occured while parsing the var string
+     * @return null|false true if assigned correctly or false if a problem occured while parsing the var string
      */
     public function assignInScope($value, $scope)
     {

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

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

Braces +6 added lines, -4 removed lines

@@ -45,8 +45,9 @@ 
 		if ($name === null) {
 			$this->data = array();
 		} elseif (is_array($name)) {
-			foreach ($name as $index)
-				unset($this->data[$index]);
+			foreach ($name as $index) {
+							unset($this->data[$index]);
+			}
 		} else {
 			unset($this->data[$name]);
 		}
@@ -90,8 +91,9 @@ 
 	{
 		if (is_array($name)) {
 			reset($name);
-			while (list($k,$v) = each($name))
-				$this->data[$k] = $v;
+			while (list($k,$v) = each($name)) {
+							$this->data[$k] = $v;
+			}
 		} else {
 			$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';

lib/Dwoo/Processor.php

Doc Comments -1 removed lines

@@ -27,7 +27,6 @@
 	 * constructor, if you override it, call parent::__construct($dwoo); or assign
 	 * the dwoo instance yourself if you need it
 	 *
-	 * @param Dwoo_Core $dwoo the dwoo instance that runs this plugin
 	 */
 	public function __construct(Dwoo_Compiler $compiler)
 	{