dwoo-project / dwoo

lib/Dwoo/Plugins/Blocks/PluginSmartyinterface.php

Spacing +8 added lines, -8 removed lines

@@ -58,26 +58,26 @@ 
             $callback      = $customPlugins[$func]['callback'];
             if (is_array($callback)) {
                 if (is_object($callback[0])) {
-                    $callback = '$this->customPlugins[\'' . $func . '\'][0]->' . $callback[1] . '(';
+                    $callback = '$this->customPlugins[\''.$func.'\'][0]->'.$callback[1].'(';
                 } else {
-                    $callback = '' . $callback[0] . '::' . $callback[1] . '(';
+                    $callback = ''.$callback[0].'::'.$callback[1].'(';
                 }
             } else {
-                $callback = $callback . '(';
+                $callback = $callback.'(';
             }
         } else {
-            $callback = 'smarty_block_' . $func . '(';
+            $callback = 'smarty_block_'.$func.'(';
         }
 
         $paramsOut = '';
         foreach ($params as $i => $p) {
-            $paramsOut .= var_export($i, true) . ' => ' . $p . ',';
+            $paramsOut .= var_export($i, true).' => '.$p.',';
         }
 
         $curBlock                      = &$compiler->getCurrentBlock();
-        $curBlock['params']['postOut'] = 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);' . Compiler::PHP_CLOSE;
+        $curBlock['params']['postOut'] = 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);'.Compiler::PHP_CLOSE;
 
-        return 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();' . Compiler::PHP_CLOSE;
+        return 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();'.Compiler::PHP_CLOSE;
     }
 
     /**
@@ -91,6 +91,6 @@ 
      */
     public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
     {
-        return $content . $params['postOut'];
+        return $content.$params['postOut'];
     }
 }

lib/Dwoo/Plugins/Blocks/PluginDynamic.php

Spacing +6 added lines, -6 removed lines

@@ -67,18 +67,18 @@ 
         }
         catch (CompilationException $e) {
         }
-        $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t";
+        $output = Compiler::PHP_OPEN.'if($doCache) {'."\n\t".'echo \'<dwoo:dynamic_\'.$dynamicId.\'>'.str_replace('\'', '\\\'', $content).'</dwoo:dynamic_\'.$dynamicId.\'>\';'."\n} else {\n\t";
         if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) {
             $output .= substr($content, strlen(Compiler::PHP_OPEN));
         } else {
-            $output .= Compiler::PHP_CLOSE . $content;
+            $output .= Compiler::PHP_CLOSE.$content;
         }
         if (substr($output, - strlen(Compiler::PHP_CLOSE)) == Compiler::PHP_CLOSE) {
             $output = substr($output, 0, - strlen(Compiler::PHP_CLOSE));
         } else {
             $output .= Compiler::PHP_OPEN;
         }
-        $output .= "\n}" . Compiler::PHP_CLOSE;
+        $output .= "\n}".Compiler::PHP_CLOSE;
 
         return $output;
     }
@@ -92,13 +92,13 @@ 
      */
     public static function unescape($output, $dynamicId, $compiledFile)
     {
-        $output = preg_replace_callback('/<dwoo:dynamic_(' . $dynamicId . ')>(.+?)<\/dwoo:dynamic_' . $dynamicId . '>/s', array(
+        $output = preg_replace_callback('/<dwoo:dynamic_('.$dynamicId.')>(.+?)<\/dwoo:dynamic_'.$dynamicId.'>/s', array(
             'self',
             'unescapePhp'
         ), $output, - 1, $count);
         // re-add the includes on top of the file
         if ($count && preg_match('#/\* template head \*/(.+?)/\* end template head \*/#s', file_get_contents($compiledFile), $m)) {
-            $output = '<?php ' . $m[1] . ' ?>' . $output;
+            $output = '<?php '.$m[1].' ?>'.$output;
         }
 
         return $output;
@@ -111,6 +111,6 @@ 
      */
     public static function unescapePhp($match)
     {
-        return preg_replace('{<\?php /\*' . $match[1] . '\*/ echo \'(.+?)\'; \?>}s', '$1', $match[2]);
+        return preg_replace('{<\?php /\*'.$match[1].'\*/ echo \'(.+?)\'; \?>}s', '$1', $match[2]);
     }
 }

lib/Dwoo/Plugins/Blocks/PluginTextformat.php

Spacing +10 added lines, -10 removed lines

@@ -72,13 +72,13 @@ 
                 break;
         }
 
-        $this->wrap     = (int)$wrap;
-        $this->wrapChar = (string)$wrap_char;
-        $this->wrapCut  = (bool)$wrap_cut;
-        $this->indent   = (int)$indent;
-        $this->indChar  = (string)$indent_char;
-        $this->indFirst = (int)$indent_first + $this->indent;
-        $this->assign   = (string)$assign;
+        $this->wrap     = (int) $wrap;
+        $this->wrapChar = (string) $wrap_char;
+        $this->wrapCut  = (bool) $wrap_cut;
+        $this->indent   = (int) $indent;
+        $this->indChar  = (string) $indent_char;
+        $this->indFirst = (int) $indent_first+$this->indent;
+        $this->assign   = (string) $assign;
     }
 
     /**
@@ -107,13 +107,13 @@ 
             ), str_replace("\n", '', $pgs[$i]));
 
             // wordwraps + indents lines
-            $pgs[$i] = str_repeat($this->indChar, $this->indFirst) . wordwrap($pgs[$i], max($this->wrap - $this->indent, 1), $this->wrapChar . str_repeat($this->indChar, $this->indent), $this->wrapCut);
+            $pgs[$i] = str_repeat($this->indChar, $this->indFirst).wordwrap($pgs[$i], max($this->wrap-$this->indent, 1), $this->wrapChar.str_repeat($this->indChar, $this->indent), $this->wrapCut);
         }
 
         if ($this->assign !== '') {
-            $this->core->assignInScope(implode($this->wrapChar . $this->wrapChar, $pgs), $this->assign);
+            $this->core->assignInScope(implode($this->wrapChar.$this->wrapChar, $pgs), $this->assign);
         } else {
-            return implode($this->wrapChar . $this->wrapChar, $pgs);
+            return implode($this->wrapChar.$this->wrapChar, $pgs);
         }
     }
 }

lib/Dwoo/Plugins/Blocks/PluginCapture.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
      */
     public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type)
     {
-        return Compiler::PHP_OPEN . $prepend . 'ob_start();' . $append . Compiler::PHP_CLOSE;
+        return Compiler::PHP_OPEN.$prepend.'ob_start();'.$append.Compiler::PHP_CLOSE;
     }
 
     /**
@@ -79,17 +79,17 @@ 
     {
         $params = $compiler->getCompiledParams($params);
 
-        $out = $content . Compiler::PHP_OPEN . $prepend . "\n" . '$tmp = ob_get_clean();';
+        $out = $content.Compiler::PHP_OPEN.$prepend."\n".'$tmp = ob_get_clean();';
         if ($params['trim'] !== 'false' && $params['trim'] !== 0) {
-            $out .= "\n" . '$tmp = trim($tmp);';
+            $out .= "\n".'$tmp = trim($tmp);';
         }
         if ($params['cat'] === 'true' || $params['cat'] === 1) {
-            $out .= "\n" . '$tmp = $this->readVar(\'dwoo.capture.\'.' . $params['name'] . ') . $tmp;';
+            $out .= "\n".'$tmp = $this->readVar(\'dwoo.capture.\'.'.$params['name'].') . $tmp;';
         }
         if ($params['assign'] !== 'null') {
-            $out .= "\n" . '$this->scope[' . $params['assign'] . '] = $tmp;';
+            $out .= "\n".'$this->scope['.$params['assign'].'] = $tmp;';
         }
 
-        return $out . "\n" . '$this->globals[\'capture\'][' . $params['name'] . '] = $tmp;' . $append . Compiler::PHP_CLOSE;
+        return $out."\n".'$this->globals[\'capture\']['.$params['name'].'] = $tmp;'.$append.Compiler::PHP_CLOSE;
     }
 }

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>';
     }
 }