dwoo-project / dwoo

lib/plugins/builtin/blocks/if.php

Spacing +12 added lines, -12 removed lines

@@ -39,14 +39,14 @@ 
 		$p = array();
 
 		reset($params);
-		while (list($k,$v) = each($params)) {
+		while (list($k, $v) = each($params)) {
 			$v = (string) $v;
-			if(substr($v, 0, 1) === '"' || substr($v, 0, 1) === '\'') {
+			if (substr($v, 0, 1) === '"' || substr($v, 0, 1) === '\'') {
 				$vmod = strtolower(substr($v, 1, -1));
 			} else {
 				$vmod = strtolower($v);
 			}
-			switch($vmod) {
+			switch ($vmod) {
 
 			case 'and':
 				if ($tokens[$k] === Dwoo_Compiler::T_UNQUOTED_STRING) {
@@ -155,7 +155,7 @@ 
 				} else {
 					$negate = false;
 				}
-				$ptr = 1+(int)$negate;
+				$ptr = 1+(int) $negate;
 				if ($tokens[$k+$ptr] !== Dwoo_Compiler::T_UNQUOTED_STRING) {
 					break;
 				}
@@ -164,27 +164,27 @@ 
 				} else {
 					$params[$k+$ptr] = trim($params[$k+$ptr], '"\'');
 				}
-				switch($params[$k+$ptr]) {
+				switch ($params[$k+$ptr]) {
 
 				case 'div':
 					if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
-						$p[] = ' % '.$params[$k+$ptr+2].' '.($negate?'!':'=').'== 0';
+						$p[] = ' % '.$params[$k+$ptr+2].' '.($negate ? '!' : '=').'== 0';
 						next($params);
 						next($params);
 						next($params);
 					} else {
-						throw new Dwoo_Compilation_Exception($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found '.$params[$k-1].' is '.($negate?'not ':'').'div '.$params[$k+$ptr+1].' '.$params[$k+$ptr+2]);
+						throw new Dwoo_Compilation_Exception($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found '.$params[$k-1].' is '.($negate ? 'not ' : '').'div '.$params[$k+$ptr+1].' '.$params[$k+$ptr+2]);
 					}
 					break;
 				case 'even':
 					$a = array_pop($p);
 					if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
 						$b = $params[$k+$ptr+2];
-						$p[] = '('.$a .' / '.$b.') % 2 '.($negate?'!':'=').'== 0';
+						$p[] = '('.$a.' / '.$b.') % 2 '.($negate ? '!' : '=').'== 0';
 						next($params);
 						next($params);
 					} else {
-						$p[] = $a.' % 2 '.($negate?'!':'=').'== 0';
+						$p[] = $a.' % 2 '.($negate ? '!' : '=').'== 0';
 					}
 					next($params);
 					break;
@@ -192,11 +192,11 @@ 
 					$a = array_pop($p);
 					if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
 						$b = $params[$k+$ptr+2];
-						$p[] = '('.$a .' / '.$b.') % 2 '.($negate?'=':'!').'== 0';
+						$p[] = '('.$a.' / '.$b.') % 2 '.($negate ? '=' : '!').'== 0';
 						next($params);
 						next($params);
 					} else {
-						$p[] = $a.' % 2 '.($negate?'=':'!').'== 0';
+						$p[] = $a.' % 2 '.($negate ? '=' : '!').'== 0';
 					}
 					next($params);
 					break;
@@ -231,6 +231,6 @@ 
 			$post .= $params['hasElse'];
 		}
 
-		return $pre . $content . $post;
+		return $pre.$content.$post;
 	}
 }

lib/plugins/builtin/blocks/capture.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		$params = $compiler->getCompiledParams($params);
 
-		$out = $content . Dwoo_Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
+		$out = $content.Dwoo_Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
 		if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
 			$out .= "\n".'$tmp = trim($tmp);';
 		}
@@ -56,6 +56,6 @@ 
 		if ($params['assign'] !== 'null') {
 			$out .= "\n".'$this->scope['.$params['assign'].'] = $tmp;';
 		}
-		return $out . "\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Dwoo_Compiler::PHP_CLOSE;
+		return $out."\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Dwoo_Compiler::PHP_CLOSE;
 	}
 }

lib/plugins/builtin/blocks/foreach.php

Spacing +16 added lines, -16 removed lines

@@ -31,16 +31,16 @@ 
  */
 class Dwoo_Plugin_foreach extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-	public static $cnt=0;
+	public static $cnt = 0;
 
-	public function init($from, $key=null, $item=null, $name='default', $implode=null)
+	public function init($from, $key = null, $item = null, $name = 'default', $implode = null)
 	{
 	}
 
 	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
 	{
 		// get block params and save the current template pointer to use it in the postProcessing method
-		$currentBlock =& $compiler->getCurrentBlock();
+		$currentBlock = & $compiler->getCurrentBlock();
 		$currentBlock['params']['tplPointer'] = $compiler->getPointer();
 
 		return '';
@@ -101,22 +101,22 @@ 
 		$cnt = self::$cnt++;
 
 		// build pre content output
-		$pre = Dwoo_Compiler::PHP_OPEN . "\n".'$_fh'.$cnt.'_data = '.$src.';';
+		$pre = Dwoo_Compiler::PHP_OPEN."\n".'$_fh'.$cnt.'_data = '.$src.';';
 		// adds foreach properties
 		if ($usesAny) {
 			$pre .= "\n".'$this->globals["foreach"]['.$name.'] = array'."\n(";
-			if ($usesIndex) $pre .="\n\t".'"index"		=> 0,';
-			if ($usesIteration) $pre .="\n\t".'"iteration"		=> 1,';
-			if ($usesFirst) $pre .="\n\t".'"first"		=> null,';
-			if ($usesLast) $pre .="\n\t".'"last"		=> null,';
-			if ($usesShow) $pre .="\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
-			if ($usesTotal) $pre .="\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
-			$pre.="\n);\n".'$_fh'.$cnt.'_glob =& $this->globals["foreach"]['.$name.'];';
+			if ($usesIndex) $pre .= "\n\t".'"index"		=> 0,';
+			if ($usesIteration) $pre .= "\n\t".'"iteration"		=> 1,';
+			if ($usesFirst) $pre .= "\n\t".'"first"		=> null,';
+			if ($usesLast) $pre .= "\n\t".'"last"		=> null,';
+			if ($usesShow) $pre .= "\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
+			if ($usesTotal) $pre .= "\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
+			$pre .= "\n);\n".'$_fh'.$cnt.'_glob =& $this->globals["foreach"]['.$name.'];';
 		}
 		// checks if foreach must be looped
 		$pre .= "\n".'if ($this->isTraversable($_fh'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
 		// iterates over keys
-		$pre .= "\n\t".'foreach ($_fh'.$cnt.'_data as '.(isset($key)?'$this->scope['.$key.']=>':'').'$this->scope['.$val.'])'."\n\t{";
+		$pre .= "\n\t".'foreach ($_fh'.$cnt.'_data as '.(isset($key) ? '$this->scope['.$key.']=>' : '').'$this->scope['.$val.'])'."\n\t{";
 		// updates properties
 		if ($usesFirst) {
 			$pre .= "\n\t\t".'$_fh'.$cnt.'_glob["first"] = (string) ($_fh'.$cnt.'_glob["index"] === 0);';
@@ -127,7 +127,7 @@ 
 		$pre .= "\n/* -- foreach start output */\n".Dwoo_Compiler::PHP_CLOSE;
 
 		// build post content output
-		$post = Dwoo_Compiler::PHP_OPEN . "\n";
+		$post = Dwoo_Compiler::PHP_OPEN."\n";
 
 		if (isset($implode)) {
 			$post .= '/* -- implode */'."\n".'if (!$_fh'.$cnt.'_glob["last"]) {'.
@@ -136,10 +136,10 @@ 
 		$post .= '/* -- foreach end output */';
 		// update properties
 		if ($usesIndex) {
-			$post.="\n\t\t".'$_fh'.$cnt.'_glob["index"]+=1;';
+			$post .= "\n\t\t".'$_fh'.$cnt.'_glob["index"]+=1;';
 		}
 		if ($usesIteration) {
-			$post.="\n\t\t".'$_fh'.$cnt.'_glob["iteration"]+=1;';
+			$post .= "\n\t\t".'$_fh'.$cnt.'_glob["iteration"]+=1;';
 		}
 		// end loop
 		$post .= "\n\t}\n}".Dwoo_Compiler::PHP_CLOSE;
@@ -147,6 +147,6 @@ 
 			$post .= $params['hasElse'];
 		}
 
-		return $pre . $content . $post;
+		return $pre.$content.$post;
 	}
 }

Braces +18 added lines, -6 removed lines

@@ -105,12 +105,24 @@
 		// adds foreach properties
 		if ($usesAny) {
 			$pre .= "\n".'$this->globals["foreach"]['.$name.'] = array'."\n(";
-			if ($usesIndex) $pre .="\n\t".'"index"		=> 0,';
-			if ($usesIteration) $pre .="\n\t".'"iteration"		=> 1,';
-			if ($usesFirst) $pre .="\n\t".'"first"		=> null,';
-			if ($usesLast) $pre .="\n\t".'"last"		=> null,';
-			if ($usesShow) $pre .="\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
-			if ($usesTotal) $pre .="\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
+			if ($usesIndex) {
+				$pre .="\n\t".'"index"		=> 0,';
+			}
+			if ($usesIteration) {
+				$pre .="\n\t".'"iteration"		=> 1,';
+			}
+			if ($usesFirst) {
+				$pre .="\n\t".'"first"		=> null,';
+			}
+			if ($usesLast) {
+				$pre .="\n\t".'"last"		=> null,';
+			}
+			if ($usesShow) {
+				$pre .="\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
+			}
+			if ($usesTotal) {
+				$pre .="\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
+			}
 			$pre.="\n);\n".'$_fh'.$cnt.'_glob =& $this->globals["foreach"]['.$name.'];';
 		}
 		// checks if foreach must be looped

lib/plugins/builtin/blocks/block.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  */
 class Dwoo_Plugin_block extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-	public function init($name='')
+	public function init($name = '')
 	{
 	}
 

lib/plugins/builtin/blocks/foreachelse.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 
 	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
 	{
-		$with =& $compiler->findBlock('foreach', true);
+		$with = & $compiler->findBlock('foreach', true);
 
 		$params['initialized'] = true;
 		$compiler->injectBlock($type, $params);
@@ -36,8 +36,8 @@ 
 			return '';
 		}
 
-		$block =& $compiler->getCurrentBlock();
-		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE . $content . Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$block = & $compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 		return '';
 	}
 }

lib/plugins/builtin/blocks/for.php

Spacing +14 added lines, -14 removed lines

@@ -21,16 +21,16 @@ 
  */
 class Dwoo_Plugin_for extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-	public static $cnt=0;
+	public static $cnt = 0;
 
-	public function init($name, $from, $to=null, $step=1, $skip=0)
+	public function init($name, $from, $to = null, $step = 1, $skip = 0)
 	{
 	}
 
 	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
 	{
 		// get block params and save the current template pointer to use it in the postProcessing method
-		$currentBlock =& $compiler->getCurrentBlock();
+		$currentBlock = & $compiler->getCurrentBlock();
 		$currentBlock['params']['tplPointer'] = $compiler->getPointer();
 
 		return '';
@@ -66,7 +66,7 @@ 
 		$cnt = self::$cnt++;
 
 		// builds pre processing output for
-		$out = Dwoo_Compiler::PHP_OPEN . "\n".'$_for'.$cnt.'_from = '.$from.';'.
+		$out = Dwoo_Compiler::PHP_OPEN."\n".'$_for'.$cnt.'_from = '.$from.';'.
 										"\n".'$_for'.$cnt.'_to = '.$to.';'.
 										"\n".'$_for'.$cnt.'_step = abs('.$step.');'.
 										"\n".'if (is_numeric($_for'.$cnt.'_from) && !is_numeric($_for'.$cnt.'_to)) { $this->triggerError(\'For requires the <em>to</em> parameter when using a numerical <em>from</em>\'); }'.
@@ -74,13 +74,13 @@ 
 		// adds for properties
 		if ($usesAny) {
 			$out .= "\n".'$this->globals["for"]['.$name.'] = array'."\n(";
-			if ($usesIndex) $out .="\n\t".'"index"		=> 0,';
-			if ($usesIteration) $out .="\n\t".'"iteration"		=> 1,';
-			if ($usesFirst) $out .="\n\t".'"first"		=> null,';
-			if ($usesLast) $out .="\n\t".'"last"		=> null,';
-			if ($usesShow) $out .="\n\t".'"show"		=> $tmp_shows,';
-			if ($usesTotal) $out .="\n\t".'"total"		=> $this->isArray($_for'.$cnt.'_from) ? floor($this->count($_for'.$cnt.'_from) / $_for'.$cnt.'_step) : (is_numeric($_for'.$cnt.'_from) ? abs(($_for'.$cnt.'_to + 1 - $_for'.$cnt.'_from)/$_for'.$cnt.'_step) : 0),';
-			$out.="\n);\n".'$_for'.$cnt.'_glob =& $this->globals["for"]['.$name.'];';
+			if ($usesIndex) $out .= "\n\t".'"index"		=> 0,';
+			if ($usesIteration) $out .= "\n\t".'"iteration"		=> 1,';
+			if ($usesFirst) $out .= "\n\t".'"first"		=> null,';
+			if ($usesLast) $out .= "\n\t".'"last"		=> null,';
+			if ($usesShow) $out .= "\n\t".'"show"		=> $tmp_shows,';
+			if ($usesTotal) $out .= "\n\t".'"total"		=> $this->isArray($_for'.$cnt.'_from) ? floor($this->count($_for'.$cnt.'_from) / $_for'.$cnt.'_step) : (is_numeric($_for'.$cnt.'_from) ? abs(($_for'.$cnt.'_to + 1 - $_for'.$cnt.'_from)/$_for'.$cnt.'_step) : 0),';
+			$out .= "\n);\n".'$_for'.$cnt.'_glob =& $this->globals["for"]['.$name.'];';
 		}
 		// checks if for must be looped
 		$out .= "\n".'if ($tmp_shows)'."\n{";
@@ -117,7 +117,7 @@ 
 		$out .= "\n\t".'for ($this->scope['.$name.'] = $_for'.$cnt.'_from; $this->scope['.$name.'] '.$condition.' $_for'.$cnt.'_to; $this->scope['.$name.'] '.$incrementer.'= $_for'.$cnt.'_step)'."\n\t{";
 		// updates properties
 		if ($usesIndex) {
-			$out .="\n\t\t".'$_for'.$cnt.'_glob["index"] = $this->scope['.$name.'];';
+			$out .= "\n\t\t".'$_for'.$cnt.'_glob["index"] = $this->scope['.$name.'];';
 		}
 		if ($usesFirst) {
 			$out .= "\n\t\t".'$_for'.$cnt.'_glob["first"] = (string) ($_for'.$cnt.'_glob["iteration"] === 1);';
@@ -129,7 +129,7 @@ 
 
 
 		// build post processing output and cache it
-		$postOut = Dwoo_Compiler::PHP_OPEN . '/* -- for end output */';
+		$postOut = Dwoo_Compiler::PHP_OPEN.'/* -- for end output */';
 		// update properties
 		if ($usesIteration) {
 			$postOut .= "\n\t\t".'$_for'.$cnt.'_glob["iteration"]+=1;';
@@ -141,6 +141,6 @@ 
 			$postOut .= $params['hasElse'];
 		}
 
-		return $out . $content . $postOut;
+		return $out.$content.$postOut;
 	}
 }

Braces +18 added lines, -6 removed lines

@@ -74,12 +74,24 @@
 		// adds for properties
 		if ($usesAny) {
 			$out .= "\n".'$this->globals["for"]['.$name.'] = array'."\n(";
-			if ($usesIndex) $out .="\n\t".'"index"		=> 0,';
-			if ($usesIteration) $out .="\n\t".'"iteration"		=> 1,';
-			if ($usesFirst) $out .="\n\t".'"first"		=> null,';
-			if ($usesLast) $out .="\n\t".'"last"		=> null,';
-			if ($usesShow) $out .="\n\t".'"show"		=> $tmp_shows,';
-			if ($usesTotal) $out .="\n\t".'"total"		=> $this->isArray($_for'.$cnt.'_from) ? floor($this->count($_for'.$cnt.'_from) / $_for'.$cnt.'_step) : (is_numeric($_for'.$cnt.'_from) ? abs(($_for'.$cnt.'_to + 1 - $_for'.$cnt.'_from)/$_for'.$cnt.'_step) : 0),';
+			if ($usesIndex) {
+				$out .="\n\t".'"index"		=> 0,';
+			}
+			if ($usesIteration) {
+				$out .="\n\t".'"iteration"		=> 1,';
+			}
+			if ($usesFirst) {
+				$out .="\n\t".'"first"		=> null,';
+			}
+			if ($usesLast) {
+				$out .="\n\t".'"last"		=> null,';
+			}
+			if ($usesShow) {
+				$out .="\n\t".'"show"		=> $tmp_shows,';
+			}
+			if ($usesTotal) {
+				$out .="\n\t".'"total"		=> $this->isArray($_for'.$cnt.'_from) ? floor($this->count($_for'.$cnt.'_from) / $_for'.$cnt.'_step) : (is_numeric($_for'.$cnt.'_from) ? abs(($_for'.$cnt.'_to + 1 - $_for'.$cnt.'_from)/$_for'.$cnt.'_step) : 0),';
+			}
 			$out.="\n);\n".'$_for'.$cnt.'_glob =& $this->globals["for"]['.$name.'];';
 		}
 		// checks if for must be looped

lib/plugins/builtin/blocks/with.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
  */
 class Dwoo_Plugin_with extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-	protected static $cnt=0;
+	protected static $cnt = 0;
 
 	public function init($var)
 	{
@@ -59,11 +59,11 @@ 
 		$compiler->setScope($rparams['var']);
 
 
-		$pre = Dwoo_Compiler::PHP_OPEN. 'if ('.$cparams['var'].')'."\n{\n".
+		$pre = Dwoo_Compiler::PHP_OPEN.'if ('.$cparams['var'].')'."\n{\n".
 			'$_with'.(self::$cnt).' = $this->setScope("'.$rparams['var'].'");'.
 			"\n/* -- start with output */\n".Dwoo_Compiler::PHP_CLOSE;
 
-		$post = Dwoo_Compiler::PHP_OPEN. "\n/* -- end with output */\n".
+		$post = Dwoo_Compiler::PHP_OPEN."\n/* -- end with output */\n".
 			'$this->setScope($_with'.(self::$cnt++).', true);'.
 			"\n}\n".Dwoo_Compiler::PHP_CLOSE;
 
@@ -71,6 +71,6 @@ 
 			$post .= $params['hasElse'];
 		}
 
-		return $pre . $content . $post;
+		return $pre.$content.$post;
 	}
 }

lib/plugins/builtin/blocks/else.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 		$preContent = '';
 		while (true) {
 			$preContent .= $compiler->removeTopBlock();
-			$block =& $compiler->getCurrentBlock();
+			$block = & $compiler->getCurrentBlock();
 			if (!$block) {
 				throw new Dwoo_Compilation_Exception($compiler, 'An else block was found but it was not preceded by an if or other else-able construct');
 			}
@@ -59,8 +59,8 @@ 
 			return '';
 		}
 
-		$block =& $compiler->getCurrentBlock();
-		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE . $content . Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
+		$block = & $compiler->getCurrentBlock();
+		$block['params']['hasElse'] = Dwoo_Compiler::PHP_OPEN."else {\n".Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 		return '';
 	}
 }

lib/plugins/builtin/blocks/template.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 		$params['*'] = $parsedParams;
 		$params['uuid'] = uniqid();
 		$compiler->addTemplatePlugin($params['name'], $parsedParams, $params['uuid']);
-		$currentBlock =& $compiler->getCurrentBlock();
+		$currentBlock = & $compiler->getCurrentBlock();
 		$currentBlock['params'] = $params;
 		return '';
 	}
@@ -58,9 +58,9 @@ 
 		$cleanup = '/* -- template end output */ $dwoo->setScope($_scope, true);';
 		foreach ($params['*'] as $param=>$defValue) {
 			if ($defValue === null) {
-				$paramstr.=', $'.$param;
+				$paramstr .= ', $'.$param;
 			} else {
-				$paramstr.=', $'.$param.' = '.$defValue;
+				$paramstr .= ', $'.$param.' = '.$defValue;
 			}
 			$init .= '$dwoo->scope[\''.$param.'\'] = $'.$param.";\n";
 		}

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	{
 		$params = $compiler->getCompiledParams($params);
 		$parsedParams = array();
-		if (!isset($params['*']))
-			$params['*'] = array();
+		if (!isset($params['*'])) {
+					$params['*'] = array();
+		}
 		foreach ($params['*'] as $param=>$defValue) {
 			if (is_numeric($param)) {
 				$param = $defValue;