dwoo-project / dwoo

lib/Dwoo/Plugins/Blocks/PluginElseif.php

Spacing +3 added lines, -3 removed lines

@@ -80,15 +80,15 @@
         $tokens = $compiler->getParamTokens($params);
         $params = $compiler->getCompiledParams($params);
 
-        $pre  = Compiler::PHP_OPEN . 'elseif (' . implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)) . ") {\n" . Compiler::PHP_CLOSE;
-        $post = Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $pre  = Compiler::PHP_OPEN.'elseif ('.implode(' ', self::replaceKeywords($params['*'], $tokens['*'], $compiler)).") {\n".Compiler::PHP_CLOSE;
+        $post = Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         if (isset($params['hasElse'])) {
             $post .= $params['hasElse'];
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = $pre . $content . $post;
+        $block['params']['hasElse'] = $pre.$content.$post;
 
         return '';
     }

lib/Dwoo/Plugins/Blocks/PluginForeach.php

Spacing +29 added lines, -29 removed lines

@@ -112,15 +112,15 @@ 
         }
 
         // evaluates which global variables have to be computed
-        $varName       = '$dwoo.foreach.' . trim($name, '"\'') . '.';
-        $shortVarName  = '$.foreach.' . trim($name, '"\'') . '.';
+        $varName       = '$dwoo.foreach.'.trim($name, '"\'').'.';
+        $shortVarName  = '$.foreach.'.trim($name, '"\'').'.';
         $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
-        $usesIndex     = $usesFirst || strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
-        $usesIteration = $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
+        $usesFirst     = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
+        $usesLast      = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
+        $usesIndex     = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
+        $usesIteration = $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
+        $usesShow      = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
+        $usesTotal     = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
 
         if (strpos($name, '$this->scope[') !== false) {
             $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
@@ -136,66 +136,66 @@ 
         }
 
         // gets foreach id
-        $cnt = self::$cnt ++;
+        $cnt = self::$cnt++;
 
         // build pre content output
-        $pre = Compiler::PHP_OPEN . "\n" . '$_fh' . $cnt . '_data = ' . $src . ';';
+        $pre = Compiler::PHP_OPEN."\n".'$_fh'.$cnt.'_data = '.$src.';';
         // adds foreach properties
         if ($usesAny) {
-            $pre .= "\n" . '$this->globals["foreach"][' . $name . '] = array' . "\n(";
+            $pre .= "\n".'$this->globals["foreach"]['.$name.'] = array'."\n(";
             if ($usesIndex) {
-                $pre .= "\n\t" . '"index"		=> 0,';
+                $pre .= "\n\t".'"index"		=> 0,';
             }
             if ($usesIteration) {
-                $pre .= "\n\t" . '"iteration"		=> 1,';
+                $pre .= "\n\t".'"iteration"		=> 1,';
             }
             if ($usesFirst) {
-                $pre .= "\n\t" . '"first"		=> null,';
+                $pre .= "\n\t".'"first"		=> null,';
             }
             if ($usesLast) {
-                $pre .= "\n\t" . '"last"		=> null,';
+                $pre .= "\n\t".'"last"		=> null,';
             }
             if ($usesShow) {
-                $pre .= "\n\t" . '"show"		=> $this->isArray($_fh' . $cnt . '_data, true),';
+                $pre .= "\n\t".'"show"		=> $this->isArray($_fh'.$cnt.'_data, true),';
             }
             if ($usesTotal) {
-                $pre .= "\n\t" . '"total"		=> $this->count($_fh' . $cnt . '_data),';
+                $pre .= "\n\t".'"total"		=> $this->count($_fh'.$cnt.'_data),';
             }
-            $pre .= "\n);\n" . '$_fh' . $cnt . '_glob =& $this->globals["foreach"][' . $name . '];';
+            $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{";
+        $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);';
+            $pre .= "\n\t\t".'$_fh'.$cnt.'_glob["first"] = (string) ($_fh'.$cnt.'_glob["index"] === 0);';
         }
         if ($usesLast) {
-            $pre .= "\n\t\t" . '$_fh' . $cnt . '_glob["last"] = (string) ($_fh' . $cnt . '_glob["iteration"] === $_fh' . $cnt . '_glob["total"]);';
+            $pre .= "\n\t\t".'$_fh'.$cnt.'_glob["last"] = (string) ($_fh'.$cnt.'_glob["iteration"] === $_fh'.$cnt.'_glob["total"]);';
         }
-        $pre .= "\n/* -- foreach start output */\n" . Compiler::PHP_CLOSE;
+        $pre .= "\n/* -- foreach start output */\n".Compiler::PHP_CLOSE;
 
         // build post content output
-        $post = Compiler::PHP_OPEN . "\n";
+        $post = Compiler::PHP_OPEN."\n";
 
         if (isset($implode)) {
-            $post .= '/* -- implode */' . "\n" . 'if (!$_fh' . $cnt . '_glob["last"]) {' . "\n\t" . 'echo ' . $implode . ";\n}\n";
+            $post .= '/* -- implode */'."\n".'if (!$_fh'.$cnt.'_glob["last"]) {'."\n\t".'echo '.$implode.";\n}\n";
         }
         $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}" . Compiler::PHP_CLOSE;
+        $post .= "\n\t}\n}".Compiler::PHP_CLOSE;
         if (isset($params['hasElse'])) {
             $post .= $params['hasElse'];
         }
 
-        return $pre . $content . $post;
+        return $pre.$content.$post;
     }
 }

lib/Dwoo/Plugins/Blocks/PluginTemplate.php

Spacing +6 added lines, -6 removed lines

@@ -83,25 +83,25 @@
     public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
     {
         $paramstr = 'Dwoo\Core $dwoo';
-        $init     = 'static $_callCnt = 0;' . "\n" . '$dwoo->scope[\' ' . $params['uuid'] . '\'.$_callCnt] = array();' . "\n" . '$_scope = $dwoo->setScope(array(\' ' . $params['uuid'] . '\'.($_callCnt++)));' . "\n";
+        $init     = 'static $_callCnt = 0;'."\n".'$dwoo->scope[\' '.$params['uuid'].'\'.$_callCnt] = array();'."\n".'$_scope = $dwoo->setScope(array(\' '.$params['uuid'].'\'.($_callCnt++)));'."\n";
         $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";
+            $init .= '$dwoo->scope[\''.$param.'\'] = $'.$param.";\n";
         }
         $init .= '/* -- template start output */';
 
-        $funcName = 'Plugin' . Core::toCamelCase($params['name']) . Core::toCamelCase($params['uuid']);
+        $funcName = 'Plugin'.Core::toCamelCase($params['name']).Core::toCamelCase($params['uuid']);
 
         $search      = array('$this->charset', '$this->', '$this,',);
         $replacement = array('$dwoo->getCharset()', '$dwoo->', '$dwoo,',);
         $content     = str_replace($search, $replacement, $content);
 
-        $body = 'if (!function_exists(\'' . $funcName . "')) {\nfunction " . $funcName . '(' . $paramstr . ') {' . "\n$init" . Compiler::PHP_CLOSE . $prepend . $content . $append . Compiler::PHP_OPEN . $cleanup . "\n}\n}";
+        $body = 'if (!function_exists(\''.$funcName."')) {\nfunction ".$funcName.'('.$paramstr.') {'."\n$init".Compiler::PHP_CLOSE.$prepend.$content.$append.Compiler::PHP_OPEN.$cleanup."\n}\n}";
         $compiler->addTemplatePlugin($params['name'], $params['*'], $params['uuid'], $body);
     }
 

lib/Dwoo/Plugins/Blocks/PluginWith.php

Spacing +3 added lines, -3 removed lines

@@ -86,14 +86,14 @@
 
         $compiler->setScope($rparams['var']);
 
-        $pre = Compiler::PHP_OPEN . 'if (' . $cparams['var'] . ')' . "\n{\n" . '$_with' . (self::$cnt) . ' = $this->setScope("' . $rparams['var'] . '");' . "\n/* -- start with output */\n" . Compiler::PHP_CLOSE;
+        $pre = Compiler::PHP_OPEN.'if ('.$cparams['var'].')'."\n{\n".'$_with'.(self::$cnt).' = $this->setScope("'.$rparams['var'].'");'."\n/* -- start with output */\n".Compiler::PHP_CLOSE;
 
-        $post = Compiler::PHP_OPEN . "\n/* -- end with output */\n" . '$this->setScope($_with' . (self::$cnt ++) . ', true);' . "\n}\n" . Compiler::PHP_CLOSE;
+        $post = Compiler::PHP_OPEN."\n/* -- end with output */\n".'$this->setScope($_with'.(self::$cnt++).', true);'."\n}\n".Compiler::PHP_CLOSE;
 
         if (isset($params['hasElse'])) {
             $post .= $params['hasElse'];
         }
 
-        return $pre . $content . $post;
+        return $pre.$content.$post;
     }
 }

lib/Dwoo/Plugins/Blocks/PluginA.php

Spacing +5 added lines, -5 removed lines

@@ -60,9 +60,9 @@ 
     {
         $p = $compiler->getCompiledParams($params);
 
-        $out = Compiler::PHP_OPEN . 'echo \'<a ' . self::paramsToAttributes($p, "'", $compiler);
+        $out = Compiler::PHP_OPEN.'echo \'<a '.self::paramsToAttributes($p, "'", $compiler);
 
-        return $out . '>\';' . Compiler::PHP_CLOSE;
+        return $out.'>\';'.Compiler::PHP_CLOSE;
     }
 
     /**
@@ -82,14 +82,14 @@ 
         if ($content == '') {
             // merge </a> into the href if href is a string
             if (substr($p['href'], - 1) === '"' || substr($p['href'], - 1) === '\'') {
-                return Compiler::PHP_OPEN . 'echo ' . substr($p['href'], 0, - 1) . '</a>' . substr($p['href'], - 1) . ';' . Compiler::PHP_CLOSE;
+                return Compiler::PHP_OPEN.'echo '.substr($p['href'], 0, - 1).'</a>'.substr($p['href'], - 1).';'.Compiler::PHP_CLOSE;
             }
 
             // otherwise append
-            return Compiler::PHP_OPEN . 'echo ' . $p['href'] . '.\'</a>\';' . Compiler::PHP_CLOSE;
+            return Compiler::PHP_OPEN.'echo '.$p['href'].'.\'</a>\';'.Compiler::PHP_CLOSE;
         }
 
         // return content
-        return $content . '</a>';
+        return $content.'</a>';
     }
 }

lib/Dwoo/Plugins/Blocks/PluginLoop.php

Spacing +28 added lines, -28 removed lines

@@ -95,76 +95,76 @@
         $name = $params['name'];
 
         // evaluates which global variables have to be computed
-        $varName       = '$dwoo.loop.' . trim($name, '"\'') . '.';
-        $shortVarName  = '$.loop.' . trim($name, '"\'') . '.';
+        $varName       = '$dwoo.loop.'.trim($name, '"\'').'.';
+        $shortVarName  = '$.loop.'.trim($name, '"\'').'.';
         $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
-        $usesIndex     = $usesFirst || strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
-        $usesIteration = $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
+        $usesFirst     = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
+        $usesLast      = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
+        $usesIndex     = $usesFirst || strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
+        $usesIteration = $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
+        $usesShow      = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
+        $usesTotal     = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
 
         if (strpos($name, '$this->scope[') !== false) {
             $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
         }
 
         // gets foreach id
-        $cnt = self::$cnt ++;
+        $cnt = self::$cnt++;
 
         // builds pre processing output
-        $pre = Compiler::PHP_OPEN . "\n" . '$_loop' . $cnt . '_data = ' . $src . ';';
+        $pre = Compiler::PHP_OPEN."\n".'$_loop'.$cnt.'_data = '.$src.';';
         // adds foreach properties
         if ($usesAny) {
-            $pre .= "\n" . '$this->globals["loop"][' . $name . '] = array' . "\n(";
+            $pre .= "\n".'$this->globals["loop"]['.$name.'] = array'."\n(";
             if ($usesIndex) {
-                $pre .= "\n\t" . '"index"		=> 0,';
+                $pre .= "\n\t".'"index"		=> 0,';
             }
             if ($usesIteration) {
-                $pre .= "\n\t" . '"iteration"		=> 1,';
+                $pre .= "\n\t".'"iteration"		=> 1,';
             }
             if ($usesFirst) {
-                $pre .= "\n\t" . '"first"		=> null,';
+                $pre .= "\n\t".'"first"		=> null,';
             }
             if ($usesLast) {
-                $pre .= "\n\t" . '"last"		=> null,';
+                $pre .= "\n\t".'"last"		=> null,';
             }
             if ($usesShow) {
-                $pre .= "\n\t" . '"show"		=> $this->isTraversable($_loop' . $cnt . '_data, true),';
+                $pre .= "\n\t".'"show"		=> $this->isTraversable($_loop'.$cnt.'_data, true),';
             }
             if ($usesTotal) {
-                $pre .= "\n\t" . '"total"		=> $this->count($_loop' . $cnt . '_data),';
+                $pre .= "\n\t".'"total"		=> $this->count($_loop'.$cnt.'_data),';
             }
-            $pre .= "\n);\n" . '$_loop' . $cnt . '_glob =& $this->globals["loop"][' . $name . '];';
+            $pre .= "\n);\n".'$_loop'.$cnt.'_glob =& $this->globals["loop"]['.$name.'];';
         }
         // checks if the loop must be looped
-        $pre .= "\n" . 'if ($this->isTraversable($_loop' . $cnt . '_data' . (isset($params['hasElse']) ? ', true' : '') . ') == true)' . "\n{";
+        $pre .= "\n".'if ($this->isTraversable($_loop'.$cnt.'_data'.(isset($params['hasElse']) ? ', true' : '').') == true)'."\n{";
         // iterates over keys
-        $pre .= "\n\t" . 'foreach ($_loop' . $cnt . '_data as $tmp_key => $this->scope["-loop-"])' . "\n\t{";
+        $pre .= "\n\t".'foreach ($_loop'.$cnt.'_data as $tmp_key => $this->scope["-loop-"])'."\n\t{";
         // updates properties
         if ($usesFirst) {
-            $pre .= "\n\t\t" . '$_loop' . $cnt . '_glob["first"] = (string) ($_loop' . $cnt . '_glob["index"] === 0);';
+            $pre .= "\n\t\t".'$_loop'.$cnt.'_glob["first"] = (string) ($_loop'.$cnt.'_glob["index"] === 0);';
         }
         if ($usesLast) {
-            $pre .= "\n\t\t" . '$_loop' . $cnt . '_glob["last"] = (string) ($_loop' . $cnt . '_glob["iteration"] === $_loop' . $cnt . '_glob["total"]);';
+            $pre .= "\n\t\t".'$_loop'.$cnt.'_glob["last"] = (string) ($_loop'.$cnt.'_glob["iteration"] === $_loop'.$cnt.'_glob["total"]);';
         }
-        $pre .= "\n\t\t" . '$_loop' . $cnt . '_scope = $this->setScope(array("-loop-"));' . "\n/* -- loop start output */\n" . Compiler::PHP_CLOSE;
+        $pre .= "\n\t\t".'$_loop'.$cnt.'_scope = $this->setScope(array("-loop-"));'."\n/* -- loop start output */\n".Compiler::PHP_CLOSE;
 
         // build post processing output and cache it
-        $post = Compiler::PHP_OPEN . "\n" . '/* -- loop end output */' . "\n\t\t" . '$this->setScope($_loop' . $cnt . '_scope, true);';
+        $post = Compiler::PHP_OPEN."\n".'/* -- loop end output */'."\n\t\t".'$this->setScope($_loop'.$cnt.'_scope, true);';
         // update properties
         if ($usesIndex) {
-            $post .= "\n\t\t" . '$_loop' . $cnt . '_glob["index"]+=1;';
+            $post .= "\n\t\t".'$_loop'.$cnt.'_glob["index"]+=1;';
         }
         if ($usesIteration) {
-            $post .= "\n\t\t" . '$_loop' . $cnt . '_glob["iteration"]+=1;';
+            $post .= "\n\t\t".'$_loop'.$cnt.'_glob["iteration"]+=1;';
         }
         // end loop
-        $post .= "\n\t}\n}\n" . Compiler::PHP_CLOSE;
+        $post .= "\n\t}\n}\n".Compiler::PHP_CLOSE;
         if (isset($params['hasElse'])) {
             $post .= $params['hasElse'];
         }
 
-        return $pre . $content . $post;
+        return $pre.$content.$post;
     }
 }

lib/Dwoo/Plugins/Blocks/PluginAutoEscape.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
     public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
     {
         $params = $compiler->getCompiledParams($params);
-        switch (strtolower(trim((string)$params['enabled'], '"\''))) {
+        switch (strtolower(trim((string) $params['enabled'], '"\''))) {
 
             case 'on':
             case 'true':
@@ -71,7 +71,7 @@ 
                 $enable = false;
                 break;
             default:
-                throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter (' . $params['enabled'] . '), valid parameters are "enable"/true or "disable"/false');
+                throw new CompilationException($compiler, 'Auto_Escape : Invalid parameter ('.$params['enabled'].'), valid parameters are "enable"/true or "disable"/false');
         }
 
         self::$stack[] = $compiler->getAutoEscape();

lib/Dwoo/Plugins/Blocks/PluginSection.php

Spacing +29 added lines, -29 removed lines

@@ -79,44 +79,44 @@ 
         $show  = $params['show'];
 
         // gets unique id
-        $cnt = self::$cnt ++;
+        $cnt = self::$cnt++;
 
-        $output .= '$this->globals[\'section\'][' . $name . '] = array();' . "\n" . '$_section' . $cnt . ' =& $this->globals[\'section\'][' . $name . '];' . "\n";
+        $output .= '$this->globals[\'section\']['.$name.'] = array();'."\n".'$_section'.$cnt.' =& $this->globals[\'section\']['.$name.'];'."\n";
 
         if ($loop !== 'null') {
-            $output .= '$_section' . $cnt . '[\'loop\'] = is_array($tmp = ' . $loop . ') ? count($tmp) : max(0, (int) $tmp);' . "\n";
+            $output .= '$_section'.$cnt.'[\'loop\'] = is_array($tmp = '.$loop.') ? count($tmp) : max(0, (int) $tmp);'."\n";
         } else {
-            $output .= '$_section' . $cnt . '[\'loop\'] = 1;' . "\n";
+            $output .= '$_section'.$cnt.'[\'loop\'] = 1;'."\n";
         }
 
         if ($show !== 'null') {
-            $output .= '$_section' . $cnt . '[\'show\'] = ' . $show . ";\n";
+            $output .= '$_section'.$cnt.'[\'show\'] = '.$show.";\n";
         } else {
-            $output .= '$_section' . $cnt . '[\'show\'] = true;' . "\n";
+            $output .= '$_section'.$cnt.'[\'show\'] = true;'."\n";
         }
 
         if ($name !== 'null') {
-            $output .= '$_section' . $cnt . '[\'name\'] = ' . $name . ";\n";
+            $output .= '$_section'.$cnt.'[\'name\'] = '.$name.";\n";
         } else {
-            $output .= '$_section' . $cnt . '[\'name\'] = true;' . "\n";
+            $output .= '$_section'.$cnt.'[\'name\'] = true;'."\n";
         }
 
         if ($max !== 'null') {
-            $output .= '$_section' . $cnt . '[\'max\'] = (int)' . $max . ";\n" . 'if($_section' . $cnt . '[\'max\'] < 0) { $_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\']; }' . "\n";
+            $output .= '$_section'.$cnt.'[\'max\'] = (int)'.$max.";\n".'if($_section'.$cnt.'[\'max\'] < 0) { $_section'.$cnt.'[\'max\'] = $_section'.$cnt.'[\'loop\']; }'."\n";
         } else {
-            $output .= '$_section' . $cnt . '[\'max\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
+            $output .= '$_section'.$cnt.'[\'max\'] = $_section'.$cnt.'[\'loop\'];'."\n";
         }
 
         if ($step !== 'null') {
-            $output .= '$_section' . $cnt . '[\'step\'] = (int)' . $step . ' == 0 ? 1 : (int) ' . $step . ";\n";
+            $output .= '$_section'.$cnt.'[\'step\'] = (int)'.$step.' == 0 ? 1 : (int) '.$step.";\n";
         } else {
-            $output .= '$_section' . $cnt . '[\'step\'] = 1;' . "\n";
+            $output .= '$_section'.$cnt.'[\'step\'] = 1;'."\n";
         }
 
         if ($start !== 'null') {
-            $output .= '$_section' . $cnt . '[\'start\'] = (int)' . $start . ";\n";
+            $output .= '$_section'.$cnt.'[\'start\'] = (int)'.$start.";\n";
         } else {
-            $output .= '$_section' . $cnt . '[\'start\'] = $_section' . $cnt . '[\'step\'] > 0 ? 0 : $_section' . $cnt . '[\'loop\'] - 1;' . "\n" . 'if ($_section' . $cnt . '[\'start\'] < 0) { $_section' . $cnt . '[\'start\'] = max($_section' . $cnt . '[\'step\'] > 0 ? 0 : -1, $_section' . $cnt . '[\'loop\'] + $_section' . $cnt . '[\'start\']); } ' . "\n" . 'else { $_section' . $cnt . '[\'start\'] = min($_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] : $_section' . $cnt . '[\'loop\'] -1); }' . "\n";
+            $output .= '$_section'.$cnt.'[\'start\'] = $_section'.$cnt.'[\'step\'] > 0 ? 0 : $_section'.$cnt.'[\'loop\'] - 1;'."\n".'if ($_section'.$cnt.'[\'start\'] < 0) { $_section'.$cnt.'[\'start\'] = max($_section'.$cnt.'[\'step\'] > 0 ? 0 : -1, $_section'.$cnt.'[\'loop\'] + $_section'.$cnt.'[\'start\']); } '."\n".'else { $_section'.$cnt.'[\'start\'] = min($_section'.$cnt.'[\'start\'], $_section'.$cnt.'[\'step\'] > 0 ? $_section'.$cnt.'[\'loop\'] : $_section'.$cnt.'[\'loop\'] -1); }'."\n";
         }
 
         /*		if ($usesAny) {
@@ -131,24 +131,24 @@ 
                 }
         */
 
-        $output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
+        $output .= 'if ($_section'.$cnt.'[\'show\']) {'."\n";
         if ($start === 'null' && $step === 'null' && $max === 'null') {
-            $output .= '	$_section' . $cnt . '[\'total\'] = $_section' . $cnt . '[\'loop\'];' . "\n";
+            $output .= '	$_section'.$cnt.'[\'total\'] = $_section'.$cnt.'[\'loop\'];'."\n";
         } else {
-            $output .= '	$_section' . $cnt . '[\'total\'] = min(ceil(($_section' . $cnt . '[\'step\'] > 0 ? $_section' . $cnt . '[\'loop\'] - $_section' . $cnt . '[\'start\'] : $_section' . $cnt . '[\'start\'] + 1) / abs($_section' . $cnt . '[\'step\'])), $_section' . $cnt . '[\'max\']);' . "\n";
+            $output .= '	$_section'.$cnt.'[\'total\'] = min(ceil(($_section'.$cnt.'[\'step\'] > 0 ? $_section'.$cnt.'[\'loop\'] - $_section'.$cnt.'[\'start\'] : $_section'.$cnt.'[\'start\'] + 1) / abs($_section'.$cnt.'[\'step\'])), $_section'.$cnt.'[\'max\']);'."\n";
         }
-        $output .= '	if ($_section' . $cnt . '[\'total\'] == 0) {' . "\n" . '		$_section' . $cnt . '[\'show\'] = false;' . "\n" . '	}' . "\n" . '} else {' . "\n" . '	$_section' . $cnt . '[\'total\'] = 0;' . "\n}\n";
-        $output .= 'if ($_section' . $cnt . '[\'show\']) {' . "\n";
-        $output .= "\t" . 'for ($this->scope[' . $name . '] = $_section' . $cnt . '[\'start\'], $_section' . $cnt . '[\'iteration\'] = 1; ' . '$_section' . $cnt . '[\'iteration\'] <= $_section' . $cnt . '[\'total\']; ' . '$this->scope[' . $name . '] += $_section' . $cnt . '[\'step\'], $_section' . $cnt . '[\'iteration\']++) {' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'rownum\'] = $_section' . $cnt . '[\'iteration\'];' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'index_prev\'] = $this->scope[' . $name . '] - $_section' . $cnt . '[\'step\'];' . "\n";
-        $output .= "\t\t" . '$_section' . $cnt . '[\'index_next\'] = $this->scope[' . $name . '] + $_section' . $cnt . '[\'step\'];' . "\n";
-        $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 .= Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN;
-
-        $output .= "\n\t}\n} " . Compiler::PHP_CLOSE;
+        $output .= '	if ($_section'.$cnt.'[\'total\'] == 0) {'."\n".'		$_section'.$cnt.'[\'show\'] = false;'."\n".'	}'."\n".'} else {'."\n".'	$_section'.$cnt.'[\'total\'] = 0;'."\n}\n";
+        $output .= 'if ($_section'.$cnt.'[\'show\']) {'."\n";
+        $output .= "\t".'for ($this->scope['.$name.'] = $_section'.$cnt.'[\'start\'], $_section'.$cnt.'[\'iteration\'] = 1; '.'$_section'.$cnt.'[\'iteration\'] <= $_section'.$cnt.'[\'total\']; '.'$this->scope['.$name.'] += $_section'.$cnt.'[\'step\'], $_section'.$cnt.'[\'iteration\']++) {'."\n";
+        $output .= "\t\t".'$_section'.$cnt.'[\'rownum\'] = $_section'.$cnt.'[\'iteration\'];'."\n";
+        $output .= "\t\t".'$_section'.$cnt.'[\'index_prev\'] = $this->scope['.$name.'] - $_section'.$cnt.'[\'step\'];'."\n";
+        $output .= "\t\t".'$_section'.$cnt.'[\'index_next\'] = $this->scope['.$name.'] + $_section'.$cnt.'[\'step\'];'."\n";
+        $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 .= Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN;
+
+        $output .= "\n\t}\n} ".Compiler::PHP_CLOSE;
 
         if (isset($params['hasElse'])) {
             $output .= $params['hasElse'];

lib/Dwoo/Plugins/Blocks/PluginFor.php

Spacing +37 added lines, -37 removed lines

@@ -87,54 +87,54 @@ 
         $to   = $params['to'];
 
         // evaluates which global variables have to be computed
-        $varName       = '$dwoo.for.' . trim($name, '"\'') . '.';
-        $shortVarName  = '$.for.' . trim($name, '"\'') . '.';
+        $varName       = '$dwoo.for.'.trim($name, '"\'').'.';
+        $shortVarName  = '$.for.'.trim($name, '"\'').'.';
         $usesAny       = strpos($tpl, $varName) !== false || strpos($tpl, $shortVarName) !== false;
-        $usesFirst     = strpos($tpl, $varName . 'first') !== false || strpos($tpl, $shortVarName . 'first') !== false;
-        $usesLast      = strpos($tpl, $varName . 'last') !== false || strpos($tpl, $shortVarName . 'last') !== false;
-        $usesIndex     = strpos($tpl, $varName . 'index') !== false || strpos($tpl, $shortVarName . 'index') !== false;
-        $usesIteration = $usesFirst || $usesLast || strpos($tpl, $varName . 'iteration') !== false || strpos($tpl, $shortVarName . 'iteration') !== false;
-        $usesShow      = strpos($tpl, $varName . 'show') !== false || strpos($tpl, $shortVarName . 'show') !== false;
-        $usesTotal     = $usesLast || strpos($tpl, $varName . 'total') !== false || strpos($tpl, $shortVarName . 'total') !== false;
+        $usesFirst     = strpos($tpl, $varName.'first') !== false || strpos($tpl, $shortVarName.'first') !== false;
+        $usesLast      = strpos($tpl, $varName.'last') !== false || strpos($tpl, $shortVarName.'last') !== false;
+        $usesIndex     = strpos($tpl, $varName.'index') !== false || strpos($tpl, $shortVarName.'index') !== false;
+        $usesIteration = $usesFirst || $usesLast || strpos($tpl, $varName.'iteration') !== false || strpos($tpl, $shortVarName.'iteration') !== false;
+        $usesShow      = strpos($tpl, $varName.'show') !== false || strpos($tpl, $shortVarName.'show') !== false;
+        $usesTotal     = $usesLast || strpos($tpl, $varName.'total') !== false || strpos($tpl, $shortVarName.'total') !== false;
 
         if (strpos($name, '$this->scope[') !== false) {
             $usesAny = $usesFirst = $usesLast = $usesIndex = $usesIteration = $usesShow = $usesTotal = true;
         }
 
         // gets foreach id
-        $cnt = self::$cnt ++;
+        $cnt = self::$cnt++;
 
         // builds pre processing output for
-        $out = 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>\'); }' . "\n" . '$tmp_shows = $this->isArray($_for' . $cnt . '_from, true) || (is_numeric($_for' . $cnt . '_from) && (abs(($_for' . $cnt . '_from - $_for' . $cnt . '_to)/$_for' . $cnt . '_step) !== 0 || $_for' . $cnt . '_from == $_for' . $cnt . '_to));';
+        $out = 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>\'); }'."\n".'$tmp_shows = $this->isArray($_for'.$cnt.'_from, true) || (is_numeric($_for'.$cnt.'_from) && (abs(($_for'.$cnt.'_from - $_for'.$cnt.'_to)/$_for'.$cnt.'_step) !== 0 || $_for'.$cnt.'_from == $_for'.$cnt.'_to));';
         // adds for properties
         if ($usesAny) {
-            $out .= "\n" . '$this->globals["for"][' . $name . '] = array' . "\n(";
+            $out .= "\n".'$this->globals["for"]['.$name.'] = array'."\n(";
             if ($usesIndex) {
-                $out .= "\n\t" . '"index"		=> 0,';
+                $out .= "\n\t".'"index"		=> 0,';
             }
             if ($usesIteration) {
-                $out .= "\n\t" . '"iteration"		=> 1,';
+                $out .= "\n\t".'"iteration"		=> 1,';
             }
             if ($usesFirst) {
-                $out .= "\n\t" . '"first"		=> null,';
+                $out .= "\n\t".'"first"		=> null,';
             }
             if ($usesLast) {
-                $out .= "\n\t" . '"last"		=> null,';
+                $out .= "\n\t".'"last"		=> null,';
             }
             if ($usesShow) {
-                $out .= "\n\t" . '"show"		=> $tmp_shows,';
+                $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\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 . '];';
+            $out .= "\n);\n".'$_for'.$cnt.'_glob =& $this->globals["for"]['.$name.'];';
         }
         // checks if for must be looped
-        $out .= "\n" . 'if ($tmp_shows)' . "\n{";
+        $out .= "\n".'if ($tmp_shows)'."\n{";
         // set from/to to correct values if an array was given
-        $out .= "\n\t" . 'if ($this->isArray($_for' . $cnt . '_from' . (isset($params['hasElse']) ? ', true' : '') . ') == true) {
-		$_for' . $cnt . '_to = is_numeric($_for' . $cnt . '_to) ? $_for' . $cnt . '_to - $_for' . $cnt . '_step : $this->count($_for' . $cnt . '_from) - 1;
-		$_for' . $cnt . '_from = 0;
+        $out .= "\n\t".'if ($this->isArray($_for'.$cnt.'_from'.(isset($params['hasElse']) ? ', true' : '').') == true) {
+		$_for' . $cnt.'_to = is_numeric($_for'.$cnt.'_to) ? $_for'.$cnt.'_to - $_for'.$cnt.'_step : $this->count($_for'.$cnt.'_from) - 1;
+		$_for' . $cnt.'_from = 0;
 	}';
 
         // if input are pure numbers it shouldn't reorder them, if it's variables it gets too messy though so in that case a counter should be used
@@ -143,8 +143,8 @@ 
         $incrementer = '+';
 
         if (preg_match('{^(["\']?)([0-9]+)\1$}', $from, $mN1) && preg_match('{^(["\']?)([0-9]+)\1$}', $to, $mN2)) {
-            $from = (int)$mN1[2];
-            $to   = (int)$mN2[2];
+            $from = (int) $mN1[2];
+            $to   = (int) $mN2[2];
             if ($from > $to) {
                 $reverse     = true;
                 $condition   = '>=';
@@ -154,39 +154,39 @@ 
 
         // reverse from and to if needed
         if (!$reverse) {
-            $out .= "\n\t" . 'if ($_for' . $cnt . '_from > $_for' . $cnt . '_to) {
-				$tmp = $_for' . $cnt . '_from;
-				$_for' . $cnt . '_from = $_for' . $cnt . '_to;
-				$_for' . $cnt . '_to = $tmp;
+            $out .= "\n\t".'if ($_for'.$cnt.'_from > $_for'.$cnt.'_to) {
+				$tmp = $_for' . $cnt.'_from;
+				$_for' . $cnt.'_from = $_for'.$cnt.'_to;
+				$_for' . $cnt.'_to = $tmp;
 			}';
         }
 
-        $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{";
+        $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);';
+            $out .= "\n\t\t".'$_for'.$cnt.'_glob["first"] = (string) ($_for'.$cnt.'_glob["iteration"] === 1);';
         }
         if ($usesLast) {
-            $out .= "\n\t\t" . '$_for' . $cnt . '_glob["last"] = (string) ($_for' . $cnt . '_glob["iteration"] === $_for' . $cnt . '_glob["total"]);';
+            $out .= "\n\t\t".'$_for'.$cnt.'_glob["last"] = (string) ($_for'.$cnt.'_glob["iteration"] === $_for'.$cnt.'_glob["total"]);';
         }
-        $out .= "\n/* -- for start output */\n" . Compiler::PHP_CLOSE;
+        $out .= "\n/* -- for start output */\n".Compiler::PHP_CLOSE;
 
         // build post processing output and cache it
-        $postOut = Compiler::PHP_OPEN . '/* -- for end output */';
+        $postOut = Compiler::PHP_OPEN.'/* -- for end output */';
         // update properties
         if ($usesIteration) {
-            $postOut .= "\n\t\t" . '$_for' . $cnt . '_glob["iteration"]+=1;';
+            $postOut .= "\n\t\t".'$_for'.$cnt.'_glob["iteration"]+=1;';
         }
         // end loop
-        $postOut .= "\n\t}\n}\n" . Compiler::PHP_CLOSE;
+        $postOut .= "\n\t}\n}\n".Compiler::PHP_CLOSE;
 
         if (isset($params['hasElse'])) {
             $postOut .= $params['hasElse'];
         }
 
-        return $out . $content . $postOut;
+        return $out.$content.$postOut;
     }
 }