dwoo-project / dwoo

lib/plugins/builtin/blocks/smartyinterface.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 class Dwoo_Plugin_smartyinterface extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-	public function init($__funcname, $__functype, array $rest=array()) {}
+	public function init($__funcname, $__functype, array $rest = array()) {}
 
 	public static function preProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $type)
 	{
@@ -46,7 +46,7 @@ 
 			$paramsOut .= var_export($i, true).' => '.$p.',';
 		}
 
-		$curBlock =& $compiler->getCurrentBlock();
+		$curBlock = & $compiler->getCurrentBlock();
 		$curBlock['params']['postOut'] = Dwoo_Compiler::PHP_OPEN.' $_block_content = ob_get_clean(); $_block_repeat=false; echo '.$callback.'$_tag_stack[count($_tag_stack)-1], $_block_content, $this, $_block_repeat); } array_pop($_tag_stack);'.Dwoo_Compiler::PHP_CLOSE;
 
 		return Dwoo_Compiler::PHP_OPEN.$prepend.' if (!isset($_tag_stack)){ $_tag_stack = array(); } $_tag_stack[] = array('.$paramsOut.'); $_block_repeat=true; '.$callback.'$_tag_stack[count($_tag_stack)-1], null, $this, $_block_repeat); while ($_block_repeat) { ob_start();'.Dwoo_Compiler::PHP_CLOSE;
@@ -54,6 +54,6 @@ 
 
 	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
 	{
-		return $content . $params['postOut'];
+		return $content.$params['postOut'];
 	}
 }

lib/plugins/builtin/blocks/a.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
  */
 class Dwoo_Plugin_a extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block
 {
-	public function init($href, array $rest=array())
+	public function init($href, array $rest = array())
 	{
 	}
 
@@ -42,9 +42,9 @@ 
 	{
 		$p = $compiler->getCompiledParams($params);
 
-		$out = Dwoo_Compiler::PHP_OPEN . 'echo \'<a '.self::paramsToAttributes($p, "'", $compiler);
+		$out = Dwoo_Compiler::PHP_OPEN.'echo \'<a '.self::paramsToAttributes($p, "'", $compiler);
 
-		return $out.'>\';' . Dwoo_Compiler::PHP_CLOSE;
+		return $out.'>\';'.Dwoo_Compiler::PHP_CLOSE;
 	}
 
 	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
@@ -55,13 +55,13 @@ 
 		if ($content == "") {
 			// merge </a> into the href if href is a string
 			if (substr($p['href'], -1) === '"' || substr($p['href'], -1) === '\'') {
-				return Dwoo_Compiler::PHP_OPEN . 'echo '.substr($p['href'], 0, -1).'</a>'.substr($p['href'], -1).';'.Dwoo_Compiler::PHP_CLOSE;
+				return Dwoo_Compiler::PHP_OPEN.'echo '.substr($p['href'], 0, -1).'</a>'.substr($p['href'], -1).';'.Dwoo_Compiler::PHP_CLOSE;
 			}
 			// otherwise append
-			return Dwoo_Compiler::PHP_OPEN . 'echo '.$p['href'].'.\'</a>\';'.Dwoo_Compiler::PHP_CLOSE;
+			return Dwoo_Compiler::PHP_OPEN.'echo '.$p['href'].'.\'</a>\';'.Dwoo_Compiler::PHP_CLOSE;
 		}
 
 		// return content
-		return $content . '</a>';
+		return $content.'</a>';
 	}
 }

lib/plugins/builtin/blocks/strip.php

Switch Indentation +5 added lines, -5 removed lines

@@ -35,12 +35,12 @@
 
 		$mode = trim($params['mode'], '"\'');
 		switch ($mode) {
-			case 'js':
-			case 'javascript':
-				$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
+		case 'js':
+		case 'javascript':
+			$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
 
-			case 'default':
-			default:
+		case 'default':
+		default:
 		}
 
 		$content = preg_replace(array("/\n/","/\r/",'/(<\?(?:php)?|<%)\s*/'), array('','','$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));

Spacing +2 added lines, -2 removed lines

@@ -37,13 +37,13 @@
 		switch ($mode) {
 			case 'js':
 			case 'javascript':
-				$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s','', $content);
+				$content = preg_replace('#(?<!:)//\s[^\r\n]*|/\*.*?\*/#s', '', $content);
 
 			case 'default':
 			default:
 		}
 
-		$content = preg_replace(array("/\n/","/\r/",'/(<\?(?:php)?|<%)\s*/'), array('','','$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));
+		$content = preg_replace(array("/\n/", "/\r/", '/(<\?(?:php)?|<%)\s*/'), array('', '', '$1 '), preg_replace('#^\s*(.+?)\s*$#m', '$1', $content));
 
 		return $content;
 	}

lib/plugins/builtin/blocks/section.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
  */
 class Dwoo_Plugin_section extends Dwoo_Block_Plugin implements Dwoo_ICompilable_Block, Dwoo_IElseable
 {
-	public static $cnt=0;
+	public static $cnt = 0;
 
 	public function init($name, $loop, $start = null, $step = null, $max = null, $show = true)
 	{
@@ -118,9 +118,9 @@ 
 		$output .= "\t\t".'$_section'.$cnt.'[\'first\']      = ($_section'.$cnt.'[\'iteration\'] == 1);'."\n";
 		$output .= "\t\t".'$_section'.$cnt.'[\'last\']       = ($_section'.$cnt.'[\'iteration\'] == $_section'.$cnt.'[\'total\']);'."\n";
 
-		$output .= Dwoo_Compiler::PHP_CLOSE . $content . Dwoo_Compiler::PHP_OPEN;
+		$output .= Dwoo_Compiler::PHP_CLOSE.$content.Dwoo_Compiler::PHP_OPEN;
 
-		$output .= "\n\t}\n} " . Dwoo_Compiler::PHP_CLOSE;
+		$output .= "\n\t}\n} ".Dwoo_Compiler::PHP_CLOSE;
 
 		if (isset($params['hasElse'])) {
 			$output .= $params['hasElse'];

lib/plugins/builtin/blocks/topLevelBlock.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
 
 	public static function postProcessing(Dwoo_Compiler $compiler, array $params, $prepend, $append, $content)
 	{
-		return $content . Dwoo_Compiler::PHP_OPEN.' /* end template body */'."\n".'return $this->buffer . ob_get_clean();';
+		return $content.Dwoo_Compiler::PHP_OPEN.' /* end template body */'."\n".'return $this->buffer . ob_get_clean();';
 	}
 }

lib/plugins/builtin/blocks/elseif.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 		$preContent = '';
 		while (true) {
 			$preContent .= $compiler->removeTopBlock();
-			$block =& $compiler->getCurrentBlock();
+			$block = & $compiler->getCurrentBlock();
 			$interfaces = class_implements($block['class'], false);
 			if (in_array('Dwoo_IElseable', $interfaces) !== false) {
 				break;
@@ -47,15 +47,15 @@ 
 		$tokens = $compiler->getParamTokens($params);
 		$params = $compiler->getCompiledParams($params);
 
-		$pre = Dwoo_Compiler::PHP_OPEN."elseif (".implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n" . Dwoo_Compiler::PHP_CLOSE;
+		$pre = Dwoo_Compiler::PHP_OPEN."elseif (".implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Dwoo_Compiler::PHP_CLOSE;
 		$post = Dwoo_Compiler::PHP_OPEN."\n}".Dwoo_Compiler::PHP_CLOSE;
 
 		if (isset($params['hasElse'])) {
 			$post .= $params['hasElse'];
 		}
 
-		$block =& $compiler->getCurrentBlock();
-		$block['params']['hasElse'] = $pre . $content . $post;
+		$block = & $compiler->getCurrentBlock();
+		$block['params']['hasElse'] = $pre.$content.$post;
 		return '';
 	}
 }

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