dwoo-project / dwoo

lib/plugins/builtin/functions/strip_tags.php

Spacing +2 added lines, -2 removed lines

@@ -17,9 +17,9 @@
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_strip_tags_compile(Dwoo_Compiler $compiler, $value, $addspace=true)
+function Dwoo_Plugin_strip_tags_compile(Dwoo_Compiler $compiler, $value, $addspace = true)
 {
-	if ($addspace==='true') {
+	if ($addspace === 'true') {
 		return "preg_replace('#<[^>]*>#', ' ', $value)";
 	} else {
 		return "strip_tags($value)";

lib/plugins/builtin/functions/mailto.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
  * @date       2009-07-18
  * @package    Dwoo
  */
-function Dwoo_Plugin_mailto(Dwoo_Core $dwoo, $address, $text=null, $subject=null, $encode=null, $cc=null, $bcc=null, $newsgroups=null, $followupto=null, $extra=null)
+function Dwoo_Plugin_mailto(Dwoo_Core $dwoo, $address, $text = null, $subject = null, $encode = null, $cc = null, $bcc = null, $newsgroups = null, $followupto = null, $extra = null)
 {
 	if (empty($address)) {
 		return '';
@@ -55,7 +55,7 @@ 
 	$address = rtrim($address, '?&');
 
 	// output
-	switch($encode)
+	switch ($encode)
 	{
 
 	case 'none':
@@ -68,7 +68,7 @@ 
 		$len = strlen($str);
 
 		$out = '';
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$out .= '%'.bin2hex($str[$i]);
 		}
 		return '<script type="text/javascript">eval(unescape(\''.$out.'\'));</script>';
@@ -82,10 +82,10 @@ 
 		$len = strlen($str);
 
 		$out = '<script type="text/javascript">'."\n<!--\ndocument.write(String.fromCharCode(";
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$out .= ord($str[$i]).',';
 		}
-		return rtrim($out, ',') . "));\n-->\n</script>\n";
+		return rtrim($out, ',')."));\n-->\n</script>\n";
 
 		break;
 
@@ -96,7 +96,7 @@ 
 
 		$out = '<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;';
 		$len = strlen($address);
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			if (preg_match('#\w#', $address[$i])) {
 				$out .= '%'.bin2hex($address[$i]);
 			} else {
@@ -105,7 +105,7 @@ 
 		}
 		$out .= '" '.$extra.'>';
 		$len = strlen($text);
-		for ($i=0; $i<$len; $i++) {
+		for ($i = 0; $i < $len; $i++) {
 			$out .= '&#x'.bin2hex($text[$i]);
 		}
 		return $out.'</a>';

lib/plugins/builtin/functions/indent.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @date       2008-10-23
  * @package    Dwoo
  */
-function Dwoo_Plugin_indent_compile(Dwoo_Compiler $compiler, $value, $by=4, $char=' ')
+function Dwoo_Plugin_indent_compile(Dwoo_Compiler $compiler, $value, $by = 4, $char = ' ')
 {
 	return "preg_replace('#^#m', '".str_repeat(substr($char, 1, -1), trim($by, '"\''))."', $value)";
 }

lib/Dwoo/Compiler.php

Doc Comments +3 added lines, -3 removed lines

@@ -272,7 +272,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()
 	{
@@ -360,7 +360,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)
@@ -1230,7 +1230,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)
 	{

Spacing +181 added lines, -181 removed lines

@@ -395,7 +395,7 @@ 
 		} elseif (($index = array_search('Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback), $this->processors['pre'], true)) !== false) {
 			unset($this->processors['pre'][$index]);
 		} else {
-			$class = 'Dwoo_Processor_' . str_replace('Dwoo_Processor_', '', $callback);
+			$class = 'Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback);
 			foreach ($this->processors['pre'] as $index=>$proc) {
 				if (is_array($proc) && ($proc[0] instanceof $class) || (isset($proc['class']) && $proc['class'] == $class)) {
 					unset($this->processors['pre'][$index]);
@@ -443,8 +443,8 @@ 
 			unset($this->processors['post'][$index]);
 		} elseif (($index = array_search('Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback), $this->processors['post'], true)) !== false) {
 			unset($this->processors['post'][$index]);
-		} else	{
-			$class = 'Dwoo_Processor_' . str_replace('Dwoo_Processor_', '', $callback);
+		} else {
+			$class = 'Dwoo_Processor_'.str_replace('Dwoo_Processor_', '', $callback);
 			foreach ($this->processors['post'] as $index=>$proc) {
 				if (is_array($proc) && ($proc[0] instanceof $class) || (isset($proc['class']) && $proc['class'] == $class)) {
 					unset($this->processors['post'][$index]);
@@ -651,7 +651,7 @@ 
 	public function setTemplateSource($newSource, $fromPointer = false)
 	{
 		if ($fromPointer === true) {
-			$this->templateSource = substr($this->templateSource, 0, $this->pointer) . $newSource;
+			$this->templateSource = substr($this->templateSource, 0, $this->pointer).$newSource;
 		} else {
 			$this->templateSource = $newSource;
 		}
@@ -699,16 +699,16 @@ 
 		$ptr = 0;
 		$this->dwoo = $dwoo;
 		$this->template = $template;
-		$this->templateSource =& $tpl;
-		$this->pointer =& $ptr;
+		$this->templateSource = & $tpl;
+		$this->pointer = & $ptr;
 
 		while (true) {
 			// if pointer is at the beginning, reset everything, that allows a plugin to externally reset the compiler if everything must be reparsed
-			if ($ptr===0) {
+			if ($ptr === 0) {
 				// resets variables
 				$this->usedPlugins = array();
 				$this->data = array();
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$this->scopeTree = array();
 				$this->stack = array();
 				$this->line = 1;
@@ -719,10 +719,10 @@ 
 
 				if ($this->debug) {
 					echo "\n";
-					echo 'COMPILER INIT' . "\n";
+					echo 'COMPILER INIT'."\n";
 				}
 
-				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')' . "\n";
+				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')'."\n";
 
 				// runs preprocessors
 				foreach ($this->processors['pre'] as $preProc) {
@@ -738,7 +738,7 @@ 
 				unset($preProc);
 
 				// show template source if debug
-				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>' . "\n";
+				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>'."\n";
 
 				// strips php tags if required by the security policy
 				if ($this->securityPolicy !== null) {
@@ -746,7 +746,7 @@ 
 					if (ini_get('short_open_tags')) {
 						$search = array('{<\?.*?\?>}', '{<%.*?%>}');
 					}
-					switch($this->securityPolicy->getPhpHandling()) {
+					switch ($this->securityPolicy->getPhpHandling()) {
 
 					case Dwoo_Security_Policy::PHP_ALLOW:
 						break;
@@ -766,14 +766,14 @@ 
 				$this->push(substr($tpl, $ptr), 0);
 				break;
 			} elseif (substr($tpl, $pos-1, 1) === '\\' && substr($tpl, $pos-2, 1) !== '\\') {
-				$this->push(substr($tpl, $ptr, $pos-$ptr-1) . $this->ld);
+				$this->push(substr($tpl, $ptr, $pos-$ptr-1).$this->ld);
 				$ptr = $pos+strlen($this->ld);
-			} elseif (preg_match('/^'.$this->ldr . ($this->allowLooseOpenings ? '\s*' : '') . 'literal' . ($this->allowLooseOpenings ? '\s*' : '') . $this->rdr.'/s', substr($tpl, $pos), $litOpen)) {
-				if (!preg_match('/'.$this->ldr . ($this->allowLooseOpenings ? '\s*' : '') . '\/literal' . ($this->allowLooseOpenings ? '\s*' : '') . $this->rdr.'/s', $tpl, $litClose, PREG_OFFSET_CAPTURE, $pos)) {
+			} elseif (preg_match('/^'.$this->ldr.($this->allowLooseOpenings ? '\s*' : '').'literal'.($this->allowLooseOpenings ? '\s*' : '').$this->rdr.'/s', substr($tpl, $pos), $litOpen)) {
+				if (!preg_match('/'.$this->ldr.($this->allowLooseOpenings ? '\s*' : '').'\/literal'.($this->allowLooseOpenings ? '\s*' : '').$this->rdr.'/s', $tpl, $litClose, PREG_OFFSET_CAPTURE, $pos)) {
 					throw new Dwoo_Compilation_Exception($this, 'The {literal} blocks must be closed explicitly with {/literal}');
 				}
 				$endpos = $litClose[0][1];
-				$this->push(substr($tpl, $ptr, $pos-$ptr) . substr($tpl, $pos + strlen($litOpen[0]), $endpos-$pos-strlen($litOpen[0])));
+				$this->push(substr($tpl, $ptr, $pos-$ptr).substr($tpl, $pos+strlen($litOpen[0]), $endpos-$pos-strlen($litOpen[0])));
 				$ptr = $endpos+strlen($litClose[0][0]);
 			} else {
 				if (substr($tpl, $pos-2, 1) === '\\' && substr($tpl, $pos-1, 1) === '\\') {
@@ -787,7 +787,7 @@ 
 				$pos += strlen($this->ld);
 				if ($this->allowLooseOpenings) {
 					while (substr($tpl, $pos, 1) === ' ') {
-						$pos+=1;
+						$pos += 1;
 					}
 				} else {
 					if (substr($tpl, $pos, 1) === ' ' || substr($tpl, $pos, 1) === "\r" || substr($tpl, $pos, 1) === "\n" || substr($tpl, $pos, 1) === "\t") {
@@ -814,7 +814,7 @@ 
 						continue 2;
 					}
 
-					$len = $subptr - $ptr;
+					$len = $subptr-$ptr;
 					$this->push($parsed, substr_count(substr($tpl, $ptr, $len), "\n"));
 					$ptr += $len;
 
@@ -827,7 +827,7 @@ 
 
 		$compiled .= $this->removeBlock('topLevelBlock');
 
-		if ($this->debug) echo 'PROCESSING POSTPROCESSORS' . "\n";
+		if ($this->debug) echo 'PROCESSING POSTPROCESSORS'."\n";
 
 		foreach ($this->processors['post'] as $postProc) {
 			if (is_array($postProc) && isset($postProc['autoload'])) {
@@ -841,7 +841,7 @@ 
 		}
 		unset($postProc);
 
-		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage() . "\n";
+		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage()."\n";
 
 		$output = "<?php\n/* template head */\n";
 
@@ -851,7 +851,7 @@ 
 				continue;
 			}
 
-			switch($type) {
+			switch ($type) {
 
 			case Dwoo_Core::BLOCK_PLUGIN:
 			case Dwoo_Core::CLASS_PLUGIN:
@@ -891,24 +891,24 @@ 
 
 		$output .= $compiled."\n?>";
 
-		$output = preg_replace('/(?<!;|\}|\*\/|\n|\{)(\s*'.preg_quote(self::PHP_CLOSE, '/') . preg_quote(self::PHP_OPEN, '/').')/', ";\n", $output);
-		$output = str_replace(self::PHP_CLOSE . self::PHP_OPEN, "\n", $output);
+		$output = preg_replace('/(?<!;|\}|\*\/|\n|\{)(\s*'.preg_quote(self::PHP_CLOSE, '/').preg_quote(self::PHP_OPEN, '/').')/', ";\n", $output);
+		$output = str_replace(self::PHP_CLOSE.self::PHP_OPEN, "\n", $output);
 
 		// handle <?xml tag at the beginning
 		$output = preg_replace('#(/\* template body \*/ \?>\s*)<\?xml#is', '$1<?php echo \'<?xml\'; ?>', $output);
 
 		// add another line break after PHP closing tags that have a line break following,
 		// as we do not know whether it's intended, and PHP will strip it otherwise
-		$output = preg_replace('/(?<!"|<\?xml)\s*\?>\n/', '$0' . "\n", $output);
+		$output = preg_replace('/(?<!"|<\?xml)\s*\?>\n/', '$0'."\n", $output);
 
 		if ($this->debug) {
-			echo '=============================================================================================' . "\n";
+			echo '============================================================================================='."\n";
 			$lines = preg_split('{\r\n|\n|<br />}', $output);
 			array_shift($lines);
 			foreach ($lines as $i=>$line) {
 				echo ($i+1).'. '.$line."\r\n";
 			}
-			echo '=============================================================================================' . "\n";
+			echo '============================================================================================='."\n";
 		}
 
 		$this->template = $this->dwoo = null;
@@ -976,17 +976,17 @@ 
 	{
 		$old = $this->scopeTree;
 
-		if ($scope===null) {
+		if ($scope === null) {
 			unset($this->scope);
 			$this->scope = null;
 		}
 
-		if (is_array($scope)===false) {
+		if (is_array($scope) === false) {
 			$scope = explode('.', $scope);
 		}
 
-		if ($absolute===true) {
-			$this->scope =& $this->data;
+		if ($absolute === true) {
+			$this->scope = & $this->data;
 			$this->scopeTree = array();
 		}
 
@@ -994,19 +994,19 @@ 
 			if ($bit === '_parent' || $bit === '_') {
 				array_pop($this->scopeTree);
 				reset($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 === '_root' || $bit === '__') {
-				$this->scope =& $this->data;
+				$this->scope = & $this->data;
 				$this->scopeTree = array();
 			} elseif (isset($this->scope[$bit])) {
-				$this->scope =& $this->scope[$bit];
+				$this->scope = & $this->scope[$bit];
 				$this->scopeTree[] = $bit;
 			} else {
 				$this->scope[$bit] = array();
-				$this->scope =& $this->scope[$bit];
+				$this->scope = & $this->scope[$bit];
 				$this->scopeTree[] = $bit;
 			}
 		}
@@ -1033,8 +1033,8 @@ 
 		$params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => false, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
-		return call_user_func(array($class,'preProcessing'), $this, $params, '', '', $type);
+		$this->curBlock = & $this->stack[count($this->stack)-1];
+		return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
 	}
 
 	/**
@@ -1057,8 +1057,8 @@ 
 		$params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => true, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
-		return call_user_func(array($class,'preProcessing'), $this, $params, '', '', $type);
+		$this->curBlock = & $this->stack[count($this->stack)-1];
+		return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
 	}
 
 	/**
@@ -1078,7 +1078,7 @@ 
 			$this->dwoo->getLoader()->loadPlugin($type);
 		}
 		$this->stack[] = array('type' => $type, 'params' => $params, 'custom' => false, 'class' => $class, 'buffer' => null);
-		$this->curBlock =& $this->stack[count($this->stack)-1];
+		$this->curBlock = & $this->stack[count($this->stack)-1];
 	}
 
 	/**
@@ -1106,11 +1106,11 @@ 
 					$class = 'Dwoo_Plugin_'.$top['type'];
 				}
 				if (count($this->stack)) {
-					$this->curBlock =& $this->stack[count($this->stack)-1];
+					$this->curBlock = & $this->stack[count($this->stack)-1];
 					$this->push(call_user_func(array($class, 'postProcessing'), $this, $top['params'], '', '', $top['buffer']), 0);
 				} else {
 					$null = null;
-					$this->curBlock =& $null;
+					$this->curBlock = & $null;
 					$output = call_user_func(array($class, 'postProcessing'), $this, $top['params'], '', '', $top['buffer']);
 				}
 
@@ -1139,9 +1139,9 @@ 
 	 */
 	public function &findBlock($type, $closeAlong = false)
 	{
-		if ($closeAlong===true) {
+		if ($closeAlong === true) {
 			while ($b = end($this->stack)) {
-				if ($b['type']===$type) {
+				if ($b['type'] === $type) {
 					return $this->stack[key($this->stack)];
 				}
 				$this->push($this->removeTopBlock(), 0);
@@ -1149,7 +1149,7 @@ 
 		} else {
 			end($this->stack);
 			while ($b = current($this->stack)) {
-				if ($b['type']===$type) {
+				if ($b['type'] === $type) {
 					return $this->stack[key($this->stack)];
 				}
 				prev($this->stack);
@@ -1189,7 +1189,7 @@ 
 			$class = 'Dwoo_Plugin_'.$o['type'];
 		}
 
-		$this->curBlock =& $this->stack[count($this->stack)-1];
+		$this->curBlock = & $this->stack[count($this->stack)-1];
 
 		return call_user_func(array($class, 'postProcessing'), $this, $o['params'], '', '', $o['buffer']);
 	}
@@ -1253,7 +1253,7 @@ 
 	 * @return string parsed values
 	 * @throws Dwoo_Compilation_Exception
 	 */
-	protected function parse($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parse($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
 
@@ -1266,11 +1266,11 @@ 
 			throw new Dwoo_Compilation_Exception($this, 'Unexpected EOF, a template tag was not closed');
 		}
 
-		while ($first===" " || $first==="\n" || $first==="\t" || $first==="\r") {
+		while ($first === " " || $first === "\n" || $first === "\t" || $first === "\r") {
 			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' . "\n";
+				if ($this->debug) echo 'TEMPLATE PARSING ENDED'."\n";
 				return false;
 			}
 			$from++;
@@ -1289,12 +1289,12 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer. "\n";
+		if ($this->debug) echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer."\n";
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
 			$src = $this->getTemplateSource();
-			$startpos = $this->getPointer() - strlen($this->ld);
+			$startpos = $this->getPointer()-strlen($this->ld);
 			if (substr($src, $startpos, strlen($this->ld)) === $this->ld) {
 				if ($startpos > 0) {
 					do {
@@ -1310,7 +1310,7 @@ 
 				if (!isset($whitespaceStart)) {
 					$startpos = $this->getPointer();
 				} else {
-					$pointer -= $this->getPointer() - $startpos;
+					$pointer -= $this->getPointer()-$startpos;
 				}
 
 				if ($this->allowNestedComments && strpos($src, $this->ld.'*', $this->getPointer()) !== false) {
@@ -1325,55 +1325,55 @@ 
 
 						if ($open !== false && $close !== false) {
 							if ($open < $close) {
-								$ptr = $open + strlen($comOpen);
+								$ptr = $open+strlen($comOpen);
 								$level++;
 							} else {
-								$ptr = $close + strlen($comClose);
+								$ptr = $close+strlen($comClose);
 								$level--;
 							}
 						} elseif ($open !== false) {
-							$ptr = $open + strlen($comOpen);
+							$ptr = $open+strlen($comOpen);
 							$level++;
 						} elseif ($close !== false) {
-							$ptr = $close + strlen($comClose);
+							$ptr = $close+strlen($comClose);
 							$level--;
 						} else {
 							$ptr = strlen($src);
 						}
 					}
-					$endpos = $ptr - strlen('*'.$this->rd);
+					$endpos = $ptr-strlen('*'.$this->rd);
 				} else {
 					$endpos = strpos($src, '*'.$this->rd, $startpos);
 					if ($endpos == false) {
 						throw new Dwoo_Compilation_Exception($this, 'Un-ended comment');
 					}
 				}
-				$pointer += $endpos - $startpos + strlen('*'.$this->rd);
+				$pointer += $endpos-$startpos+strlen('*'.$this->rd);
 				if (isset($whitespaceStart) && preg_match('#^[\t ]*\r?\n#', substr($src, $endpos+strlen('*'.$this->rd)), $m)) {
 					$pointer += strlen($m[0]);
-					$this->curBlock['buffer'] = substr($this->curBlock['buffer'], 0, strlen($this->curBlock['buffer']) - ($this->getPointer() - $startpos - strlen($this->ld)));
+					$this->curBlock['buffer'] = substr($this->curBlock['buffer'], 0, strlen($this->curBlock['buffer'])-($this->getPointer()-$startpos-strlen($this->ld)));
 				}
 				return false;
 			}
 		}
 
-		if ($first==='$') {
+		if ($first === '$') {
 			// var
 			$out = $this->parseVar($in, $from, $to, $parsingParams, $curBlock, $pointer);
 			$parsed = 'var';
-		} elseif ($first==='%' && preg_match('#^%[a-z_]#i', $substr)) {
+		} elseif ($first === '%' && preg_match('#^%[a-z_]#i', $substr)) {
 			// const
 			$out = $this->parseConst($in, $from, $to, $parsingParams, $curBlock, $pointer);
-		} elseif (($first==='"' || $first==="'") && !(is_array($parsingParams) && preg_match('#^([\'"])[a-z0-9_]+\1\s*=>?(?:\s+|[^=])#i', $substr))) {
+		} elseif (($first === '"' || $first === "'") && !(is_array($parsingParams) && preg_match('#^([\'"])[a-z0-9_]+\1\s*=>?(?:\s+|[^=])#i', $substr))) {
 			// string
 			$out = $this->parseString($in, $from, $to, $parsingParams, $curBlock, $pointer);
-		} elseif (preg_match('/^\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?('.(is_array($parsingParams)||$curBlock!='root'?'':'\s+[^(]|').'\s*\(|\s*'.$this->rdr.'|\s*;)/i', $substr)) {
+		} elseif (preg_match('/^\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?('.(is_array($parsingParams) || $curBlock != 'root' ? '' : '\s+[^(]|').'\s*\(|\s*'.$this->rdr.'|\s*;)/i', $substr)) {
 			// func
 			$out = $this->parseFunction($in, $from, $to, $parsingParams, $curBlock, $pointer);
 			$parsed = 'func';
 		} elseif ($first === ';') {
 			// instruction end
-			if ($this->debug) echo 'END OF INSTRUCTION' . "\n";
+			if ($this->debug) echo 'END OF INSTRUCTION'."\n";
 			if ($pointer !== null) {
 				$pointer++;
 			}
@@ -1393,22 +1393,22 @@ 
 				if ($this->curBlock['type'] == 'else' || $this->curBlock['type'] == 'elseif') {
 					$pointer -= strlen($match[0]);
 				}
-				if ($this->debug) echo 'TOP BLOCK CLOSED' . "\n";
+				if ($this->debug) echo 'TOP BLOCK CLOSED'."\n";
 				return $this->removeTopBlock();
 			} else {
-				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED' . "\n";
+				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED'."\n";
 				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' . "\n";
+			if ($this->debug) echo 'TAG PARSING ENDED'."\n";
 			$pointer += strlen($this->rd);
 			return false;
-		} elseif (is_array($parsingParams) && preg_match('#^(([\'"]?)[a-z0-9_]+\2\s*='.($curBlock === 'array' ? '>?':'').')(?:\s+|[^=]).*#i', $substr, $match)) {
+		} 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' . "\n";
+			if ($this->debug) echo 'NAMED PARAM FOUND'."\n";
 			$len = strlen($match[1]);
-			while (substr($in, $from+$len, 1)===' ') {
+			while (substr($in, $from+$len, 1) === ' ') {
 				$len++;
 			}
 			if ($pointer !== null) {
@@ -1429,7 +1429,7 @@ 
 				$out = $match[1];
 			}
 			$pointer += strlen($match[1]);
-		} elseif ($substr!=='' && (is_array($parsingParams) || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'expression')) {
+		} elseif ($substr !== '' && (is_array($parsingParams) || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'expression')) {
 			// unquoted string, bool or number
 			$out = $this->parseOthers($in, $from, $to, $parsingParams, $curBlock, $pointer);
 		} else {
@@ -1444,19 +1444,19 @@ 
 		$substr = substr($in, $pointer, $to-$pointer);
 
 		// var parsed, check if any var-extension applies
-		if ($parsed==='var') {
+		if ($parsed === 'var') {
 			if (preg_match('#^\s*([/%+*-])\s*([a-z0-9]|\$)#i', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr . "\n";
+				if ($this->debug) echo 'PARSING POST-VAR EXPRESSION '.$substr."\n";
 				// parse expressions
-				$pointer += strlen($match[0]) - 1;
+				$pointer += strlen($match[0])-1;
 				if (is_array($parsingParams)) {
 					if ($match[2] == '$') {
 						$expr = $this->parseVar($in, $pointer, $to, array(), $curBlock, $pointer);
 					} else {
 						$expr = $this->parse($in, $pointer, $to, array(), 'expression', $pointer);
 					}
-					$out[count($out)-1][0] .= $match[1] . $expr[0][0];
-					$out[count($out)-1][1] .= $match[1] . $expr[0][1];
+					$out[count($out)-1][0] .= $match[1].$expr[0][0];
+					$out[count($out)-1][1] .= $match[1].$expr[0][1];
 				} else {
 					if ($match[2] == '$') {
 						$expr = $this->parseVar($in, $pointer, $to, false, $curBlock, $pointer);
@@ -1464,19 +1464,19 @@ 
 						$expr = $this->parse($in, $pointer, $to, false, 'expression', $pointer);
 					}
 					if (is_array($out) && is_array($expr)) {
-						$out[0] .= $match[1] . $expr[0];
-						$out[1] .= $match[1] . $expr[1];
+						$out[0] .= $match[1].$expr[0];
+						$out[1] .= $match[1].$expr[1];
 					} elseif (is_array($out)) {
-						$out[0] .= $match[1] . $expr;
-						$out[1] .= $match[1] . $expr;
+						$out[0] .= $match[1].$expr;
+						$out[1] .= $match[1].$expr;
 					} elseif (is_array($expr)) {
-						$out .= $match[1] . $expr[0];
+						$out .= $match[1].$expr[0];
 					} else {
-						$out .= $match[1] . $expr;
+						$out .= $match[1].$expr;
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr . "\n";
+				if ($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr."\n";
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1515,10 +1515,10 @@ 
 				if ($this->autoEscape) {
 					$out = preg_replace('#\(is_string\(\$tmp=(.+?)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', '$1', $out);
 				}
-				$out = Dwoo_Compiler::PHP_OPEN. $echo . $out . $operator . implode(' ', $value) . Dwoo_Compiler::PHP_CLOSE;
+				$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' . "\n";
+				if ($this->debug) echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND'."\n";
 				$len = strlen($match[1]);
 				$var = $out[count($out)-1];
 				$pointer += $len;
@@ -1536,14 +1536,14 @@ 
 			if (is_array($parsingParams)) {
 				$tmp = $this->replaceModifiers(array(null, null, $out[count($out)-1][0], $match[0]), $curBlock, $pointer);
 				$out[count($out)-1][0] = $tmp;
-				$out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer - $pointer);
+				$out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer-$pointer);
 			} else {
 				$out = $this->replaceModifiers(array(null, null, $out, $match[0]), $curBlock, $pointer);
 			}
 		}
 
 		// func parsed, check if any func-extension applies
-		if ($parsed==='func' && preg_match('#^->[a-z0-9_]+(\s*\(.+|->[a-z_].*)?#is', $substr, $match)) {
+		if ($parsed === 'func' && preg_match('#^->[a-z0-9_]+(\s*\(.+|->[a-z_].*)?#is', $substr, $match)) {
 			// parse method call or property read
 			$ptr = 0;
 
@@ -1560,7 +1560,7 @@ 
 		}
 
 		if ($curBlock === 'root' && substr($out, 0, strlen(self::PHP_OPEN)) !== self::PHP_OPEN) {
-			return self::PHP_OPEN .'echo '.$out.';'. self::PHP_CLOSE;
+			return self::PHP_OPEN.'echo '.$out.';'.self::PHP_CLOSE;
 		} else {
 			return $out;
 		}
@@ -1579,7 +1579,7 @@ 
 	 * @throws Dwoo_Exception
 	 * @throws Dwoo_Security_Exception
 	 */
-	protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$cmdstr = substr($in, $from, $to-$from);
 		preg_match('/^(\\\\?[a-z_](?:\\\\?[a-z0-9_]+)*(?:::[a-z_][a-z0-9_]*)?)(\s*'.$this->rdr.'|\s*;)?/i', $cmdstr, $match);
@@ -1594,21 +1594,21 @@ 
 			$cmdstr = $match[1];
 		}
 
-		if ($this->debug) echo 'FUNC FOUND ('.$func.')' . "\n";
+		if ($this->debug) echo 'FUNC FOUND ('.$func.')'."\n";
 
 		$paramsep = '';
 
 		if (is_array($parsingParams) || $curBlock != 'root') {
 			$paramspos = strpos($cmdstr, '(');
 			$paramsep = ')';
-		} elseif(preg_match_all('#^\s*[\\\\:a-z0-9_]+(\s*\(|\s+[^(])#i', $cmdstr, $match, PREG_OFFSET_CAPTURE)) {
+		} elseif (preg_match_all('#^\s*[\\\\:a-z0-9_]+(\s*\(|\s+[^(])#i', $cmdstr, $match, PREG_OFFSET_CAPTURE)) {
 			$paramspos = $match[1][0][1];
-			$paramsep = substr($match[1][0][0], -1) === '(' ? ')':'';
-			if($paramsep === ')') {
-				$paramspos += strlen($match[1][0][0]) - 1;
-				if(substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
+			$paramsep = substr($match[1][0][0], -1) === '(' ? ')' : '';
+			if ($paramsep === ')') {
+				$paramspos += strlen($match[1][0][0])-1;
+				if (substr($cmdstr, 0, 2) === 'if' || substr($cmdstr, 0, 6) === 'elseif') {
 					$paramsep = '';
-					if(strlen($match[1][0][0]) > 1) {
+					if (strlen($match[1][0][0]) > 1) {
 						$paramspos--;
 					}
 				}
@@ -1640,7 +1640,7 @@ 
 				$paramstr = substr($paramstr, 0, -1);
 			}
 
-			if (strlen($paramstr)===0) {
+			if (strlen($paramstr) === 0) {
 				$params = array();
 				$paramstr = '';
 			} else {
@@ -1656,17 +1656,17 @@ 
 							}
 
 							if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr."\n";
 								break 2;
 							} elseif ($paramstr[$ptr] === ';') {
 								$ptr++;
-								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr."\n";
 								break 2;
 							} elseif ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === '/') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr."\n";
 								break 2;
 							} elseif (substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr."\n";
 								break 2;
 							}
 
@@ -1677,7 +1677,7 @@ 
 							}
 						}
 
-						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr."\n";
 
 						if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'condition', $ptr);
@@ -1687,7 +1687,7 @@ 
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'function', $ptr);
 						}
 
-						if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')' . "\n";
+						if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')'."\n";
 					}
 				}
 				$paramstr = substr($paramstr, 0, $ptr);
@@ -1710,8 +1710,8 @@ 
 		}
 
 		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' . "\n";
+			$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'."\n";
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1840,7 +1840,7 @@ 
 					else {
 						array_unshift($params, '$this');
 						$params = self::implode_r($params);
-						$output = 'call_user_func(\'' . $callback . '\', ' . $params . ')';
+						$output = 'call_user_func(\''.$callback.'\', '.$params.')';
 					}
 				} else {
 					array_unshift($params, '$this');
@@ -1947,12 +1947,12 @@ 
 	 * @return string parsed values
 	 * @throws Dwoo_Compilation_Exception
 	 */
-	protected function parseString($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseString($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$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 ? '...':'').')' . "\n";
+		if ($this->debug) echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').')'."\n";
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1965,7 +1965,7 @@ 
 				$strend = false;
 			}
 		}
-		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from) . "\n";
+		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from)."\n";
 
 		$srcOutput = substr($in, $from, $strend+1-$from);
 
@@ -2014,12 +2014,12 @@ 
 	 * @return string parsed values
 	 * @throws Dwoo_Compilation_Exception
 	 */
-	protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 
 		if ($this->debug) {
-			echo 'CONST FOUND : '.$substr . "\n";
+			echo 'CONST FOUND : '.$substr."\n";
 		}
 
 		if (!preg_match('#^%([\\\\a-z0-9_:]+)#i', $substr, $m)) {
@@ -2075,14 +2075,14 @@ 
 	 * @return string parsed values
 	 * @throws Dwoo_Compilation_Exception
 	 */
-	protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$substr = substr($in, $from, $to-$from);
 
-		if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)' . // var key
-			($curBlock==='root' || $curBlock==='function' || $curBlock==='namedparam' || $curBlock==='condition' || $curBlock==='variable' || $curBlock==='expression' || $curBlock==='delimited_string' ? '(\(.*)?' : '()') . // method call
-			($curBlock==='root' || $curBlock==='function' || $curBlock==='namedparam' || $curBlock==='condition' || $curBlock==='variable' || $curBlock==='delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)':'()') . // simple math expressions
-			($curBlock!=='modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?':'(())') . // modifiers
+		if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)'.// var key
+			($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'expression' || $curBlock === 'delimited_string' ? '(\(.*)?' : '()').// method call
+			($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)' : '()').// simple math expressions
+			($curBlock !== 'modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?' : '(())').// modifiers
 			'#i', $substr, $match)) {
 			$key = substr($match[1], 1);
 
@@ -2097,9 +2097,9 @@ 
 			}
 
 			if ($hasMethodCall) {
-				$matchedLength -= strlen($match[3]) + strlen(substr($match[1], strrpos($match[1], '->')));
+				$matchedLength -= strlen($match[3])+strlen(substr($match[1], strrpos($match[1], '->')));
 				$key = substr($match[1], 1, strrpos($match[1], '->')-1);
-				$methodCall = substr($match[1], strrpos($match[1], '->')) . $match[3];
+				$methodCall = substr($match[1], strrpos($match[1], '->')).$match[3];
 			}
 
 			if ($hasModifiers) {
@@ -2115,20 +2115,20 @@ 
 
 			if ($this->debug) {
 				if ($hasMethodCall) {
-					echo 'METHOD CALL FOUND : $'.$key.substr($methodCall, 0, 30) . "\n";
+					echo 'METHOD CALL FOUND : $'.$key.substr($methodCall, 0, 30)."\n";
 				} else {
-					echo 'VAR FOUND : $'.$key . "\n";
+					echo 'VAR FOUND : $'.$key."\n";
 				}
 			}
 
 			$key = str_replace('"', '\\"', $key);
 
-			$cnt=substr_count($key, '$');
+			$cnt = substr_count($key, '$');
 			if ($cnt > 0) {
 				$uid = 0;
 				$parsed = array($uid => '');
-				$current =& $parsed;
-				$curTxt =& $parsed[$uid++];
+				$current = & $parsed;
+				$curTxt = & $parsed[$uid++];
 				$tree = array();
 				$chars = str_split($key, 1);
 				$inSplittedVar = false;
@@ -2139,31 +2139,31 @@ 
 						if (count($tree) > 0) {
 							$bracketCount++;
 						} else {
-							$tree[] =& $current;
+							$tree[] = & $current;
 							$current[$uid] = array($uid+1 => '');
-							$current =& $current[$uid++];
-							$curTxt =& $current[$uid++];
+							$current = & $current[$uid++];
+							$curTxt = & $current[$uid++];
 							continue;
 						}
 					} elseif ($char === ']') {
 						if ($bracketCount > 0) {
 							$bracketCount--;
 						} else {
-							$current =& $tree[count($tree)-1];
+							$current = & $tree[count($tree)-1];
 							array_pop($tree);
 							if (current($chars) !== '[' && current($chars) !== false && current($chars) !== ']') {
 								$current[$uid] = '';
-								$curTxt =& $current[$uid++];
+								$curTxt = & $current[$uid++];
 							}
 							continue;
 						}
 					} elseif ($char === '$') {
 						if (count($tree) == 0) {
-							$curTxt =& $current[$uid++];
+							$curTxt = & $current[$uid++];
 							$inSplittedVar = true;
 						}
 					} elseif (($char === '.' || $char === '-') && count($tree) == 0 && $inSplittedVar) {
-						$curTxt =& $current[$uid++];
+						$curTxt = & $current[$uid++];
 						$inSplittedVar = false;
 					}
 
@@ -2171,11 +2171,11 @@ 
 				}
 				unset($uid, $current, $curTxt, $tree, $chars);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key . "\n";
+				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key."\n";
 
 				$key = $this->flattenVarTree($parsed);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key."\n";
 
 				$output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
 			} else {
@@ -2199,7 +2199,7 @@ 
 				preg_match_all('#(?:([+/*%=-])(=?-?[%$][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|=?-?[0-9.,]+|\1))#i', $match[4], $expMatch);
 
 				foreach ($expMatch[1] as $k=>$operator) {
-					if (substr($expMatch[2][$k], 0, 1)==='=') {
+					if (substr($expMatch[2][$k], 0, 1) === '=') {
 						$assign = true;
 						if ($operator === '=') {
 							throw new Dwoo_Compilation_Exception($this, 'Invalid expression <em>'.$substr.'</em>, can not use "==" in expressions');
@@ -2211,11 +2211,11 @@ 
 						$expMatch[2][$k] = substr($expMatch[2][$k], 1);
 					}
 
-					if (substr($expMatch[2][$k], 0, 1)==='-' && strlen($expMatch[2][$k]) > 1) {
+					if (substr($expMatch[2][$k], 0, 1) === '-' && strlen($expMatch[2][$k]) > 1) {
 						$operator .= '-';
 						$expMatch[2][$k] = substr($expMatch[2][$k], 1);
 					}
-					if (($operator==='+'||$operator==='-') && $expMatch[2][$k]===$operator) {
+					if (($operator === '+' || $operator === '-') && $expMatch[2][$k] === $operator) {
 						$output = '('.$output.$operator.$operator.')';
 						break;
 					} elseif (substr($expMatch[2][$k], 0, 1) === '$') {
@@ -2291,7 +2291,7 @@ 
 				break;
 			}
 
-			if(!preg_match('/^([a-z0-9_]+)(\(.*?\))?/i', substr($methodCall, $ptr), $methMatch)) {
+			if (!preg_match('/^([a-z0-9_]+)(\(.*?\))?/i', substr($methodCall, $ptr), $methMatch)) {
 				break;
 			}
 
@@ -2307,7 +2307,7 @@ 
 				// method
 				if (substr($methMatch[2], 0, 2) === '()') {
 					$parsedCall = $methMatch[1].'()';
-					$ptr += strlen($methMatch[1]) + 2;
+					$ptr += strlen($methMatch[1])+2;
 				} else {
 					$parsedCall = $this->parseFunction($methodCall, $ptr, strlen($methodCall), false, 'method', $ptr);
 				}
@@ -2416,7 +2416,7 @@ 
 
 					while (count($m[1]) && $m[1][0] !== '->') {
 						$m[2][0] = preg_replace('/(^\\\([\'"])|\\\([\'"])$)/x', '$2$3', $m[2][0]);
-						if(substr($m[2][0], 0, 1) == '"' || substr($m[2][0], 0, 1) == "'") {
+						if (substr($m[2][0], 0, 1) == '"' || substr($m[2][0], 0, 1) == "'") {
 							$output .= '['.$m[2][0].']';
 						} else {
 							$output .= '["'.$m[2][0].'"]';
@@ -2432,7 +2432,7 @@ 
 
 				if (count($m[2])) {
 					unset($m[0]);
-					$output = '$this->readVarInto('.str_replace("\n", '', var_export($m, true)).', '.$output.', '.($curBlock == 'root' ? 'false': 'true').')';
+					$output = '$this->readVarInto('.str_replace("\n", '', var_export($m, true)).', '.$output.', '.($curBlock == 'root' ? 'false' : 'true').')';
 				}
 			}
 		} else {
@@ -2452,25 +2452,25 @@ 
 	 * @param bool $recursed leave that to false by default, it is only for internal use
 	 * @return string flattened tree
 	 */
-	protected function flattenVarTree(array $tree, $recursed=false)
+	protected function flattenVarTree(array $tree, $recursed = false)
 	{
-		$out = $recursed ?  '".$this->readVarInto(' : '';
+		$out = $recursed ? '".$this->readVarInto(' : '';
 		foreach ($tree as $bit) {
 			if (is_array($bit)) {
-				$out.='.'.$this->flattenVarTree($bit, false);
+				$out .= '.'.$this->flattenVarTree($bit, false);
 			} else {
 				$key = str_replace('"', '\\"', $bit);
 
-				if (substr($key, 0, 1)==='$') {
+				if (substr($key, 0, 1) === '$') {
 					$out .= '".'.$this->parseVar($key, 0, strlen($key), false, 'variable').'."';
 				} else {
 					$cnt = substr_count($key, '$');
 
-					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key . "\n";
+					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key."\n";
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
-								$last = strrpos($key, '$', - (strlen($key) - $last + 1));
+								$last = strrpos($key, '$', - (strlen($key)-$last+1));
 							} else {
 								$last = strrpos($key, '$');
 							}
@@ -2488,7 +2488,7 @@ 
 								$last,
 								$len
 							);
-							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key."\n";
 						}
 						unset($last);
 
@@ -2525,7 +2525,7 @@ 
 	 * @return string parsed values
 	 * @throws Exception
 	 */
-	protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
+	protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
 	{
 		$first = $in[$from];
 		$substr = substr($in, $from, $to-$from);
@@ -2543,7 +2543,7 @@ 
 		}
 
 		$breaker = false;
-		while (list($k,$char) = each($breakChars)) {
+		while (list($k, $char) = each($breakChars)) {
 			$test = strpos($substr, $char);
 			if ($test !== false && $test < $end) {
 				$end = $test;
@@ -2569,15 +2569,15 @@ 
 		$substr = trim($substr);
 
 		if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
-			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED' . "\n";
+			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED'."\n";
 			$substr = 'false';
 			$type = self::T_BOOL;
 		} elseif (strtolower($substr) === 'true' || strtolower($substr) === 'yes' || strtolower($substr) === 'on') {
-			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED' . "\n";
+			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED'."\n";
 			$substr = 'true';
 			$type = self::T_BOOL;
 		} elseif ($substr === 'null' || $substr === 'NULL') {
-			if ($this->debug) echo 'NULL PARSED' . "\n";
+			if ($this->debug) echo 'NULL PARSED'."\n";
 			$substr = 'null';
 			$type = self::T_NULL;
 		} elseif (is_numeric($substr)) {
@@ -2586,19 +2586,19 @@ 
 				$substr = (int) $substr;
 			}
 			$type = self::T_NUMERIC;
-			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED' . "\n";
+			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED'."\n";
 		} elseif (preg_match('{^-?(\d+|\d*(\.\d+))\s*([/*%+-]\s*-?(\d+|\d*(\.\d+)))+$}', $substr)) {
 			if ($this->debug) echo 'SIMPLE MATH PARSED . "\n"';
 			$type = self::T_MATH;
 			$substr = '('.$substr.')';
 		} elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
-			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED' . "\n";
+			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED'."\n";
 			$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' . "\n";
+			if ($this->debug) echo 'BLABBER ('.$substr.') CASTED AS STRING'."\n";
 		}
 
 		if (is_array($parsingParams)) {
@@ -2621,10 +2621,10 @@ 
 	 * @param string $curBlock the current parser-block being processed
 	 * @return string the original string with variables replaced
 	 */
-	protected function replaceStringVars($string, $first, $curBlock='')
+	protected function replaceStringVars($string, $first, $curBlock = '')
 	{
 		$pos = 0;
-		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string . "\n";
+		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string."\n";
 		// replace vars
 		while (($pos = strpos($string, '$', $pos)) !== false) {
 			$prev = substr($string, $pos-1, 1);
@@ -2633,17 +2633,17 @@ 
 				continue;
 			}
 
-			$var = $this->parse($string, $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string':'string')));
+			$var = $this->parse($string, $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string' : 'string')));
 			$len = $var[0];
-			$var = $this->parse(str_replace('\\'.$first, $first, $string), $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string':'string')));
+			$var = $this->parse(str_replace('\\'.$first, $first, $string), $pos, null, false, ($curBlock === 'modifier' ? 'modifier' : ($prev === '`' ? 'delimited_string' : 'string')));
 
 			if ($prev === '`' && substr($string, $pos+$len, 1) === '`') {
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos-1, $len+2);
 			} else {
 				$string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
 			}
-			$pos += strlen($var[1]) + 2;
-			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string . "\n";
+			$pos += strlen($var[1])+2;
+			if ($this->debug) echo 'STRING VAR REPLACEMENT DONE : '.$string."\n";
 		}
 
 		// handle modifiers
@@ -2651,7 +2651,7 @@ 
 		$string = preg_replace_callback('#("|\')\.(.+?)\.\1((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').+?\4|:[^`]*))*))+)#i', array($this, 'replaceModifiers'), $string);
 
 		// replace escaped dollar operators by unescaped ones if required
-		if ($first==="'") {
+		if ($first === "'") {
 			$string = str_replace('\\$', '$', $string);
 		}
 
@@ -2669,7 +2669,7 @@ 
 	 */
 	protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
 	{
-		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3] . "\n";
+		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3]."\n";
 
 		if ($pointer !== null) {
 			$pointer += strlen($m[3]);
@@ -2691,7 +2691,7 @@ 
 				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' . "\n";
+				if ($this->debug) echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND'."\n";
 				$continue = false;
 				if ($pointer !== null) {
 					$pointer -= strlen($cmdstrsrc);
@@ -2710,7 +2710,7 @@ 
 			if ($paramspos === false) {
 				$cmdstrsrc = substr($cmdstrsrc, strlen($func));
 				$params = array();
-				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS' . "\n";
+				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS'."\n";
 			} else {
 				$paramstr = substr($cmdstr, $paramspos+1);
 				if (substr($paramstr, -1, 1) === $paramsep) {
@@ -2720,22 +2720,22 @@ 
 				$ptr = 0;
 				$params = array();
 				while ($ptr < strlen($paramstr)) {
-					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
-					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier' . "\n";
+					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr."\n";
+					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier'."\n";
 					$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'modifier', $ptr);
-					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr . "\n";
+					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr."\n";
 
 					if ($ptr >= strlen($paramstr)) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED' . "\n";
+						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED'."\n";
 						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 . "\n";
+						if ($this->debug) echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr."\n";
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
-								$pointer -= strlen($paramstr) - $ptr;
+								$pointer -= strlen($paramstr)-$ptr;
 							}
 						}
 						$ptr++;
@@ -2829,7 +2829,7 @@ 
 					if ($pluginType & Dwoo_Core::CLASS_PLUGIN) {
 						$callback = array($pluginName, ($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
 					} else {
-						$callback = $pluginName . (($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? '_compile' : '');
+						$callback = $pluginName.(($pluginType & Dwoo_Core::COMPILABLE_PLUGIN) ? '_compile' : '');
 					}
 				}
 
@@ -2908,7 +2908,7 @@ 
 		} elseif ($curBlock === 'var' || $m[1] === null) {
 			return $output;
 		} elseif ($curBlock === 'string' || $curBlock === 'root') {
-			return $m[1].'.'.$output.'.'.$m[1].(isset($add)?$add:null);
+			return $m[1].'.'.$output.'.'.$m[1].(isset($add) ? $add : null);
 		}
 
 		return '';
@@ -2987,9 +2987,9 @@ 
 			} elseif (function_exists('smarty_block_'.$name) !== false) {
 				$pluginType = Dwoo_Core::SMARTY_BLOCK;
 			} else {
-				if ($pluginType===-1) {
+				if ($pluginType === -1) {
 					try {
-						$this->dwoo->getLoader()->loadPlugin($name, isset($phpFunc)===false);
+						$this->dwoo->getLoader()->loadPlugin($name, isset($phpFunc) === false);
 					} catch (Exception $e) {
 						if (isset($phpFunc)) {
 							$pluginType = Dwoo_Core::NATIVE_PLUGIN;
@@ -3046,7 +3046,7 @@ 
 	 * @return array parameters sorted in the correct order with missing optional parameters filled
 	 * @throws Dwoo_Compilation_Exception
 	 */
-	protected function mapParams(array $params, $callback, $callType=2, $map = null)
+	protected function mapParams(array $params, $callback, $callType = 2, $map = null)
 	{
 		if (!$map) {
 			$map = $this->getParamMap($callback);
@@ -3065,11 +3065,11 @@ 
 		}
 
 		// loops over the param map and assigns values from the template or default value for unset optional params
-		while (list($k,$v) = each($map)) {
+		while (list($k, $v) = each($map)) {
 			if ($v[0] === '*') {
 				// "rest" array parameter, fill every remaining params in it and then break
 				if (count($ps) === 0) {
-					if ($v[1]===false) {
+					if ($v[1] === false) {
 						throw new Dwoo_Compilation_Exception($this, 'Rest argument missing for '.str_replace(array('Dwoo_Plugin_', '_compile'), '', (is_array($callback) ? $callback[0] : $callback)));
 					} else {
 						break;
@@ -3095,11 +3095,11 @@ 
 				// parameter is defined as ordered param
 				$paramlist[$v[0]] = $ps[$k];
 				unset($ps[$k]);
-			} elseif ($v[1]===false) {
+			} elseif ($v[1] === false) {
 				// parameter is not defined and not optional, throw error
 				if (is_array($callback)) {
 					if (is_object($callback[0])) {
-						$name = get_class($callback[0]) . '::' . $callback[1];
+						$name = get_class($callback[0]).'::'.$callback[1];
 					} else {
 						$name = $callback[0];
 					}
@@ -3108,7 +3108,7 @@ 
 				}
 
 				throw new Dwoo_Compilation_Exception($this, 'Argument '.$k.'/'.$v[0].' missing for '.str_replace(array('Dwoo_Plugin_', '_compile'), '', $name));
-			} elseif ($v[2]===null) {
+			} elseif ($v[2] === null) {
 				// enforce lowercased null if default value is null (php outputs NULL with var export)
 				$paramlist[$v[0]] = array('null', null, self::T_NULL);
 			} else {

Braces +169 added lines, -63 removed lines

@@ -722,7 +722,9 @@ 
 					echo 'COMPILER INIT' . "\n";
 				}
 
-				if ($this->debug) echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')' . "\n";
+				if ($this->debug) {
+					echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')' . "\n";
+				}
 
 				// runs preprocessors
 				foreach ($this->processors['pre'] as $preProc) {
@@ -738,7 +740,9 @@ 
 				unset($preProc);
 
 				// show template source if debug
-				if ($this->debug) echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>' . "\n";
+				if ($this->debug) {
+					echo '<pre>'.print_r(htmlentities($tpl), true).'</pre>' . "\n";
+				}
 
 				// strips php tags if required by the security policy
 				if ($this->securityPolicy !== null) {
@@ -827,7 +831,9 @@ 
 
 		$compiled .= $this->removeBlock('topLevelBlock');
 
-		if ($this->debug) echo 'PROCESSING POSTPROCESSORS' . "\n";
+		if ($this->debug) {
+			echo 'PROCESSING POSTPROCESSORS' . "\n";
+		}
 
 		foreach ($this->processors['post'] as $postProc) {
 			if (is_array($postProc) && isset($postProc['autoload'])) {
@@ -841,7 +847,9 @@ 
 		}
 		unset($postProc);
 
-		if ($this->debug) echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage() . "\n";
+		if ($this->debug) {
+			echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage() . "\n";
+		}
 
 		$output = "<?php\n/* template head */\n";
 
@@ -924,7 +932,9 @@ 
 	 */
 	protected function resolveSubTemplateDependencies($function)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$body = $this->templatePlugins[$function]['body'];
 		foreach ($this->templatePlugins as $func => $attr) {
@@ -996,8 +1006,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();
@@ -1024,7 +1035,9 @@ 
 	 */
 	public function addBlock($type, array $params, $paramtype)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$class = 'Dwoo_Plugin_'.$type;
 		if (class_exists($class) === false) {
@@ -1071,7 +1084,9 @@ 
 	 */
 	public function injectBlock($type, array $params)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$class = 'Dwoo_Plugin_'.$type;
 		if (class_exists($class) === false) {
@@ -1090,7 +1105,9 @@ 
 	 */
 	public function removeBlock($type)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$output = '';
 
@@ -1177,7 +1194,9 @@ 
 	 */
 	public function removeTopBlock()
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		$o = array_pop($this->stack);
 		if ($o === null) {
@@ -1255,7 +1274,9 @@ 
 	 */
 	protected function parse($in, $from, $to, $parsingParams = false, $curBlock='', &$pointer = null)
 	{
-		if ($this->debug) echo 'Compiler::'.__FUNCTION__."\n";
+		if ($this->debug) {
+			echo 'Compiler::'.__FUNCTION__."\n";
+		}
 
 		if ($to === null) {
 			$to = strlen($in);
@@ -1270,7 +1291,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' . "\n";
+				if ($this->debug) {
+					echo 'TEMPLATE PARSING ENDED' . "\n";
+				}
 				return false;
 			}
 			$from++;
@@ -1289,7 +1312,9 @@ 
 
 		$substr = substr($in, $from, $to-$from);
 
-		if ($this->debug) echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer. "\n";
+		if ($this->debug) {
+			echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer. "\n";
+		}
 		$parsed = "";
 
 		if ($curBlock === 'root' && $first === '*') {
@@ -1373,7 +1398,9 @@ 
 			$parsed = 'func';
 		} elseif ($first === ';') {
 			// instruction end
-			if ($this->debug) echo 'END OF INSTRUCTION' . "\n";
+			if ($this->debug) {
+				echo 'END OF INSTRUCTION' . "\n";
+			}
 			if ($pointer !== null) {
 				$pointer++;
 			}
@@ -1393,20 +1420,28 @@ 
 				if ($this->curBlock['type'] == 'else' || $this->curBlock['type'] == 'elseif') {
 					$pointer -= strlen($match[0]);
 				}
-				if ($this->debug) echo 'TOP BLOCK CLOSED' . "\n";
+				if ($this->debug) {
+					echo 'TOP BLOCK CLOSED' . "\n";
+				}
 				return $this->removeTopBlock();
 			} else {
-				if ($this->debug) echo 'BLOCK OF TYPE '.$match[1].' CLOSED' . "\n";
+				if ($this->debug) {
+					echo 'BLOCK OF TYPE '.$match[1].' CLOSED' . "\n";
+				}
 				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' . "\n";
+			if ($this->debug) {
+				echo 'TAG PARSING ENDED' . "\n";
+			}
 			$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' . "\n";
+			if ($this->debug) {
+				echo 'NAMED PARAM FOUND' . "\n";
+			}
 			$len = strlen($match[1]);
 			while (substr($in, $from+$len, 1)===' ') {
 				$len++;
@@ -1446,7 +1481,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 . "\n";
+				if($this->debug) {
+					echo 'PARSING POST-VAR EXPRESSION '.$substr . "\n";
+				}
 				// parse expressions
 				$pointer += strlen($match[0]) - 1;
 				if (is_array($parsingParams)) {
@@ -1476,7 +1513,9 @@ 
 					}
 				}
 			} else if ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
-				if($this->debug) echo 'PARSING POST-VAR ASSIGNMENT '.$substr . "\n";
+				if($this->debug) {
+					echo 'PARSING POST-VAR ASSIGNMENT '.$substr . "\n";
+				}
 				// parse assignment
 				$value = $match[2];
 				$operator = trim($match[1]);
@@ -1518,7 +1557,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' . "\n";
+				if ($this->debug) {
+					echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND' . "\n";
+				}
 				$len = strlen($match[1]);
 				$var = $out[count($out)-1];
 				$pointer += $len;
@@ -1594,7 +1635,9 @@ 
 			$cmdstr = $match[1];
 		}
 
-		if ($this->debug) echo 'FUNC FOUND ('.$func.')' . "\n";
+		if ($this->debug) {
+			echo 'FUNC FOUND ('.$func.')' . "\n";
+		}
 
 		$paramsep = '';
 
@@ -1656,17 +1699,25 @@ 
 							}
 
 							if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							} elseif ($paramstr[$ptr] === ';') {
 								$ptr++;
-								if ($this->debug) echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							} elseif ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === '/') {
-								if ($this->debug) echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, "/" FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							} elseif (substr($paramstr, $ptr, strlen($this->rd)) === $this->rd) {
-								if ($this->debug) echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr . "\n";
+								if ($this->debug) {
+									echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr . "\n";
+								}
 								break 2;
 							}
 
@@ -1677,7 +1728,9 @@ 
 							}
 						}
 
-						if ($this->debug) echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+						if ($this->debug) {
+							echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+						}
 
 						if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
 							$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'condition', $ptr);
@@ -1687,7 +1740,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).')' . "\n";
+						if ($this->debug) {
+							echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')' . "\n";
+						}
 					}
 				}
 				$paramstr = substr($paramstr, 0, $ptr);
@@ -1711,7 +1766,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' . "\n";
+			if ($this->debug) {
+				echo 'FUNC ADDS '.((isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func)).' TO POINTER' . "\n";
+			}
 		}
 
 		if ($curBlock === 'method' || $func === 'do' || strstr($func, '::') !== false) {
@@ -1836,8 +1893,7 @@ 
 					if ($callback instanceof \Closure) {
 						array_unshift($params, $this->getDwoo());
 						$output = call_user_func_array($callback, $params);
-					}
-					else {
+					} else {
 						array_unshift($params, '$this');
 						$params = self::implode_r($params);
 						$output = 'call_user_func(\'' . $callback . '\', ' . $params . ')';
@@ -1952,7 +2008,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 ? '...':'').')' . "\n";
+		if ($this->debug) {
+			echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...':'').')' . "\n";
+		}
 		$strend = false;
 		$o = $from+1;
 		while ($strend === false) {
@@ -1965,7 +2023,9 @@ 
 				$strend = false;
 			}
 		}
-		if ($this->debug) echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from) . "\n";
+		if ($this->debug) {
+			echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from) . "\n";
+		}
 
 		$srcOutput = substr($in, $from, $strend+1-$from);
 
@@ -2171,11 +2231,15 @@ 
 				}
 				unset($uid, $current, $curTxt, $tree, $chars);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT : '.$key . "\n";
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT : '.$key . "\n";
+				}
 
 				$key = $this->flattenVarTree($parsed);
 
-				if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+				if ($this->debug) {
+					echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+				}
 
 				$output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
 			} else {
@@ -2355,8 +2419,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 {
@@ -2466,7 +2531,9 @@ 
 				} else {
 					$cnt = substr_count($key, '$');
 
-					if ($this->debug) echo 'PARSING SUBVARS IN : '.$key . "\n";
+					if ($this->debug) {
+						echo 'PARSING SUBVARS IN : '.$key . "\n";
+					}
 					if ($cnt > 0) {
 						while (--$cnt >= 0) {
 							if (isset($last)) {
@@ -2488,7 +2555,9 @@ 
 								$last,
 								$len
 							);
-							if ($this->debug) echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+							if ($this->debug) {
+								echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key . "\n";
+							}
 						}
 						unset($last);
 
@@ -2569,15 +2638,21 @@ 
 		$substr = trim($substr);
 
 		if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
-			if ($this->debug) echo 'BOOLEAN(FALSE) PARSED' . "\n";
+			if ($this->debug) {
+				echo 'BOOLEAN(FALSE) PARSED' . "\n";
+			}
 			$substr = 'false';
 			$type = self::T_BOOL;
 		} elseif (strtolower($substr) === 'true' || strtolower($substr) === 'yes' || strtolower($substr) === 'on') {
-			if ($this->debug) echo 'BOOLEAN(TRUE) PARSED' . "\n";
+			if ($this->debug) {
+				echo 'BOOLEAN(TRUE) PARSED' . "\n";
+			}
 			$substr = 'true';
 			$type = self::T_BOOL;
 		} elseif ($substr === 'null' || $substr === 'NULL') {
-			if ($this->debug) echo 'NULL PARSED' . "\n";
+			if ($this->debug) {
+				echo 'NULL PARSED' . "\n";
+			}
 			$substr = 'null';
 			$type = self::T_NULL;
 		} elseif (is_numeric($substr)) {
@@ -2586,19 +2661,27 @@ 
 				$substr = (int) $substr;
 			}
 			$type = self::T_NUMERIC;
-			if ($this->debug) echo 'NUMBER ('.$substr.') PARSED' . "\n";
+			if ($this->debug) {
+				echo 'NUMBER ('.$substr.') PARSED' . "\n";
+			}
 		} elseif (preg_match('{^-?(\d+|\d*(\.\d+))\s*([/*%+-]\s*-?(\d+|\d*(\.\d+)))+$}', $substr)) {
-			if ($this->debug) echo 'SIMPLE MATH PARSED . "\n"';
+			if ($this->debug) {
+				echo 'SIMPLE MATH PARSED . "\n"';
+			}
 			$type = self::T_MATH;
 			$substr = '('.$substr.')';
 		} elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
-			if ($this->debug) echo 'BREAKCHAR ('.$substr.') PARSED' . "\n";
+			if ($this->debug) {
+				echo 'BREAKCHAR ('.$substr.') PARSED' . "\n";
+			}
 			$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' . "\n";
+			if ($this->debug) {
+				echo 'BLABBER ('.$substr.') CASTED AS STRING' . "\n";
+			}
 		}
 
 		if (is_array($parsingParams)) {
@@ -2624,7 +2707,9 @@ 
 	protected function replaceStringVars($string, $first, $curBlock='')
 	{
 		$pos = 0;
-		if ($this->debug) echo 'STRING VAR REPLACEMENT : '.$string . "\n";
+		if ($this->debug) {
+			echo 'STRING VAR REPLACEMENT : '.$string . "\n";
+		}
 		// replace vars
 		while (($pos = strpos($string, '$', $pos)) !== false) {
 			$prev = substr($string, $pos-1, 1);
@@ -2643,7 +2728,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 . "\n";
+			if ($this->debug) {
+				echo 'STRING VAR REPLACEMENT DONE : '.$string . "\n";
+			}
 		}
 
 		// handle modifiers
@@ -2669,7 +2756,9 @@ 
 	 */
 	protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
 	{
-		if ($this->debug) echo 'PARSING MODIFIERS : '.$m[3] . "\n";
+		if ($this->debug) {
+			echo 'PARSING MODIFIERS : '.$m[3] . "\n";
+		}
 
 		if ($pointer !== null) {
 			$pointer += strlen($m[3]);
@@ -2691,7 +2780,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' . "\n";
+				if ($this->debug) {
+					echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND' . "\n";
+				}
 				$continue = false;
 				if ($pointer !== null) {
 					$pointer -= strlen($cmdstrsrc);
@@ -2710,7 +2801,9 @@ 
 			if ($paramspos === false) {
 				$cmdstrsrc = substr($cmdstrsrc, strlen($func));
 				$params = array();
-				if ($this->debug) echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS' . "\n";
+				if ($this->debug) {
+					echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS' . "\n";
+				}
 			} else {
 				$paramstr = substr($cmdstr, $paramspos+1);
 				if (substr($paramstr, -1, 1) === $paramsep) {
@@ -2720,18 +2813,28 @@ 
 				$ptr = 0;
 				$params = array();
 				while ($ptr < strlen($paramstr)) {
-					if ($this->debug) echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
-					if ($this->debug) echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier' . "\n";
+					if ($this->debug) {
+						echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr . "\n";
+					}
+					if ($this->debug) {
+						echo $paramstr.'--'.$ptr.'--'.strlen($paramstr).'--modifier' . "\n";
+					}
 					$params = $this->parse($paramstr, $ptr, strlen($paramstr), $params, 'modifier', $ptr);
-					if ($this->debug) echo 'PARAM PARSED, POINTER AT '.$ptr . "\n";
+					if ($this->debug) {
+						echo 'PARAM PARSED, POINTER AT '.$ptr . "\n";
+					}
 
 					if ($ptr >= strlen($paramstr)) {
-						if ($this->debug) echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED' . "\n";
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED' . "\n";
+						}
 						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 . "\n";
+						if ($this->debug) {
+							echo 'PARAM PARSING ENDED, " ", "|", RIGHT DELIMITER or ";" FOUND, POINTER AT '.$ptr . "\n";
+						}
 						if ($paramstr[$ptr] !== '|') {
 							$continue = false;
 							if ($pointer !== null) {
@@ -2792,8 +2895,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);
@@ -2835,8 +2939,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) {
@@ -2929,8 +3034,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/Adapters/Agavi/DwooRenderer.php

Spacing +10 added lines, -10 removed lines

@@ -126,12 +126,12 @@ 
 	 */
 	protected function getEngine()
 	{
-		if($this->dwoo) {
+		if ($this->dwoo) {
 			return $this->dwoo;
 		}
 
 		// this triggers Agavi autoload
-		if(!class_exists('Dwoo')) {
+		if (!class_exists('Dwoo')) {
 			if (file_exists(dirname(__FILE__).'/../../../dwooAutoload.php')) {
 				// file was dropped with the entire dwoo package
 				require dirname(__FILE__).'/../../../dwooAutoload.php';
@@ -143,10 +143,10 @@ 
 
 		$parentMode = fileperms(AgaviConfig::get('core.cache_dir'));
 
-		$compileDir = AgaviConfig::get('core.cache_dir') . DIRECTORY_SEPARATOR . self::COMPILE_DIR . DIRECTORY_SEPARATOR . self::COMPILE_SUBDIR;
+		$compileDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::COMPILE_DIR.DIRECTORY_SEPARATOR.self::COMPILE_SUBDIR;
 		AgaviToolkit::mkdir($compileDir, $parentMode, true);
 
-		$cacheDir = AgaviConfig::get('core.cache_dir') . DIRECTORY_SEPARATOR . self::CACHE_DIR;
+		$cacheDir = AgaviConfig::get('core.cache_dir').DIRECTORY_SEPARATOR.self::CACHE_DIR;
 		AgaviToolkit::mkdir($cacheDir, $parentMode, true);
 
 		$this->dwoo = new Dwoo_Core($compileDir, $cacheDir);
@@ -177,23 +177,23 @@ 
 		$engine = $this->getEngine();
 
 		$data = array();
-		if($this->extractVars) {
+		if ($this->extractVars) {
 			$data = $attributes;
 		} else {
 			$data[$this->varName] = &$attributes;
 		}
 
-		$data[$this->slotsVarName] =& $slots;
+		$data[$this->slotsVarName] = & $slots;
 
-		foreach($this->assigns as $key => $getter) {
+		foreach ($this->assigns as $key => $getter) {
 			$data[$key] = $this->getContext()->$getter();
 		}
 
-		foreach($moreAssigns as $key => &$value) {
-			if(isset($this->moreAssignNames[$key])) {
+		foreach ($moreAssigns as $key => &$value) {
+			if (isset($this->moreAssignNames[$key])) {
 				$key = $this->moreAssignNames[$key];
 			}
-			$data[$key] =& $value;
+			$data[$key] = & $value;
 		}
 
 		return $engine->get($layer->getResourceStreamIdentifier(), $data);