dwoo-project / dwoo

lib/Dwoo/Compiler.php

Spacing +384 added lines, -386 removed lines

@@ -294,7 +294,7 @@ 
      */
     public function setNestedCommentsHandling($allow = true)
     {
-        $this->allowNestedComments = (bool)$allow;
+        $this->allowNestedComments = (bool) $allow;
     }
 
     /**
@@ -319,7 +319,7 @@ 
      */
     public function setLooseOpeningHandling($allow = false)
     {
-        $this->allowLooseOpenings = (bool)$allow;
+        $this->allowLooseOpenings = (bool) $allow;
     }
 
     /**
@@ -344,7 +344,7 @@ 
      */
     public function setAutoEscape($enabled)
     {
-        $this->autoEscape = (bool)$enabled;
+        $this->autoEscape = (bool) $enabled;
     }
 
     /**
@@ -371,7 +371,7 @@ 
     {
         if ($autoload) {
             $name  = str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '', Core::toCamelCase($callback));
-            $class = Core::NAMESPACE_PLUGINS_PROCESSORS . $name;
+            $class = Core::NAMESPACE_PLUGINS_PROCESSORS.$name;
 
             if (class_exists($class)) {
                 $callback = array(new $class($this), 'process');
@@ -396,12 +396,12 @@ 
     {
         if (($index = array_search($callback, $this->processors['pre'], true)) !== false) {
             unset($this->processors['pre'][$index]);
-        } elseif (($index = array_search(Core::NAMESPACE_PLUGINS_PROCESSORS . str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '',
+        } elseif (($index = array_search(Core::NAMESPACE_PLUGINS_PROCESSORS.str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '',
                     $callback),
                 $this->processors['pre'], true)) !== false) {
             unset($this->processors['pre'][$index]);
         } else {
-            $class = Core::NAMESPACE_PLUGINS_PROCESSORS . str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '', $callback);
+            $class = Core::NAMESPACE_PLUGINS_PROCESSORS.str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '', $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]);
@@ -424,7 +424,7 @@ 
     {
         if ($autoload) {
             $name  = str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '', $callback);
-            $class = Core::NAMESPACE_PLUGINS_PROCESSORS . Core::toCamelCase($name);
+            $class = Core::NAMESPACE_PLUGINS_PROCESSORS.Core::toCamelCase($name);
 
             if (class_exists($class)) {
                 $callback = array(new $class($this), 'process');
@@ -449,12 +449,12 @@ 
     {
         if (($index = array_search($callback, $this->processors['post'], true)) !== false) {
             unset($this->processors['post'][$index]);
-        } elseif (($index = array_search(Core::NAMESPACE_PLUGINS_PROCESSORS . str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '',
+        } elseif (($index = array_search(Core::NAMESPACE_PLUGINS_PROCESSORS.str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '',
                     $callback),
                 $this->processors['post'], true)) !== false) {
             unset($this->processors['post'][$index]);
         } else {
-            $class = Core::NAMESPACE_PLUGINS_PROCESSORS . str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '', $callback);
+            $class = Core::NAMESPACE_PLUGINS_PROCESSORS.str_replace(Core::NAMESPACE_PLUGINS_PROCESSORS, '', $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]);
@@ -480,7 +480,7 @@ 
                 $this->getCore()->getLoader()->loadPlugin($name);
             }
             catch (Exception $e) {
-                throw new Exception('Processor ' . $name . ' could not be found in your plugin directories, please ensure it is in a file named ' . $name . '.php in the plugin directory');
+                throw new Exception('Processor '.$name.' could not be found in your plugin directories, please ensure it is in a file named '.$name.'.php in the plugin directory');
             }
         }
 
@@ -666,7 +666,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;
         }
@@ -737,11 +737,11 @@ 
 
                 if ($this->debug) {
                     echo "\n";
-                    echo 'COMPILER INIT' . "\n";
+                    echo 'COMPILER INIT'."\n";
                 }
 
                 if ($this->debug) {
-                    echo 'PROCESSING PREPROCESSORS (' . count($this->processors['pre']) . ')' . "\n";
+                    echo 'PROCESSING PREPROCESSORS ('.count($this->processors['pre']).')'."\n";
                 }
 
                 // runs preprocessors
@@ -785,23 +785,23 @@ 
             if ($pos === false) {
                 $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);
-                $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 (substr($tpl, $pos-1, 1) === '\\' && substr($tpl, $pos-2, 1) !== '\\') {
+                $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)) {
                     throw new CompilationException($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])));
-                $ptr = $endpos + strlen($litClose[0][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) === '\\') {
-                    $this->push(substr($tpl, $ptr, $pos - $ptr - 1));
+                if (substr($tpl, $pos-2, 1) === '\\' && substr($tpl, $pos-1, 1) === '\\') {
+                    $this->push(substr($tpl, $ptr, $pos-$ptr-1));
                     $ptr = $pos;
                 }
 
-                $this->push(substr($tpl, $ptr, $pos - $ptr));
+                $this->push(substr($tpl, $ptr, $pos-$ptr));
                 $ptr = $pos;
 
                 $pos += strlen($this->ld);
@@ -819,7 +819,7 @@ 
 
                 // check that there is an end tag present
                 if (strpos($tpl, $this->rd, $pos) === false) {
-                    throw new CompilationException($this, 'A template tag was not closed, started with "' . substr($tpl, $ptr, 30) . '"');
+                    throw new CompilationException($this, 'A template tag was not closed, started with "'.substr($tpl, $ptr, 30).'"');
                 }
 
                 $ptr += strlen($this->ld);
@@ -833,7 +833,7 @@ 
                         continue 2;
                     }
 
-                    $len = $subptr - $ptr;
+                    $len = $subptr-$ptr;
                     $this->push($parsed, substr_count(substr($tpl, $ptr, $len), "\n"));
                     $ptr += $len;
 
@@ -847,7 +847,7 @@ 
         $compiled .= $this->removeBlock('TopLevelBlock');
 
         if ($this->debug) {
-            echo 'PROCESSING POSTPROCESSORS' . "\n";
+            echo 'PROCESSING POSTPROCESSORS'."\n";
         }
 
         foreach ($this->processors['post'] as $postProc) {
@@ -863,7 +863,7 @@ 
         unset($postProc);
 
         if ($this->debug) {
-            echo 'COMPILATION COMPLETE : MEM USAGE : ' . memory_get_usage() . "\n";
+            echo 'COMPILATION COMPLETE : MEM USAGE : '.memory_get_usage()."\n";
         }
 
         $output = "<?php\n/* template head */\n";
@@ -876,30 +876,30 @@ 
 
             switch ($type) {
                 case Core::CLASS_PLUGIN:
-                case Core::CLASS_PLUGIN + Core::BLOCK_PLUGIN:
-                    if (class_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
+                case Core::CLASS_PLUGIN+Core::BLOCK_PLUGIN:
+                    if (class_exists('Plugin'.$plugin) !== false) {
+                        $output .= "if (class_exists('"."Plugin".$plugin."')===false)".
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     } else {
-                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_BLOCKS . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (class_exists('".Core::NAMESPACE_PLUGINS_BLOCKS."Plugin".$plugin."')===false)".
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     }
                     break;
-                case Core::CLASS_PLUGIN + Core::FUNC_PLUGIN:
-                    if (class_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (class_exists('" . "Plugin" . $plugin . "')===false)".
+                case Core::CLASS_PLUGIN+Core::FUNC_PLUGIN:
+                    if (class_exists('Plugin'.$plugin) !== false) {
+                        $output .= "if (class_exists('"."Plugin".$plugin."')===false)".
                             "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     } else {
-                        $output .= "if (class_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (class_exists('".Core::NAMESPACE_PLUGINS_FUNCTIONS."Plugin".$plugin."')===false)".
                             "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     }
                     break;
                 case Core::FUNC_PLUGIN:
-                    if (function_exists('Plugin' . $plugin) !== false) {
-                        $output .= "if (function_exists('" . "Plugin" . $plugin . "')===false)".
+                    if (function_exists('Plugin'.$plugin) !== false) {
+                        $output .= "if (function_exists('"."Plugin".$plugin."')===false)".
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     } else {
-                        $output .= "if (function_exists('" . Core::NAMESPACE_PLUGINS_FUNCTIONS . "Plugin" . $plugin . "')===false)".
+                        $output .= "if (function_exists('".Core::NAMESPACE_PLUGINS_FUNCTIONS."Plugin".$plugin."')===false)".
                         "\n\t\$this->getLoader()->loadPlugin('Plugin$plugin');\n";
                     }
                     break;
@@ -919,7 +919,7 @@ 
                     $output .= $this->getCore()->getPluginProxy()->getLoader($plugin);
                     break;
                 default:
-                    throw new CompilationException($this, 'Type error for ' . $plugin . ' with type' . $type);
+                    throw new CompilationException($this, 'Type error for '.$plugin.' with type'.$type);
             }
         }
 
@@ -930,30 +930,30 @@ 
         }
         foreach ($this->templatePlugins as $function) {
             if (isset($function['called']) && $function['called'] === true) {
-                $output .= $function['body'] . PHP_EOL;
+                $output .= $function['body'].PHP_EOL;
             }
         }
 
-        $output .= $compiled . "\n?>";
+        $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 ($i+1).'. '.$line."\r\n";
             }
-            echo '=============================================================================================' . "\n";
+            echo '============================================================================================='."\n";
         }
 
         $this->template = $this->dwoo = null;
@@ -970,13 +970,13 @@ 
     protected function resolveSubTemplateDependencies($function)
     {
         if ($this->debug) {
-            echo 'Compiler::' . __FUNCTION__ . "\n";
+            echo 'Compiler::'.__FUNCTION__."\n";
         }
 
         $body = $this->templatePlugins[$function]['body'];
         foreach ($this->templatePlugins as $func => $attr) {
-            if ($func !== $function && !isset($attr['called']) && strpos($body, Core::NAMESPACE_PLUGINS_FUNCTIONS .
-            'Plugin' . Core::toCamelCase($func)) !== false) {
+            if ($func !== $function && !isset($attr['called']) && strpos($body, Core::NAMESPACE_PLUGINS_FUNCTIONS.
+            'Plugin'.Core::toCamelCase($func)) !== false) {
                 $this->templatePlugins[$func]['called'] = true;
                 $this->resolveSubTemplateDependencies($func);
             }
@@ -1000,14 +1000,14 @@ 
 
         if ($this->curBlock['buffer'] === null && count($this->stack) > 1) {
             // buffer is not initialized yet (the block has just been created)
-            $this->stack[count($this->stack) - 2]['buffer'] .= (string)$content;
+            $this->stack[count($this->stack)-2]['buffer'] .= (string) $content;
             $this->curBlock['buffer'] = '';
         } else {
             if (!isset($this->curBlock['buffer'])) {
                 throw new CompilationException($this, 'The template has been closed too early, you probably have an extra block-closing tag somewhere');
             }
             // append current content to current block's buffer
-            $this->curBlock['buffer'] .= (string)$content;
+            $this->curBlock['buffer'] .= (string) $content;
         }
         $this->line += $lineCount;
     }
@@ -1077,26 +1077,26 @@ 
     public function addBlock($type, array $params, $paramtype)
     {
         if ($this->debug) {
-            echo 'Compiler::' . __FUNCTION__ . "\n";
+            echo 'Compiler::'.__FUNCTION__."\n";
         }
 
         $class = current(array_filter([
-            'Plugin' . Core::toCamelCase($type),
-            Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($type)
+            'Plugin'.Core::toCamelCase($type),
+            Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($type)
         ], 'class_exists'));
         if (false === $class) {
             $this->getCore()->getLoader()->loadPlugin($type);
         }
         $params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
-        $this->stack[]  = array(
+        $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];
 
         return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
     }
@@ -1121,14 +1121,14 @@ 
 
         $params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
-        $this->stack[]  = array(
+        $this->stack[] = array(
             'type'   => $type,
             'params' => $params,
             'custom' => true,
             'class'  => $class,
             'buffer' => null
         );
-        $this->curBlock = &$this->stack[count($this->stack) - 1];
+        $this->curBlock = &$this->stack[count($this->stack)-1];
 
         return call_user_func(array($class, 'preProcessing'), $this, $params, '', '', $type);
     }
@@ -1143,21 +1143,21 @@ 
     public function injectBlock($type, array $params)
     {
         if ($this->debug) {
-            echo 'Compiler::' . __FUNCTION__ . "\n";
+            echo 'Compiler::'.__FUNCTION__."\n";
         }
 
-        $class = Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($type);
+        $class = Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($type);
         if (class_exists($class) === false) {
             $this->getCore()->getLoader()->loadPlugin($type);
         }
-        $this->stack[]  = array(
+        $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];
     }
 
     /**
@@ -1172,7 +1172,7 @@ 
     public function removeBlock($type)
     {
         if ($this->debug) {
-            echo 'Compiler::' . __FUNCTION__ . "\n";
+            echo 'Compiler::'.__FUNCTION__."\n";
         }
 
         $output = '';
@@ -1187,12 +1187,12 @@ 
                     $class = $top['class'];
                 } else {
                     $class = current(array_filter([
-                        'Plugin' . Core::toCamelCase($top['type']),
-                        Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($top['type'])
+                        'Plugin'.Core::toCamelCase($top['type']),
+                        Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($top['type'])
                     ], 'class_exists'));
                 }
                 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'
@@ -1213,7 +1213,7 @@ 
                 }
             }
 
-            throw new CompilationException($this, 'Syntax malformation, a block of type "' . $type . '" was closed but was not opened');
+            throw new CompilationException($this, 'Syntax malformation, a block of type "'.$type.'" was closed but was not opened');
         }
 
         return $output;
@@ -1251,7 +1251,7 @@ 
             }
         }
 
-        throw new CompilationException($this, 'A parent block of type "' . $type . '" is required and can not be found');
+        throw new CompilationException($this, 'A parent block of type "'.$type.'" is required and can not be found');
     }
 
     /**
@@ -1274,7 +1274,7 @@ 
     public function removeTopBlock()
     {
         if ($this->debug) {
-            echo 'Compiler::' . __FUNCTION__ . "\n";
+            echo 'Compiler::'.__FUNCTION__."\n";
         }
 
         $o = array_pop($this->stack);
@@ -1284,10 +1284,10 @@ 
         if ($o['custom']) {
             $class = $o['class'];
         } else {
-            $class = Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($o['type']);
+            $class = Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($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']);
     }
@@ -1366,7 +1366,7 @@ 
     protected function parse($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
         if ($this->debug) {
-            echo 'Compiler::' . __FUNCTION__ . "\n";
+            echo 'Compiler::'.__FUNCTION__."\n";
         }
 
         if ($to === null) {
@@ -1383,14 +1383,14 @@ 
                 // end template tag
                 $pointer += strlen($this->rd);
                 if ($this->debug) {
-                    echo 'TEMPLATE PARSING ENDED' . "\n";
+                    echo 'TEMPLATE PARSING ENDED'."\n";
                 }
 
                 return false;
             }
-            ++ $from;
+            ++$from;
             if ($pointer !== null) {
-                ++ $pointer;
+                ++$pointer;
             }
             if ($from >= $to) {
                 if (is_array($parsingParams)) {
@@ -1402,22 +1402,22 @@ 
             $first = $in[$from];
         }
 
-        $substr = substr($in, $from, $to - $from);
+        $substr = substr($in, $from, $to-$from);
 
         if ($this->debug) {
-            echo 'PARSE CALL : PARSING "' . htmlentities(substr($in, $from, min($to - $from, 50))) . (($to - $from) > 50 ? '...' : '') . '" @ ' . $from . ':' . $to . ' in ' . $curBlock . ' : pointer=' . $pointer . "\n";
+            echo 'PARSE CALL : PARSING "'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').'" @ '.$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 {
                         $char = substr($src, -- $startpos, 1);
                         if ($char == "\n") {
-                            ++ $startpos;
+                            ++$startpos;
                             $whitespaceStart = true;
                             break;
                         }
@@ -1428,12 +1428,12 @@ 
                 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) {
-                    $comOpen  = $this->ld . '*';
-                    $comClose = '*' . $this->rd;
+                if ($this->allowNestedComments && strpos($src, $this->ld.'*', $this->getPointer()) !== false) {
+                    $comOpen  = $this->ld.'*';
+                    $comClose = '*'.$this->rd;
                     $level    = 1;
                     $ptr      = $this->getPointer();
 
@@ -1443,33 +1443,33 @@ 
 
                         if ($open !== false && $close !== false) {
                             if ($open < $close) {
-                                $ptr = $open + strlen($comOpen);
-                                ++ $level;
+                                $ptr = $open+strlen($comOpen);
+                                ++$level;
                             } else {
-                                $ptr = $close + strlen($comClose);
-                                -- $level;
+                                $ptr = $close+strlen($comClose);
+                                --$level;
                             }
                         } elseif ($open !== false) {
-                            $ptr = $open + strlen($comOpen);
-                            ++ $level;
+                            $ptr = $open+strlen($comOpen);
+                            ++$level;
                         } elseif ($close !== false) {
-                            $ptr = $close + strlen($comClose);
-                            -- $level;
+                            $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);
+                    $endpos = strpos($src, '*'.$this->rd, $startpos);
                     if ($endpos == false) {
                         throw new CompilationException($this, 'Un-ended comment');
                     }
                 }
-                $pointer += $endpos - $startpos + strlen('*' . $this->rd);
-                if (isset($whitespaceStart) && preg_match('#^[\t ]*\r?\n#', substr($src, $endpos + strlen('*' . $this->rd)), $m)) {
+                $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;
@@ -1486,20 +1486,20 @@ 
         } 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";
+                echo 'END OF INSTRUCTION'."\n";
             }
             if ($pointer !== null) {
-                ++ $pointer;
+                ++$pointer;
             }
 
-            return $this->parse($in, $from + 1, $to, false, 'root', $pointer);
+            return $this->parse($in, $from+1, $to, false, 'root', $pointer);
         } elseif ($curBlock === 'root' && preg_match('#^/([a-z_][a-z0-9_]*)?#i', $substr, $match)) {
             // close block
             if (!empty($match[1]) && $match[1] == 'else') {
@@ -1516,13 +1516,13 @@ 
                     $pointer -= strlen($match[0]);
                 }
                 if ($this->debug) {
-                    echo 'TOP BLOCK CLOSED' . "\n";
+                    echo 'TOP BLOCK CLOSED'."\n";
                 }
 
                 return $this->removeTopBlock();
             } else {
                 if ($this->debug) {
-                    echo 'BLOCK OF TYPE ' . $match[1] . ' CLOSED' . "\n";
+                    echo 'BLOCK OF TYPE '.$match[1].' CLOSED'."\n";
                 }
 
                 return $this->removeBlock($match[1]);
@@ -1530,19 +1530,19 @@ 
         } elseif ($curBlock === 'root' && substr($substr, 0, strlen($this->rd)) === $this->rd) {
             // end template tag
             if ($this->debug) {
-                echo 'TAG PARSING ENDED' . "\n";
+                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";
+                echo 'NAMED PARAM FOUND'."\n";
             }
             $len = strlen($match[1]);
-            while (substr($in, $from + $len, 1) === ' ') {
-                ++ $len;
+            while (substr($in, $from+$len, 1) === ' ') {
+                ++$len;
             }
             if ($pointer !== null) {
                 $pointer += $len;
@@ -1550,7 +1550,7 @@ 
 
             $output = array(
                 trim($match[1], " \t\r\n=>'\""),
-                $this->parse($in, $from + $len, $to, false, 'namedparam', $pointer)
+                $this->parse($in, $from+$len, $to, false, 'namedparam', $pointer)
             );
 
             $parsingParams[] = $output;
@@ -1571,31 +1571,31 @@ 
             $out = $this->parseOthers($in, $from, $to, $parsingParams, $curBlock, $pointer);
         } else {
             // parse error
-            throw new CompilationException($this, 'Parse error in "' . substr($in, $from, $to - $from) . '"');
+            throw new CompilationException($this, 'Parse error in "'.substr($in, $from, $to-$from).'"');
         }
 
         if (empty($out)) {
             return '';
         }
 
-        $substr = substr($in, $pointer, $to - $pointer);
+        $substr = substr($in, $pointer, $to-$pointer);
 
         // 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";
+                    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);
@@ -1603,26 +1603,26 @@ 
                         $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;
                     }
                 }
             } elseif ($curBlock === 'root' && preg_match('#^(\s*(?:[+/*%-.]=|=|\+\+|--)\s*)(.*)#s', $substr, $match)) {
                 if ($this->debug) {
-                    echo 'PARSING POST-VAR ASSIGNMENT ' . $substr . "\n";
+                    echo 'PARSING POST-VAR ASSIGNMENT '.$substr."\n";
                 }
                 // parse assignment
                 $value    = $match[2];
                 $operator = trim($match[1]);
                 if (substr($value, 0, 1) == '=') {
-                    throw new CompilationException($this, 'Unexpected "=" in <em>' . $substr . '</em>');
+                    throw new CompilationException($this, 'Unexpected "=" in <em>'.$substr.'</em>');
                 }
 
                 if ($pointer !== null) {
@@ -1643,7 +1643,7 @@ 
                         throw new CompilationException($this, 'Assignments require the "if" plugin to be accessible');
                     }
 
-                    $parts  = $this->mapParams($parts, array(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf', 'init'), 1);
+                    $parts  = $this->mapParams($parts, array(Core::NAMESPACE_PLUGINS_BLOCKS.'PluginIf', 'init'), 1);
                     $tokens = $this->getParamTokens($parts);
                     $parts  = $this->getCompiledParams($parts);
 
@@ -1657,14 +1657,14 @@ 
                 if ($this->autoEscape) {
                     $out = preg_replace('#\(is_string\(\$tmp=(.+?)\) \? htmlspecialchars\(\$tmp, ENT_QUOTES, \$this->charset\) : \$tmp\)#', '$1', $out);
                 }
-                $out = self::PHP_OPEN . $echo . $out . $operator . implode(' ', $value) . self::PHP_CLOSE;
+                $out = self::PHP_OPEN.$echo.$out.$operator.implode(' ', $value).self::PHP_CLOSE;
             } elseif ($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";
+                    echo 'VARIABLE NAMED PARAM (FOR ARRAY) FOUND'."\n";
                 }
                 $len = strlen($match[1]);
-                $var = $out[count($out) - 1];
+                $var = $out[count($out)-1];
                 $pointer += $len;
 
                 $output = array($var[0], $this->parse($substr, $len, null, false, 'namedparam', $pointer));
@@ -1679,16 +1679,16 @@ 
             // parse modifier on funcs or vars
             $srcPointer = $pointer;
             if (is_array($parsingParams)) {
-                $tmp                     = $this->replaceModifiers(
+                $tmp = $this->replaceModifiers(
                     array(
                     null,
                     null,
-                    $out[count($out) - 1][0],
+                    $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][0] = $tmp;
+                $out[count($out)-1][1] .= substr($substr, $srcPointer, $srcPointer-$pointer);
             } else {
                 $out = $this->replaceModifiers(array(null, null, $out, $match[0]), $curBlock, $pointer);
             }
@@ -1700,10 +1700,10 @@ 
             $ptr = 0;
 
             if (is_array($parsingParams)) {
-                $output = $this->parseMethodCall($out[count($out) - 1][1], $match[0], $curBlock, $ptr);
+                $output = $this->parseMethodCall($out[count($out)-1][1], $match[0], $curBlock, $ptr);
 
-                $out[count($out) - 1][0] = $output;
-                $out[count($out) - 1][1] .= substr($match[0], 0, $ptr);
+                $out[count($out)-1][0] = $output;
+                $out[count($out)-1][1] .= substr($match[0], 0, $ptr);
             } else {
                 $out = $this->parseMethodCall($out, $match[0], $curBlock, $ptr);
             }
@@ -1712,7 +1712,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;
         }
 
         return $out;
@@ -1738,11 +1738,11 @@ 
     protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
         $output = '';
-        $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);
+        $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);
 
         if (empty($match[1])) {
-            throw new CompilationException($this, 'Parse error, invalid function name : ' . substr($cmdstr, 0, 15));
+            throw new CompilationException($this, 'Parse error, invalid function name : '.substr($cmdstr, 0, 15));
         }
 
         $func = $match[1];
@@ -1752,7 +1752,7 @@ 
         }
 
         if ($this->debug) {
-            echo 'FUNC FOUND (' . $func . ')' . "\n";
+            echo 'FUNC FOUND ('.$func.')'."\n";
         }
 
         $paramsep = '';
@@ -1764,11 +1764,11 @@ 
             $paramspos = $match[1][0][1];
             $paramsep  = substr($match[1][0][0], - 1) === '(' ? ')' : '';
             if ($paramsep === ')') {
-                $paramspos += strlen($match[1][0][0]) - 1;
+                $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) {
-                        -- $paramspos;
+                        --$paramspos;
                     }
                 }
             }
@@ -1793,8 +1793,8 @@ 
                     return $this->parseOthers($in, $from, $to, $parsingParams, $curBlock, $pointer);
                 }
             }
-            $whitespace = strlen(substr($cmdstr, strlen($func), $paramspos - strlen($func)));
-            $paramstr   = substr($cmdstr, $paramspos + 1);
+            $whitespace = strlen(substr($cmdstr, strlen($func), $paramspos-strlen($func)));
+            $paramstr   = substr($cmdstr, $paramspos+1);
             if (substr($paramstr, - 1, 1) === $paramsep) {
                 $paramstr = substr($paramstr, 0, - 1);
             }
@@ -1816,36 +1816,36 @@ 
 
                             if ($func !== 'if' && $func !== 'elseif' && $paramstr[$ptr] === ')') {
                                 if ($this->debug) {
-                                    echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT ' . $ptr . "\n";
+                                    echo 'PARAM PARSING ENDED, ")" FOUND, POINTER AT '.$ptr."\n";
                                 }
                                 break 2;
                             } elseif ($paramstr[$ptr] === ';') {
-                                ++ $ptr;
+                                ++$ptr;
                                 if ($this->debug) {
-                                    echo 'PARAM PARSING ENDED, ";" FOUND, POINTER AT ' . $ptr . "\n";
+                                    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";
+                                    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";
+                                    echo 'PARAM PARSING ENDED, RIGHT DELIMITER FOUND, POINTER AT '.$ptr."\n";
                                 }
                                 break 2;
                             }
 
                             if ($paramstr[$ptr] === ' ' || $paramstr[$ptr] === ',' || $paramstr[$ptr] === "\r" || $paramstr[$ptr] === "\n" || $paramstr[$ptr] === "\t") {
-                                ++ $ptr;
+                                ++$ptr;
                             } else {
                                 break;
                             }
                         }
 
                         if ($this->debug) {
-                            echo 'FUNC START PARAM PARSING WITH POINTER AT ' . $ptr . "\n";
+                            echo 'FUNC START PARAM PARSING WITH POINTER AT '.$ptr."\n";
                         }
 
                         if ($func === 'if' || $func === 'elseif' || $func === 'tif') {
@@ -1857,7 +1857,7 @@ 
                         }
 
                         if ($this->debug) {
-                            echo 'PARAM PARSED, POINTER AT ' . $ptr . ' (' . substr($paramstr, $ptr - 1, 3) . ')' . "\n";
+                            echo 'PARAM PARSED, POINTER AT '.$ptr.' ('.substr($paramstr, $ptr-1, 3).')'."\n";
                         }
                     }
                 }
@@ -1881,16 +1881,16 @@ 
         }
 
         if ($pointer !== null) {
-            $pointer += (isset($paramstr) ? strlen($paramstr) : 0) + (')' === $paramsep ? 2 : ($paramspos === false ? 0 : 1)) + strlen($func) + (isset($whitespace) ? $whitespace : 0);
+            $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";
+                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) {
             // handle static method calls with security policy
             if (strstr($func, '::') !== false && $this->securityPolicy !== null && $this->securityPolicy->isMethodAllowed(explode('::', strtolower($func))) !== true) {
-                throw new SecurityException('Call to a disallowed php function : ' . $func);
+                throw new SecurityException('Call to a disallowed php function : '.$func);
             }
             $pluginType = Core::NATIVE_PLUGIN;
         } else {
@@ -1935,19 +1935,19 @@ 
                     $this->customPlugins[$func]['function']
                 ), $state);
             } else {
-                if (class_exists('Plugin' . Core::toCamelCase($func)) !== false) {
+                if (class_exists('Plugin'.Core::toCamelCase($func)) !== false) {
                     $params = $this->mapParams($params, array(
-                        'Plugin' . Core::toCamelCase($func),
+                        'Plugin'.Core::toCamelCase($func),
                         ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
                     ), $state);
-                } elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func)) !== false) {
+                } elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func)) !== false) {
                     $params = $this->mapParams($params, array(
-                        Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func),
+                        Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func),
                         ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
                     ), $state);
                 } else {
                     $params = $this->mapParams($params, array(
-                        Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func),
+                        Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func),
                         ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process'
                     ), $state);
                 }
@@ -1958,24 +1958,22 @@ 
                 $params = $this->mapParams($params, $this->customPlugins[$func]['callback'], $state);
             } else {
                 // Custom plugin
-                if (function_exists('Plugin' . Core::toCamelCase($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ?
+                if (function_exists('Plugin'.Core::toCamelCase($func).(($pluginType & Core::COMPILABLE_PLUGIN) ?
                         'Compile' : '')) !== false) {
-                    $params = $this->mapParams($params, 'Plugin' . Core::toCamelCase($func) . (($pluginType &
+                    $params = $this->mapParams($params, 'Plugin'.Core::toCamelCase($func).(($pluginType &
                             Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
                 } // Builtin helper plugin
-                elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) . (
+                elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func).(
                     ($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : '')) !== false) {
-                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase
-                        ($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
+                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func).(($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
                 } // Builtin function plugin
                 else {
-                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase
-                        ($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
+                    $params = $this->mapParams($params, Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func).(($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''), $state);
                 }
             }
         } // Smarty modifier
         elseif ($pluginType & Core::SMARTY_MODIFIER) {
-            $output = 'smarty_modifier_' . $func . '(' . implode(', ', $params) . ')';
+            $output = 'smarty_modifier_'.$func.'('.implode(', ', $params).')';
         } // Proxy plugin
         elseif ($pluginType & Core::PROXY_PLUGIN) {
             $params = $this->mapParams($params, $this->getCore()->getPluginProxy()->getCallback($func), $state);
@@ -2015,19 +2013,19 @@ 
             if ($func === 'do') {
                 $output = '';
                 if (isset($params['*'])) {
-                    $output = implode(';', $params['*']) . ';';
+                    $output = implode(';', $params['*']).';';
                 }
 
                 if (is_array($parsingParams) || $curBlock !== 'root') {
                     throw new CompilationException($this, 'Do can not be used inside another function or block');
                 }
 
-                return self::PHP_OPEN . $output . self::PHP_CLOSE;
+                return self::PHP_OPEN.$output.self::PHP_CLOSE;
             } else {
                 if (isset($params['*'])) {
-                    $output = $func . '(' . implode(', ', $params['*']) . ')';
+                    $output = $func.'('.implode(', ', $params['*']).')';
                 } else {
-                    $output = $func . '()';
+                    $output = $func.'()';
                 }
             }
         } // Block class OR Function class
@@ -2037,7 +2035,7 @@ 
                     $callback = $this->customPlugins[$func]['callback'];
                     if (!is_array($callback)) {
                         if (!method_exists($callback, 'compile')) {
-                            throw new Exception('Custom plugin ' . $func . ' must implement the "compile" method to be compilable, or you should provide a full callback to the method to use');
+                            throw new Exception('Custom plugin '.$func.' must implement the "compile" method to be compilable, or you should provide a full callback to the method to use');
                         }
                         if (($ref = new ReflectionMethod($callback, 'compile')) && $ref->isStatic()) {
                             $funcCompiler = array($callback, 'compile');
@@ -2048,13 +2046,13 @@ 
                         $funcCompiler = $callback;
                     }
                 } else {
-                    if (class_exists('Plugin' . Core::toCamelCase($func)) !== false) {
-                        $funcCompiler = array('Plugin' . Core::toCamelCase($func), 'compile');
-                    } elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func)) !== false) {
-                        $funcCompiler = array(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func), 'compile');
+                    if (class_exists('Plugin'.Core::toCamelCase($func)) !== false) {
+                        $funcCompiler = array('Plugin'.Core::toCamelCase($func), 'compile');
+                    } elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func)) !== false) {
+                        $funcCompiler = array(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func), 'compile');
                     } else {
                         $funcCompiler = array(
-                            Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func),
+                            Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func),
                             'compile'
                         );
                     }
@@ -2071,34 +2069,34 @@ 
                     $callback = $this->customPlugins[$func]['callback'];
                     if (!is_array($callback)) {
                         if (!method_exists($callback, 'process')) {
-                            throw new Exception('Custom plugin ' . $func . ' must implement the "process" method to be usable, or you should provide a full callback to the method to use');
+                            throw new Exception('Custom plugin '.$func.' must implement the "process" method to be usable, or you should provide a full callback to the method to use');
                         }
                         if (is_object($callback)) {
                             $callback = get_class($callback);
                         }
                         if (($ref = new ReflectionMethod($callback, 'process')) && $ref->isStatic()) {
-                            $output = 'call_user_func(array(\'' . $callback . '\', \'process\'), ' . $params . ')';
+                            $output = 'call_user_func(array(\''.$callback.'\', \'process\'), '.$params.')';
                         } else {
-                            $output = 'call_user_func(array($this->getObjectPlugin(\'' . $callback . '\'), \'process\'), ' . $params . ')';
+                            $output = 'call_user_func(array($this->getObjectPlugin(\''.$callback.'\'), \'process\'), '.$params.')';
                         }
                     } elseif (is_object($callback[0])) {
-                        $output = 'call_user_func(array($this->plugins[\'' . $func . '\'][\'callback\'][0], \'' . $callback[1] . '\'), ' . $params . ')';
+                        $output = 'call_user_func(array($this->plugins[\''.$func.'\'][\'callback\'][0], \''.$callback[1].'\'), '.$params.')';
                     } elseif (($ref = new ReflectionMethod($callback[0], $callback[1])) && $ref->isStatic()) {
-                        $output = 'call_user_func(array(\'' . $callback[0] . '\', \'' . $callback[1] . '\'), ' . $params . ')';
+                        $output = 'call_user_func(array(\''.$callback[0].'\', \''.$callback[1].'\'), '.$params.')';
                     } else {
-                        $output = 'call_user_func(array($this->getObjectPlugin(\'' . $callback[0] . '\'), \'' . $callback[1] . '\'), ' . $params . ')';
+                        $output = 'call_user_func(array($this->getObjectPlugin(\''.$callback[0].'\'), \''.$callback[1].'\'), '.$params.')';
                     }
                     if (empty($params)) {
-                        $output = substr($output, 0, - 3) . ')';
+                        $output = substr($output, 0, - 3).')';
                     }
                 } else {
-                    if (class_exists('Plugin' . Core::toCamelCase($func)) !== false) {
-                        $output = '$this->classCall(\'Plugin' . $func . '\', array(' . $params . '))';
-                    } elseif (class_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func)) !== false) {
-                        $output = '$this->classCall(\'' . Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . $func . '\',
-                        array(' . $params . '))';
+                    if (class_exists('Plugin'.Core::toCamelCase($func)) !== false) {
+                        $output = '$this->classCall(\'Plugin'.$func.'\', array('.$params.'))';
+                    } elseif (class_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func)) !== false) {
+                        $output = '$this->classCall(\''.Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.$func.'\',
+                        array(' . $params.'))';
                     } else {
-                        $output = '$this->classCall(\'' . $func . '\', array(' . $params . '))';
+                        $output = '$this->classCall(\''.$func.'\', array('.$params.'))';
                     }
                 }
             }
@@ -2109,15 +2107,15 @@ 
                     $funcCompiler = $this->customPlugins[$func]['callback'];
                 } else {
                     // Custom plugin
-                    if (function_exists('Plugin' . Core::toCamelCase($func) . 'Compile') !== false) {
-                        $funcCompiler = 'Plugin' . Core::toCamelCase($func) . 'Compile';
+                    if (function_exists('Plugin'.Core::toCamelCase($func).'Compile') !== false) {
+                        $funcCompiler = 'Plugin'.Core::toCamelCase($func).'Compile';
                     } // Builtin helper plugin
-                    elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) . 'Compile') !== false) {
-                        $funcCompiler = Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) .
+                    elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func).'Compile') !== false) {
+                        $funcCompiler = Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func).
                             'Compile';
                     } // Builtin function plugin
                     else {
-                        $funcCompiler = Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func) .
+                        $funcCompiler = Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func).
                             'Compile';
                     }
                 }
@@ -2133,24 +2131,24 @@ 
                 if ($pluginType & Core::CUSTOM_PLUGIN) {
                     $callback = $this->customPlugins[$func]['callback'];
                     if ($callback instanceof Closure) {
-                        $output = 'call_user_func($this->getCustomPlugin(\'' . $func . '\'), ' . $params . ')';
+                        $output = 'call_user_func($this->getCustomPlugin(\''.$func.'\'), '.$params.')';
                     } else {
-                        $output = 'call_user_func(\'' . $callback . '\', ' . $params . ')';
+                        $output = 'call_user_func(\''.$callback.'\', '.$params.')';
                     }
                 } else {
                     // Custom plugin
-                    if (function_exists('Plugin' . Core::toCamelCase($func)) !== false) {
-                        $output = 'Plugin' . Core::toCamelCase($func) . '(' . $params .
+                    if (function_exists('Plugin'.Core::toCamelCase($func)) !== false) {
+                        $output = 'Plugin'.Core::toCamelCase($func).'('.$params.
                             ')';
                     } // Builtin helper plugin
-                    elseif(function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func)) !==
+                    elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func)) !==
                         false) {
-                        $output = Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($func) . '(' .
-                            $params . ')';
+                        $output = Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($func).'('.
+                            $params.')';
                     } // Builtin function plugin
                     else {
-                        $output = Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func) . '(' .
-                            $params . ')';
+                        $output = Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func).'('.
+                            $params.')';
                     }
                 }
             }
@@ -2168,22 +2166,22 @@ 
                 $callback = $this->customPlugins[$func]['callback'];
                 if (is_array($callback)) {
                     if (is_object($callback[0])) {
-                        $output = 'call_user_func_array(array($this->getCustomPlugin(\'' . $func . '\'), \'' . $callback[1] . '\'), array(array(' . $params . '), $this))';
+                        $output = 'call_user_func_array(array($this->getCustomPlugin(\''.$func.'\'), \''.$callback[1].'\'), array(array('.$params.'), $this))';
                     } else {
-                        $output = 'call_user_func_array(array(\'' . $callback[0] . '\', \'' . $callback[1] . '\'), array(array(' . $params . '), $this))';
+                        $output = 'call_user_func_array(array(\''.$callback[0].'\', \''.$callback[1].'\'), array(array('.$params.'), $this))';
                     }
                 } else {
-                    $output = $callback . '(array(' . $params . '), $this)';
+                    $output = $callback.'(array('.$params.'), $this)';
                 }
             } else {
-                $output = 'smarty_function_' . $func . '(array(' . $params . '), $this)';
+                $output = 'smarty_function_'.$func.'(array('.$params.'), $this)';
             }
         } // Template plugin
         elseif ($pluginType & Core::TEMPLATE_PLUGIN) {
             array_unshift($params, '$this');
             $params                                 = self::implode_r($params);
-            $output                                 = 'Plugin' . Core::toCamelCase($func) .
-                $this->templatePlugins[$func]['uuid'] . '(' . $params . ')';
+            $output                                 = 'Plugin'.Core::toCamelCase($func).
+                $this->templatePlugins[$func]['uuid'].'('.$params.')';
             $this->templatePlugins[$func]['called'] = true;
         }
 
@@ -2215,29 +2213,29 @@ 
      */
     protected function parseString($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
-        $substr = substr($in, $from, $to - $from);
+        $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";
+            echo 'STRING FOUND (in '.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').')'."\n";
         }
         $strend = false;
-        $o      = $from + 1;
+        $o      = $from+1;
         while ($strend === false) {
             $strend = strpos($in, $first, $o);
             if ($strend === false) {
-                throw new CompilationException($this, 'Unfinished string, started with ' . substr($in, $from, $to - $from));
+                throw new CompilationException($this, 'Unfinished string, started with '.substr($in, $from, $to-$from));
             }
-            if (substr($in, $strend - 1, 1) === '\\') {
-                $o      = $strend + 1;
+            if (substr($in, $strend-1, 1) === '\\') {
+                $o      = $strend+1;
                 $strend = false;
             }
         }
         if ($this->debug) {
-            echo 'STRING DELIMITED: ' . substr($in, $from, $strend + 1 - $from) . "\n";
+            echo 'STRING DELIMITED: '.substr($in, $from, $strend+1-$from)."\n";
         }
 
-        $srcOutput = substr($in, $from, $strend + 1 - $from);
+        $srcOutput = substr($in, $from, $strend+1-$from);
 
         if ($pointer !== null) {
             $pointer += strlen($srcOutput);
@@ -2246,13 +2244,13 @@ 
         $output = $this->replaceStringVars($srcOutput, $first);
 
         // handle modifiers
-        if ($curBlock !== 'modifier' && preg_match('#^((?:\|(?:@?[a-z0-9_]+(?::.*)*))+)#i', substr($substr, $strend + 1 - $from), $match)) {
+        if ($curBlock !== 'modifier' && preg_match('#^((?:\|(?:@?[a-z0-9_]+(?::.*)*))+)#i', substr($substr, $strend+1-$from), $match)) {
             $modstr = $match[1];
 
             if ($curBlock === 'root' && substr($modstr, - 1) === '}') {
                 $modstr = substr($modstr, 0, - 1);
             }
-            $modstr = str_replace('\\' . $first, $first, $modstr);
+            $modstr = str_replace('\\'.$first, $first, $modstr);
             $ptr    = 0;
             $output = $this->replaceModifiers(array(null, null, $output, $modstr), 'string', $ptr);
 
@@ -2260,7 +2258,7 @@ 
             if ($pointer !== null) {
                 $pointer += $ptr;
             }
-            $srcOutput .= substr($substr, $strend + 1 - $from, $ptr);
+            $srcOutput .= substr($substr, $strend+1-$from, $ptr);
         }
 
         if (is_array($parsingParams)) {
@@ -2291,10 +2289,10 @@ 
      */
     protected function parseConst($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
-        $substr = substr($in, $from, $to - $from);
+        $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)) {
@@ -2335,7 +2333,7 @@ 
         }
 
         if ($curBlock !== 'root') {
-            return '(defined("' . $key . '") ? ' . $key . ' : null)';
+            return '(defined("'.$key.'") ? '.$key.' : null)';
         }
 
         return $key;
@@ -2358,7 +2356,7 @@ 
      */
     protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
-        $substr = substr($in, $from, $to - $from);
+        $substr = substr($in, $from, $to-$from);
 
         // var key
         $varRegex = '(\\$?\\.?[a-z0-9\\\\_:]*(?:(?:(?:\\.|->)(?:[a-z0-9\\\\_:]+|(?R))|\\[(?:[a-z0-9\\\\_:]+|(?R)|(["\'])[^\\2]*?\\2)\\]))*)';
@@ -2386,13 +2384,13 @@ 
 
             if (substr($key, - 1) == '.') {
                 $key = substr($key, 0, - 1);
-                -- $matchedLength;
+                --$matchedLength;
             }
 
             if ($hasMethodCall) {
-                $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];
+                $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];
             }
 
             if ($hasModifiers) {
@@ -2408,9 +2406,9 @@ 
 
             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";
                 }
             }
 
@@ -2421,7 +2419,7 @@ 
                 $uid           = 0;
                 $parsed        = array($uid => '');
                 $current       = &$parsed;
-                $curTxt        = &$parsed[$uid ++];
+                $curTxt        = &$parsed[$uid++];
                 $tree          = array();
                 $chars         = str_split($key, 1);
                 $inSplittedVar = false;
@@ -2430,33 +2428,33 @@ 
                 while (($char = array_shift($chars)) !== null) {
                     if ($char === '[') {
                         if (count($tree) > 0) {
-                            ++ $bracketCount;
+                            ++$bracketCount;
                         } else {
                             $tree[]        = &$current;
-                            $current[$uid] = array($uid + 1 => '');
-                            $current       = &$current[$uid ++];
-                            $curTxt        = &$current[$uid ++];
+                            $current[$uid] = array($uid+1 => '');
+                            $current       = &$current[$uid++];
+                            $curTxt        = &$current[$uid++];
                             continue;
                         }
                     } elseif ($char === ']') {
                         if ($bracketCount > 0) {
-                            -- $bracketCount;
+                            --$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;
                     }
 
@@ -2465,16 +2463,16 @@ 
                 unset($uid, $current, $curTxt, $tree, $chars);
 
                 if ($this->debug) {
-                    echo 'RECURSIVE VAR REPLACEMENT : ' . $key . "\n";
+                    echo 'RECURSIVE VAR REPLACEMENT : '.$key."\n";
                 }
 
                 $key = $this->flattenVarTree($parsed);
 
                 if ($this->debug) {
-                    echo 'RECURSIVE VAR REPLACEMENT DONE : ' . $key . "\n";
+                    echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key."\n";
                 }
 
-                $output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("' . $key . '")');
+                $output = preg_replace('#(^""\.|""\.|\.""$|(\()""\.|\.""(\)))#', '$2$3', '$this->readVar("'.$key.'")');
             } else {
                 $output = $this->parseVarKey($key, $hasModifiers ? 'modifier' : $curBlock);
             }
@@ -2499,10 +2497,10 @@ 
                     if (substr($expMatch[2][$k], 0, 1) === '=') {
                         $assign = true;
                         if ($operator === '=') {
-                            throw new CompilationException($this, 'Invalid expression <em>' . $substr . '</em>, can not use "==" in expressions');
+                            throw new CompilationException($this, 'Invalid expression <em>'.$substr.'</em>, can not use "==" in expressions');
                         }
                         if ($curBlock !== 'root') {
-                            throw new CompilationException($this, 'Invalid expression <em>' . $substr . '</em>, assignments can only be used in top level expressions like {$foo+=3} or {$foo="bar"}');
+                            throw new CompilationException($this, 'Invalid expression <em>'.$substr.'</em>, assignments can only be used in top level expressions like {$foo+=3} or {$foo="bar"}');
                         }
                         $operator .= '=';
                         $expMatch[2][$k] = substr($expMatch[2][$k], 1);
@@ -2513,22 +2511,22 @@ 
                         $expMatch[2][$k] = substr($expMatch[2][$k], 1);
                     }
                     if (($operator === '+' || $operator === '-') && $expMatch[2][$k] === $operator) {
-                        $output = '(' . $output . $operator . $operator . ')';
+                        $output = '('.$output.$operator.$operator.')';
                         break;
                     } elseif (substr($expMatch[2][$k], 0, 1) === '$') {
-                        $output = '(' . $output . ' ' . $operator . ' ' . $this->parseVar($expMatch[2][$k], 0, strlen($expMatch[2][$k]), false, 'expression') . ')';
+                        $output = '('.$output.' '.$operator.' '.$this->parseVar($expMatch[2][$k], 0, strlen($expMatch[2][$k]), false, 'expression').')';
                     } elseif (substr($expMatch[2][$k], 0, 1) === '%') {
-                        $output = '(' . $output . ' ' . $operator . ' ' . $this->parseConst($expMatch[2][$k], 0, strlen($expMatch[2][$k]), false, 'expression') . ')';
+                        $output = '('.$output.' '.$operator.' '.$this->parseConst($expMatch[2][$k], 0, strlen($expMatch[2][$k]), false, 'expression').')';
                     } elseif (!empty($expMatch[2][$k])) {
-                        $output = '(' . $output . ' ' . $operator . ' ' . str_replace(',', '.', $expMatch[2][$k]) . ')';
+                        $output = '('.$output.' '.$operator.' '.str_replace(',', '.', $expMatch[2][$k]).')';
                     } else {
-                        throw new CompilationException($this, 'Unfinished expression <em>' . $substr . '</em>, missing var or number after math operator');
+                        throw new CompilationException($this, 'Unfinished expression <em>'.$substr.'</em>, missing var or number after math operator');
                     }
                 }
             }
 
             if ($this->autoEscape === true && $curBlock !== 'condition') {
-                $output = '(is_string($tmp=' . $output . ') ? htmlspecialchars($tmp, ENT_QUOTES, $this->charset) : $tmp)';
+                $output = '(is_string($tmp='.$output.') ? htmlspecialchars($tmp, ENT_QUOTES, $this->charset) : $tmp)';
             }
 
             // handle modifiers
@@ -2552,7 +2550,7 @@ 
             } elseif ($curBlock === 'expression' || $curBlock === 'variable') {
                 return $output;
             } elseif (isset($assign)) {
-                return self::PHP_OPEN . $output . ';' . self::PHP_CLOSE;
+                return self::PHP_OPEN.$output.';'.self::PHP_CLOSE;
             }
 
             return $output;
@@ -2560,7 +2558,7 @@ 
             if ($curBlock === 'string' || $curBlock === 'delimited_string') {
                 return array(0, '');
             }
-            throw new CompilationException($this, 'Invalid variable name <em>' . $substr . '</em>');
+            throw new CompilationException($this, 'Invalid variable name <em>'.$substr.'</em>');
         }
     }
 
@@ -2614,16 +2612,16 @@ 
             if (empty($methMatch[2])) {
                 // property
                 if ($curBlock === 'root') {
-                    $output .= '->' . $methMatch[1];
+                    $output .= '->'.$methMatch[1];
                 } else {
-                    $output = '(($tmp = ' . $output . ') ? $tmp->' . $methMatch[1] . ' : null)';
+                    $output = '(($tmp = '.$output.') ? $tmp->'.$methMatch[1].' : null)';
                 }
                 $ptr += strlen($methMatch[1]);
             } else {
                 // method
                 if (substr($methMatch[2], 0, 2) === '()') {
-                    $parsedCall = $methMatch[1] . '()';
-                    $ptr += strlen($methMatch[1]) + 2;
+                    $parsedCall = $methMatch[1].'()';
+                    $ptr += strlen($methMatch[1])+2;
                 } else {
                     $parsedCall = $this->parseFunction($methodCall, $ptr, strlen($methodCall), false, 'method', $ptr);
                 }
@@ -2632,15 +2630,15 @@ 
                     $method = strtolower(substr($parsedCall, 0, $argPos));
                     $args   = substr($parsedCall, $argPos);
                     if ($curBlock === 'root') {
-                        $output = '$this->getSecurityPolicy()->callMethod($this, ' . $output . ', ' . var_export($method, true) . ', array' . $args . ')';
+                        $output = '$this->getSecurityPolicy()->callMethod($this, '.$output.', '.var_export($method, true).', array'.$args.')';
                     } else {
-                        $output = '(($tmp = ' . $output . ') ? $this->getSecurityPolicy()->callMethod($this, $tmp, ' . var_export($method, true) . ', array' . $args . ') : null)';
+                        $output = '(($tmp = '.$output.') ? $this->getSecurityPolicy()->callMethod($this, $tmp, '.var_export($method, true).', array'.$args.') : null)';
                     }
                 } else {
                     if ($curBlock === 'root') {
-                        $output .= '->' . $parsedCall;
+                        $output .= '->'.$parsedCall;
                     } else {
-                        $output = '(($tmp = ' . $output . ') ? $tmp->' . $parsedCall . ' : null)';
+                        $output = '(($tmp = '.$output.') ? $tmp->'.$parsedCall.' : null)';
                     }
                 }
             }
@@ -2666,21 +2664,21 @@ 
             return '$this->scope';
         }
         if (substr($key, 0, 1) === '.') {
-            $key = 'dwoo' . $key;
+            $key = 'dwoo'.$key;
         }
         if (preg_match('#dwoo\.(get|post|server|cookies|session|env|request)((?:\.[a-z0-9_-]+)+)#i', $key, $m)) {
             $global = strtoupper($m[1]);
             if ($global === 'COOKIES') {
                 $global = 'COOKIE';
             }
-            $key = '$_' . $global;
+            $key = '$_'.$global;
             foreach (explode('.', ltrim($m[2], '.')) as $part) {
-                $key .= '[' . var_export($part, true) . ']';
+                $key .= '['.var_export($part, true).']';
             }
             if ($curBlock === 'root') {
                 $output = $key;
             } else {
-                $output = '(isset(' . $key . ')?' . $key . ':null)';
+                $output = '(isset('.$key.')?'.$key.':null)';
             }
         } elseif (preg_match('#dwoo\\.const\\.([a-z0-9\\\\_:]+)#i', $key, $m)) {
             return $this->parseConstKey($m[1], $curBlock);
@@ -2696,9 +2694,9 @@ 
                     $output = '$tmp_key';
                 } else {
                     if ($curBlock === 'root') {
-                        $output = '$this->scope["' . $key . '"]';
+                        $output = '$this->scope["'.$key.'"]';
                     } else {
-                        $output = '(isset($this->scope["' . $key . '"]) ? $this->scope["' . $key . '"] : null)';
+                        $output = '(isset($this->scope["'.$key.'"]) ? $this->scope["'.$key.'"] : null)';
                     }
                 }
             } else {
@@ -2709,7 +2707,7 @@ 
                     $parentCnt = 0;
 
                     while (true) {
-                        ++ $parentCnt;
+                        ++$parentCnt;
                         array_shift($m[2]);
                         array_shift($m[1]);
                         if (current($m[2]) === '_parent') {
@@ -2718,7 +2716,7 @@ 
                         break;
                     }
 
-                    $output = '$this->readParentVar(' . $parentCnt . ')';
+                    $output = '$this->readParentVar('.$parentCnt.')';
                 } else {
                     if ($i === 'dwoo') {
                         $output = '$this->globals';
@@ -2737,28 +2735,28 @@ 
                     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) == "'") {
-                            $output .= '[' . $m[2][0] . ']';
+                            $output .= '['.$m[2][0].']';
                         } else {
-                            $output .= '["' . $m[2][0] . '"]';
+                            $output .= '["'.$m[2][0].'"]';
                         }
                         array_shift($m[2]);
                         array_shift($m[1]);
                     }
 
                     if ($curBlock !== 'root') {
-                        $output = '(isset(' . $output . ') ? ' . $output . ':null)';
+                        $output = '(isset('.$output.') ? '.$output.':null)';
                     }
                 }
 
                 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 {
             preg_match_all('#(\[|->|\.)?((?:[a-z0-9_]|-(?!>))+)\]?#i', $key, $m);
             unset($m[0]);
-            $output = '$this->readVar(' . str_replace("\n", '', var_export($m, true)) . ')';
+            $output = '$this->readVar('.str_replace("\n", '', var_export($m, true)).')';
         }
 
         return $output;
@@ -2778,38 +2776,38 @@ 
         $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) === '$') {
-                    $out .= '".' . $this->parseVar($key, 0, strlen($key), false, 'variable') . '."';
+                    $out .= '".'.$this->parseVar($key, 0, strlen($key), false, 'variable').'."';
                 } else {
                     $cnt = substr_count($key, '$');
 
                     if ($this->debug) {
-                        echo 'PARSING SUBVARS IN : ' . $key . "\n";
+                        echo 'PARSING SUBVARS IN : '.$key."\n";
                     }
                     if ($cnt > 0) {
-                        while (-- $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, '$');
                             }
-                            preg_match('#\$[a-z0-9_]+((?:(?:\.|->)(?:[a-z0-9_]+|(?R))|\[(?:[a-z0-9_]+|(?R))\]))*' . '((?:(?:[+/*%-])(?:\$[a-z0-9.[\]>_:-]+(?:\([^)]*\))?|[0-9.,]*))*)#i', substr($key, $last), $submatch);
+                            preg_match('#\$[a-z0-9_]+((?:(?:\.|->)(?:[a-z0-9_]+|(?R))|\[(?:[a-z0-9_]+|(?R))\]))*'.'((?:(?:[+/*%-])(?:\$[a-z0-9.[\]>_:-]+(?:\([^)]*\))?|[0-9.,]*))*)#i', substr($key, $last), $submatch);
 
                             $len = strlen($submatch[0]);
                             $key = substr_replace(
                                 $key, preg_replace_callback(
-                                    '#(\$[a-z0-9_]+((?:(?:\.|->)(?:[a-z0-9_]+|(?R))|\[(?:[a-z0-9_]+|(?R))\]))*)' . '((?:(?:[+/*%-])(?:\$[a-z0-9.[\]>_:-]+(?:\([^)]*\))?|[0-9.,]*))*)#i', array(
+                                    '#(\$[a-z0-9_]+((?:(?:\.|->)(?:[a-z0-9_]+|(?R))|\[(?:[a-z0-9_]+|(?R))\]))*)'.'((?:(?:[+/*%-])(?:\$[a-z0-9.[\]>_:-]+(?:\([^)]*\))?|[0-9.,]*))*)#i', array(
                                         $this,
                                         'replaceVarKeyHelper'
                                     ), substr($key, $last, $len)
                                 ), $last, $len
                             );
                             if ($this->debug) {
-                                echo 'RECURSIVE VAR REPLACEMENT DONE : ' . $key . "\n";
+                                echo 'RECURSIVE VAR REPLACEMENT DONE : '.$key."\n";
                             }
                         }
                         unset($last);
@@ -2835,7 +2833,7 @@ 
      */
     protected function replaceVarKeyHelper($match)
     {
-        return '".' . $this->parseVar($match[0], 0, strlen($match[0]), false, 'variable') . '."';
+        return '".'.$this->parseVar($match[0], 0, strlen($match[0]), false, 'variable').'."';
     }
 
     /**
@@ -2855,7 +2853,7 @@ 
      */
     protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
-        $substr = substr($in, $from, $to - $from);
+        $substr = substr($in, $from, $to-$from);
 
         $end = strlen($substr);
 
@@ -2929,48 +2927,48 @@ 
 
         if (strtolower($substr) === 'false' || strtolower($substr) === 'no' || strtolower($substr) === 'off') {
             if ($this->debug) {
-                echo 'BOOLEAN(FALSE) PARSED' . "\n";
+                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";
+                echo 'BOOLEAN(TRUE) PARSED'."\n";
             }
             $substr = 'true';
             $type   = self::T_BOOL;
         } elseif ($substr === 'null' || $substr === 'NULL') {
             if ($this->debug) {
-                echo 'NULL PARSED' . "\n";
+                echo 'NULL PARSED'."\n";
             }
             $substr = 'null';
             $type   = self::T_NULL;
         } elseif (is_numeric($substr)) {
-            $substr = (float)$substr;
-            if ((int)$substr == $substr) {
-                $substr = (int)$substr;
+            $substr = (float) $substr;
+            if ((int) $substr == $substr) {
+                $substr = (int) $substr;
             }
             $type = self::T_NUMERIC;
             if ($this->debug) {
-                echo 'NUMBER (' . $substr . ') PARSED' . "\n";
+                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 . ')';
+            $substr = '('.$substr.')';
         } elseif ($curBlock === 'condition' && array_search($substr, $breakChars, true) !== false) {
             if ($this->debug) {
-                echo 'BREAKCHAR (' . $substr . ') PARSED' . "\n";
+                echo 'BREAKCHAR ('.$substr.') PARSED'."\n";
             }
             $type = self::T_BREAKCHAR;
             //$substr = '"'.$substr.'"';
         } else {
-            $substr = $this->replaceStringVars('\'' . str_replace('\'', '\\\'', $substr) . '\'', '\'', $curBlock);
+            $substr = $this->replaceStringVars('\''.str_replace('\'', '\\\'', $substr).'\'', '\'', $curBlock);
             $type   = self::T_UNQUOTED_STRING;
             if ($this->debug) {
-                echo 'BLABBER (' . $substr . ') CASTED AS STRING' . "\n";
+                echo 'BLABBER ('.$substr.') CASTED AS STRING'."\n";
             }
         }
 
@@ -3000,28 +2998,28 @@ 
     {
         $pos = 0;
         if ($this->debug) {
-            echo 'STRING VAR REPLACEMENT : ' . $string . "\n";
+            echo 'STRING VAR REPLACEMENT : '.$string."\n";
         }
         // replace vars
         while (($pos = strpos($string, '$', $pos)) !== false) {
-            $prev = substr($string, $pos - 1, 1);
+            $prev = substr($string, $pos-1, 1);
             if ($prev === '\\') {
-                ++ $pos;
+                ++$pos;
                 continue;
             }
 
             $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);
+            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);
+                $string = substr_replace($string, $first.'.'.$var[1].'.'.$first, $pos, $len);
             }
-            $pos += strlen($var[1]) + 2;
+            $pos += strlen($var[1])+2;
             if ($this->debug) {
-                echo 'STRING VAR REPLACEMENT DONE : ' . $string . "\n";
+                echo 'STRING VAR REPLACEMENT DONE : '.$string."\n";
             }
         }
 
@@ -3057,7 +3055,7 @@ 
     protected function replaceModifiers(array $m, $curBlock = null, &$pointer = null)
     {
         if ($this->debug) {
-            echo 'PARSING MODIFIERS : ' . $m[3] . "\n";
+            echo 'PARSING MODIFIERS : '.$m[3]."\n";
         }
 
         if ($pointer !== null) {
@@ -3081,7 +3079,7 @@ 
             }
             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";
+                    echo 'MODIFIER PARSING ENDED, RIGHT DELIMITER or ";" FOUND'."\n";
                 }
                 $continue = false;
                 if ($pointer !== null) {
@@ -3092,7 +3090,7 @@ 
             $cmdstr   = $cmdstrsrc;
             $paramsep = ':';
             if (!preg_match('/^(@{0,2}[a-z_][a-z0-9_]*)(:)?/i', $cmdstr, $match)) {
-                throw new CompilationException($this, 'Invalid modifier name, started with : ' . substr($cmdstr, 0, 10));
+                throw new CompilationException($this, 'Invalid modifier name, started with : '.substr($cmdstr, 0, 10));
             }
             $paramspos = !empty($match[2]) ? strlen($match[1]) : false;
             $func      = $match[1];
@@ -3102,10 +3100,10 @@ 
                 $cmdstrsrc = substr($cmdstrsrc, strlen($func));
                 $params    = array();
                 if ($this->debug) {
-                    echo 'MODIFIER (' . $func . ') CALLED WITH NO PARAMS' . "\n";
+                    echo 'MODIFIER ('.$func.') CALLED WITH NO PARAMS'."\n";
                 }
             } else {
-                $paramstr = substr($cmdstr, $paramspos + 1);
+                $paramstr = substr($cmdstr, $paramspos+1);
                 if (substr($paramstr, - 1, 1) === $paramsep) {
                     $paramstr = substr($paramstr, 0, - 1);
                 }
@@ -3114,41 +3112,41 @@ 
                 $params = array();
                 while ($ptr < strlen($paramstr)) {
                     if ($this->debug) {
-                        echo 'MODIFIER (' . $func . ') START PARAM PARSING WITH POINTER AT ' . $ptr . "\n";
+                        echo 'MODIFIER ('.$func.') START PARAM PARSING WITH POINTER AT '.$ptr."\n";
                     }
                     if ($this->debug) {
-                        echo $paramstr . '--' . $ptr . '--' . strlen($paramstr) . '--modifier' . "\n";
+                        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";
+                        echo 'PARAM PARSED, POINTER AT '.$ptr."\n";
                     }
 
                     if ($ptr >= strlen($paramstr)) {
                         if ($this->debug) {
-                            echo 'PARAM PARSING ENDED, PARAM STRING CONSUMED' . "\n";
+                            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";
+                            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;
+                        ++$ptr;
                         break;
                     }
                     if ($ptr < strlen($paramstr) && $paramstr[$ptr] === ':') {
-                        ++ $ptr;
+                        ++$ptr;
                     }
                 }
-                $cmdstrsrc = substr($cmdstrsrc, strlen($func) + 1 + $ptr);
+                $cmdstrsrc = substr($cmdstrsrc, strlen($func)+1+$ptr);
                 foreach ($params as $k => $p) {
                     if (is_array($p) && is_array($p[1])) {
                         $state |= 2;
@@ -3188,9 +3186,9 @@ 
                 $params = self::implode_r($params);
 
                 if ($mapped) {
-                    $output = '$this->arrayMap(\'' . $func . '\', array(' . $params . '))';
+                    $output = '$this->arrayMap(\''.$func.'\', array('.$params.'))';
                 } else {
-                    $output = $func . '(' . $params . ')';
+                    $output = $func.'('.$params.')';
                 }
             } elseif ($pluginType & Core::PROXY_PLUGIN) {
                 $params = $this->mapParams($params, $this->getCore()->getPluginProxy()->getCallback($func), $state);
@@ -3208,19 +3206,19 @@ 
                     $callback = $this->customPlugins[$func]['callback'];
                     if (is_array($callback)) {
                         if (is_object($callback[0])) {
-                            $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array($this->getCustomPlugin(\'' . $func . '\'), \'' . $callback[1] . '\'), array(' . $params . '))';
+                            $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array').'(array($this->getCustomPlugin(\''.$func.'\'), \''.$callback[1].'\'), array('.$params.'))';
                         } else {
-                            $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array(\'' . $callback[0] . '\', \'' . $callback[1] . '\'), array(' . $params . '))';
+                            $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array').'(array(\''.$callback[0].'\', \''.$callback[1].'\'), array('.$params.'))';
                         }
                     } elseif ($mapped) {
-                        $output = '$this->arrayMap(\'' . $callback . '\', array(' . $params . '))';
+                        $output = '$this->arrayMap(\''.$callback.'\', array('.$params.'))';
                     } else {
-                        $output = $callback . '(' . $params . ')';
+                        $output = $callback.'('.$params.')';
                     }
                 } elseif ($mapped) {
-                    $output = '$this->arrayMap(\'smarty_modifier_' . $func . '\', array(' . $params . '))';
+                    $output = '$this->arrayMap(\'smarty_modifier_'.$func.'\', array('.$params.'))';
                 } else {
-                    $output = 'smarty_modifier_' . $func . '(' . $params . ')';
+                    $output = 'smarty_modifier_'.$func.'('.$params.')';
                 }
             } else {
                 if ($pluginType & Core::CUSTOM_PLUGIN) {
@@ -3230,17 +3228,17 @@ 
                         $callback   = array($pluginName, ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
                     }
                 } else {
-                    if (class_exists('Plugin' . Core::toCamelCase($func)) !== false || function_exists('Plugin' .
-                            Core::toCamelCase($func) . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''))
+                    if (class_exists('Plugin'.Core::toCamelCase($func)) !== false || function_exists('Plugin'.
+                            Core::toCamelCase($func).(($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : ''))
                         !== false) {
-                        $pluginName = 'Plugin' . Core::toCamelCase($func);
+                        $pluginName = 'Plugin'.Core::toCamelCase($func);
                     } else {
-                        $pluginName = Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func);
+                        $pluginName = Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func);
                     }
                     if ($pluginType & Core::CLASS_PLUGIN) {
                         $callback = array($pluginName, ($pluginType & Core::COMPILABLE_PLUGIN) ? 'compile' : 'process');
                     } else {
-                        $callback = $pluginName . (($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : '');
+                        $callback = $pluginName.(($pluginType & Core::COMPILABLE_PLUGIN) ? 'Compile' : '');
                     }
                 }
                 $params = $this->mapParams($params, $callback, $state);
@@ -3258,10 +3256,10 @@ 
                         if ($pluginType & Core::CUSTOM_PLUGIN) {
                             $funcCompiler = $this->customPlugins[$func]['callback'];
                         } else {
-                            if (function_exists('Plugin' . Core::toCamelCase($func) . 'Compile') !== false) {
-                                $funcCompiler = 'Plugin' . Core::toCamelCase($func) . 'Compile';
+                            if (function_exists('Plugin'.Core::toCamelCase($func).'Compile') !== false) {
+                                $funcCompiler = 'Plugin'.Core::toCamelCase($func).'Compile';
                             } else {
-                                $funcCompiler = Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func) .
+                                $funcCompiler = Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func).
                                     'Compile';
                             }
                         }
@@ -3272,9 +3270,9 @@ 
 
                         $params = self::implode_r($params);
                         if ($mapped) {
-                            $output = '$this->arrayMap(\'' . $pluginName . '\', array(' . $params . '))';
+                            $output = '$this->arrayMap(\''.$pluginName.'\', array('.$params.'))';
                         } else {
-                            $output = $pluginName . '(' . $params . ')';
+                            $output = $pluginName.'('.$params.')';
                         }
                     }
                 } else {
@@ -3286,7 +3284,7 @@ 
                             $callback = $this->customPlugins[$func]['callback'];
                             if (!is_array($callback)) {
                                 if (!method_exists($callback, 'compile')) {
-                                    throw new Exception('Custom plugin ' . $func . ' must implement the "compile" method to be compilable, or you should provide a full callback to the method to use');
+                                    throw new Exception('Custom plugin '.$func.' must implement the "compile" method to be compilable, or you should provide a full callback to the method to use');
                                 }
                                 if (($ref = new ReflectionMethod($callback, 'compile')) && $ref->isStatic()) {
                                     $funcCompiler = array($callback, 'compile');
@@ -3297,10 +3295,10 @@ 
                                 $funcCompiler = $callback;
                             }
                         } else {
-                            if (class_exists('Plugin' . Core::toCamelCase($func)) !== false) {
-                                $funcCompiler = array('Plugin' . Core::toCamelCase($func), 'compile');
+                            if (class_exists('Plugin'.Core::toCamelCase($func)) !== false) {
+                                $funcCompiler = array('Plugin'.Core::toCamelCase($func), 'compile');
                             } else {
-                                $funcCompiler = array(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func), 'compile');
+                                $funcCompiler = array(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func), 'compile');
                             }
                             array_unshift($params, $this);
                         }
@@ -3311,26 +3309,26 @@ 
                         if ($pluginType & Core::CUSTOM_PLUGIN) {
                             if (is_object($callback[0])) {
                                 if (is_array($this->getCore()->getCustomPlugin($func))) {
-                                    $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array($this->plugins[\'' . $func . '\'][\'callback\'][0], \'' . $callback[1] . '\'), array(' . $params . '))';
+                                    $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array').'(array($this->plugins[\''.$func.'\'][\'callback\'][0], \''.$callback[1].'\'), array('.$params.'))';
                                 } else {
-                                    $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array($this->getCustomPlugin(\'' . $func . '\'), \'' . $callback[1] . '\'), array(' . $params . '))';
+                                    $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array').'(array($this->getCustomPlugin(\''.$func.'\'), \''.$callback[1].'\'), array('.$params.'))';
                                 }
                             } else {
-                                $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array') . '(array(\'' . $callback[0] . '\', \'' . $callback[1] . '\'), array(' . $params . '))';
+                                $output = ($mapped ? '$this->arrayMap' : 'call_user_func_array').'(array(\''.$callback[0].'\', \''.$callback[1].'\'), array('.$params.'))';
                             }
                         } elseif ($mapped) {
                             $output = '$this->arrayMap(array($this->getObjectPlugin(\''.
-                                Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func) . '\'),
-                            \'process\'), array(' . $params . '))';
+                                Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func).'\'),
+                            \'process\'), array(' . $params.'))';
                         } else {
-                            if (class_exists('Plugin' . Core::toCamelCase($func)) !== false) {
-                                $output = '$this->classCall(\'Plugin' . Core::toCamelCase($func) . '\', array(' . $params . '))';
-                            } elseif (class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($func)) !== false) {
-                                $output = '$this->classCall(\'' . Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . $func . '\', array(' . $params . '))';
-                            } elseif (class_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($func)) !== false) {
-                                $output = '$this->classCall(\'' . Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . $func . '\', array(' . $params . '))';
+                            if (class_exists('Plugin'.Core::toCamelCase($func)) !== false) {
+                                $output = '$this->classCall(\'Plugin'.Core::toCamelCase($func).'\', array('.$params.'))';
+                            } elseif (class_exists(Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($func)) !== false) {
+                                $output = '$this->classCall(\''.Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.$func.'\', array('.$params.'))';
+                            } elseif (class_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($func)) !== false) {
+                                $output = '$this->classCall(\''.Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.$func.'\', array('.$params.'))';
                             } else {
-                                $output = '$this->classCall(\'' . $func . '\', array(' . $params . '))';
+                                $output = '$this->classCall(\''.$func.'\', array('.$params.'))';
                             }
                         }
                     }
@@ -3343,7 +3341,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 '';
@@ -3366,14 +3364,14 @@ 
             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) . ', ';
+                    $out2 .= var_export($k2, true).' => '.(is_array($v) ? 'array('.self::implode_r($v, true).')' : $v).', ';
                 }
-                $p = rtrim($out2, ', ') . ')';
+                $p = rtrim($out2, ', ').')';
             }
             if ($recursiveCall) {
-                $out .= var_export($k, true) . ' => ' . $p . ', ';
+                $out .= var_export($k, true).' => '.$p.', ';
             } else {
-                $out .= $p . ', ';
+                $out .= $p.', ';
             }
         }
 
@@ -3397,7 +3395,7 @@ 
         if (($this->securityPolicy === null && (function_exists($name) || strtolower($name) === 'isset' || strtolower($name) === 'empty')) || ($this->securityPolicy !== null && array_key_exists(strtolower($name), $this->securityPolicy->getAllowedPhpFunctions()) !== false)) {
             $phpFunc = true;
         } elseif ($this->securityPolicy !== null && function_exists($name) && array_key_exists(strtolower($name), $this->securityPolicy->getAllowedPhpFunctions()) === false) {
-            throw new SecurityException('Call to a disallowed php function : ' . $name);
+            throw new SecurityException('Call to a disallowed php function : '.$name);
         }
 
         while ($pluginType <= 0) {
@@ -3408,61 +3406,61 @@ 
             elseif (isset($this->customPlugins[$name])) {
                 $pluginType = $this->customPlugins[$name]['type'] | Core::CUSTOM_PLUGIN;
             } // Class blocks plugin
-            elseif (class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($name)) !== false) {
+            elseif (class_exists(Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($name)) !== false) {
                 $pluginType = Core::CLASS_PLUGIN;
-                if (is_subclass_of(Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($name), 'Dwoo\Block\Plugin')) {
+                if (is_subclass_of(Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($name), 'Dwoo\Block\Plugin')) {
                     $pluginType += Core::BLOCK_PLUGIN;
                 }
-                $interfaces = class_implements(Core::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . Core::toCamelCase($name));
+                $interfaces = class_implements(Core::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.Core::toCamelCase($name));
                 if (in_array('Dwoo\ICompilable', $interfaces) !== false || in_array('Dwoo\ICompilable\Block', $interfaces) !== false) {
                     $pluginType |= Core::COMPILABLE_PLUGIN;
                 }
             } // Class functions plugin
-            elseif (class_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($name)) !== false) {
-                $pluginType = Core::FUNC_PLUGIN + Core::CLASS_PLUGIN;
-                $interfaces = class_implements(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($name));
+            elseif (class_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($name)) !== false) {
+                $pluginType = Core::FUNC_PLUGIN+Core::CLASS_PLUGIN;
+                $interfaces = class_implements(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($name));
                 if (in_array('Dwoo\ICompilable', $interfaces) !== false || in_array('Dwoo\ICompilable\Block', $interfaces) !== false) {
                     $pluginType |= Core::COMPILABLE_PLUGIN;
                 }
             } // Class without namespace
-            elseif (class_exists('Plugin' . Core::toCamelCase($name)) !== false) {
+            elseif (class_exists('Plugin'.Core::toCamelCase($name)) !== false) {
                 $pluginType = Core::CLASS_PLUGIN;
-                if (is_subclass_of('Plugin' . Core::toCamelCase($name), 'Dwoo\Block\Plugin')) {
+                if (is_subclass_of('Plugin'.Core::toCamelCase($name), 'Dwoo\Block\Plugin')) {
                     $pluginType += Core::BLOCK_PLUGIN;
                 }
-                $interfaces = class_implements('Plugin' . Core::toCamelCase($name));
+                $interfaces = class_implements('Plugin'.Core::toCamelCase($name));
                 if (in_array('Dwoo\ICompilable', $interfaces) !== false || in_array('Dwoo\ICompilable\Block', $interfaces) !== false) {
                     $pluginType |= Core::COMPILABLE_PLUGIN;
                 }
             } // Function plugin (with/without namespaces)
-            elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase ($name)) !==
-                false || function_exists('Plugin' . Core::toCamelCase($name)) !== false) {
+            elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($name)) !==
+                false || function_exists('Plugin'.Core::toCamelCase($name)) !== false) {
                 $pluginType = Core::FUNC_PLUGIN;
             } // Function plugin compile (with/without namespaces)
-            elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin' . Core::toCamelCase($name) .
-                    'Compile') !== false || function_exists('Plugin' . Core::toCamelCase($name) . 'Compile') !==
+            elseif (function_exists(Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin'.Core::toCamelCase($name).
+                    'Compile') !== false || function_exists('Plugin'.Core::toCamelCase($name).'Compile') !==
                 false) {
                 $pluginType = Core::FUNC_PLUGIN | Core::COMPILABLE_PLUGIN;
             } // Helper plugin class compile
-            elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($name)) !== false) {
+            elseif (class_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($name)) !== false) {
                 $pluginType = Core::CLASS_PLUGIN | Core::COMPILABLE_PLUGIN;
             } // Helper plugin function compile
-            elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS . 'Plugin' . Core::toCamelCase($name) . 'Compile') !== false) {
+            elseif (function_exists(Core::NAMESPACE_PLUGINS_HELPERS.'Plugin'.Core::toCamelCase($name).'Compile') !== false) {
                 $pluginType = Core::FUNC_PLUGIN | Core::COMPILABLE_PLUGIN;
             } // Smarty modifier
-            elseif (function_exists('smarty_modifier_' . $name) !== false) {
+            elseif (function_exists('smarty_modifier_'.$name) !== false) {
                 $pluginType = Core::SMARTY_MODIFIER;
             } // Smarty function
-            elseif (function_exists('smarty_function_' . $name) !== false) {
+            elseif (function_exists('smarty_function_'.$name) !== false) {
                 $pluginType = Core::SMARTY_FUNCTION;
             } // Smarty block
-            elseif (function_exists('smarty_block_' . $name) !== false) {
+            elseif (function_exists('smarty_block_'.$name) !== false) {
                 $pluginType = Core::SMARTY_BLOCK;
             } // Everything else
             else {
                 if ($pluginType === - 1) {
                     try {
-                        $this->getCore()->getLoader()->loadPlugin('Plugin' . Core::toCamelCase($name));
+                        $this->getCore()->getLoader()->loadPlugin('Plugin'.Core::toCamelCase($name));
                     }
                     catch (Exception $e) {
                         if (isset($phpFunc)) {
@@ -3475,9 +3473,9 @@ 
                         }
                     }
                 } else {
-                    throw new Exception('Plugin "' . $name . '" could not be found, type:' . $pluginType);
+                    throw new Exception('Plugin "'.$name.'" could not be found, type:'.$pluginType);
                 }
-                ++ $pluginType;
+                ++$pluginType;
             }
         }
 
@@ -3546,15 +3544,15 @@ 
         }
 
         // loops over the param map and assigns values from the template or default value for unset optional params
-        foreach ($map as $k => $v){
+        foreach ($map as $k => $v) {
             if ($v[0] === '*') {
                 // "rest" array parameter, fill every remaining params in it and then break
                 if (count($ps) === 0) {
                     if ($v[1] === false) {
                         throw new CompilationException(
-                            $this, 'Rest argument missing for ' . str_replace(
+                            $this, 'Rest argument missing for '.str_replace(
                                 array(
-                                    Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin',
+                                    Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin',
                                 'Compile'
                                 ), '', (is_array($callback) ? $callback[0] : $callback)
                             )
@@ -3587,7 +3585,7 @@ 
                 // 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];
                     }
@@ -3596,9 +3594,9 @@ 
                 }
 
                 throw new CompilationException(
-                    $this, 'Argument ' . $k . '/' . $v[0] . ' missing for ' . str_replace(
+                    $this, 'Argument '.$k.'/'.$v[0].' missing for '.str_replace(
                         array(
-                            Core::NAMESPACE_PLUGINS_FUNCTIONS . 'Plugin',
+                            Core::NAMESPACE_PLUGINS_FUNCTIONS.'Plugin',
                         'Compile'
                         ), '', $name
                     )

lib/Dwoo/Core.php

Spacing +35 added lines, -35 removed lines

@@ -377,8 +377,8 @@ 
             }
 
             if ($doCache === true) {
-                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*' . $dynamicId . '*/ echo \'$1\'; ?>', $out);
-                if (!class_exists(self::NAMESPACE_PLUGINS_BLOCKS . 'PluginDynamic')) {
+                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*'.$dynamicId.'*/ echo \'$1\'; ?>', $out);
+                if (!class_exists(self::NAMESPACE_PLUGINS_BLOCKS.'PluginDynamic')) {
                     $this->getLoader()->loadPlugin('PluginDynamic');
                 }
                 $out = PluginDynamic::unescape($out, $dynamicId, $compiledTemplate);
@@ -588,16 +588,16 @@ 
     public function addFilter($callback, $autoload = false)
     {
         if ($autoload) {
-            $class = self::NAMESPACE_PLUGINS_FILTERS . self::toCamelCase($callback);
+            $class = self::NAMESPACE_PLUGINS_FILTERS.self::toCamelCase($callback);
             if (!class_exists($class) && !function_exists($class)) {
                 try {
                     $this->getLoader()->loadPlugin($callback);
                 }
                 catch (Exception $e) {
                     if (strstr($callback, self::NAMESPACE_PLUGINS_FILTERS)) {
-                        throw new Exception('Wrong filter name : ' . $callback . ', the "Filter" prefix should not be used, please only use "' . str_replace('Filter', '', $callback) . '"');
+                        throw new Exception('Wrong filter name : '.$callback.', the "Filter" prefix should not be used, please only use "'.str_replace('Filter', '', $callback).'"');
                     } else {
-                        throw new Exception('Wrong filter name : ' . $callback . ', when using autoload the filter must be in one of your plugin dir as "name.php" containig a class or function named "Filter<name>"');
+                        throw new Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containig a class or function named "Filter<name>"');
                     }
                 }
             }
@@ -607,7 +607,7 @@ 
             } elseif (function_exists($class)) {
                 $callback = $class;
             } else {
-                throw new Exception('Wrong filter name : ' . $callback . ', when using autoload the filter must be in one of your plugin dir as "name.php" containig a class or function named "Filter<name>"');
+                throw new Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containig a class or function named "Filter<name>"');
             }
 
             $this->filters[] = $callback;
@@ -625,14 +625,14 @@ 
      */
     public function removeFilter($callback)
     {
-        if (($index = array_search(self::NAMESPACE_PLUGINS_FILTERS. 'Filter' . self::toCamelCase($callback), $this->filters,
+        if (($index = array_search(self::NAMESPACE_PLUGINS_FILTERS.'Filter'.self::toCamelCase($callback), $this->filters,
                 true)) !==
             false) {
             unset($this->filters[$index]);
         } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
             unset($this->filters[$index]);
         } else {
-            $class = self::NAMESPACE_PLUGINS_FILTERS . 'Filter' . $callback;
+            $class = self::NAMESPACE_PLUGINS_FILTERS.'Filter'.$callback;
             foreach ($this->filters as $index => $filter) {
                 if (is_array($filter) && $filter[0] instanceof $class) {
                     unset($this->filters[$index]);
@@ -755,7 +755,7 @@ 
     public function getCacheDir()
     {
         if ($this->cacheDir === null) {
-            $this->setCacheDir(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'cache' . DIRECTORY_SEPARATOR);
+            $this->setCacheDir(dirname(__DIR__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR);
         }
 
         return $this->cacheDir;
@@ -771,12 +771,12 @@ 
      */
     public function setCacheDir($dir)
     {
-        $this->cacheDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $this->cacheDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
         if (!file_exists($this->cacheDir)) {
             mkdir($this->cacheDir, 0777, true);
         }
         if (is_writable($this->cacheDir) === false) {
-            throw new Exception('The cache directory must be writable, chmod "' . $this->cacheDir . '" to make it writable');
+            throw new Exception('The cache directory must be writable, chmod "'.$this->cacheDir.'" to make it writable');
         }
     }
 
@@ -788,7 +788,7 @@ 
     public function getCompileDir()
     {
         if ($this->compileDir === null) {
-            $this->setCompileDir(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'compiled' . DIRECTORY_SEPARATOR);
+            $this->setCompileDir(dirname(__DIR__).DIRECTORY_SEPARATOR.'compiled'.DIRECTORY_SEPARATOR);
         }
 
         return $this->compileDir;
@@ -804,12 +804,12 @@ 
      */
     public function setCompileDir($dir)
     {
-        $this->compileDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $this->compileDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
         if (!file_exists($this->compileDir)) {
             mkdir($this->compileDir, 0777, true);
         }
         if (is_writable($this->compileDir) === false) {
-            throw new Exception('The compile directory must be writable, chmod "' . $this->compileDir . '" to make it writable');
+            throw new Exception('The compile directory must be writable, chmod "'.$this->compileDir.'" to make it writable');
         }
     }
 
@@ -833,9 +833,9 @@ 
      */
     public function setTemplateDir($dir)
     {
-        $tmpDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $tmpDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
         if (is_dir($tmpDir) === false) {
-            throw new Exception('The template directory: "' . $tmpDir . '" does not exists, create the directory or specify an other location !');
+            throw new Exception('The template directory: "'.$tmpDir.'" does not exists, create the directory or specify an other location !');
         }
         $this->templateDir[] = $tmpDir;
     }
@@ -859,7 +859,7 @@ 
      */
     public function setCacheTime($seconds)
     {
-        $this->cacheTime = (int)$seconds;
+        $this->cacheTime = (int) $seconds;
     }
 
     /**
@@ -883,7 +883,7 @@ 
      */
     public function setCharset($charset)
     {
-        $this->charset = strtolower((string)$charset);
+        $this->charset = strtolower((string) $charset);
     }
 
     /**
@@ -1020,11 +1020,11 @@ 
     public function clearCache($olderThan = - 1)
     {
         $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getCacheDir()), \RecursiveIteratorIterator::SELF_FIRST);
-        $expired  = time() - $olderThan;
+        $expired  = time()-$olderThan;
         $count    = 0;
         foreach ($iterator as $file) {
             if ($file->isFile() && $file->getCTime() < $expired) {
-                $count += unlink((string)$file) ? 1 : 0;
+                $count += unlink((string) $file) ? 1 : 0;
             }
         }
 
@@ -1057,7 +1057,7 @@ 
             return $class::templateFactory($this, $resourceId, $cacheTime, $cacheId, $compileId, $parentTemplate);
         }
 
-        throw new Exception('Unknown resource type : ' . $resourceName);
+        throw new Exception('Unknown resource type : '.$resourceName);
     }
 
     /**
@@ -1157,7 +1157,7 @@ 
         if (!($tplIdentifier = $this->template->getResourceIdentifier())) {
             $tplIdentifier = $this->template->getResourceName();
         }
-        trigger_error('Dwoo error (in ' . $tplIdentifier . ') : ' . $message, $level);
+        trigger_error('Dwoo error (in '.$tplIdentifier.') : '.$message, $level);
     }
 
     /**
@@ -1174,8 +1174,8 @@ 
             $class = $this->plugins[$blockName]['class'];
         } else {
             $class = current(array_filter([
-                'Plugin' . self::toCamelCase($blockName),
-                self::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . self::toCamelCase($blockName)
+                'Plugin'.self::toCamelCase($blockName),
+                self::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.self::toCamelCase($blockName)
             ], 'class_exists'));
         }
 
@@ -1239,7 +1239,7 @@ 
     {
         $index = array_search($block, $this->stack, true);
         if ($index !== false && $index > 0) {
-            return $this->stack[$index - 1];
+            return $this->stack[$index-1];
         }
 
         return false;
@@ -1257,7 +1257,7 @@ 
         if (isset($this->plugins[$type])) {
             $type = $this->plugins[$type]['class'];
         } else {
-            $type = self::NAMESPACE_PLUGINS_BLOCKS . 'Plugin_' . str_replace(self::NAMESPACE_PLUGINS_BLOCKS.'Plugin',
+            $type = self::NAMESPACE_PLUGINS_BLOCKS.'Plugin_'.str_replace(self::NAMESPACE_PLUGINS_BLOCKS.'Plugin',
                     '', $type);
         }
 
@@ -1335,7 +1335,7 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1 => $items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1 => $items[$i])+$params);
                     }
                 } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
@@ -1351,7 +1351,7 @@ 
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array(1 => $items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array(1 => $items[$i])+$params);
                     }
                 }
             } else {
@@ -1360,7 +1360,7 @@ 
 
                 if (is_string($callback) === false) {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
                 } elseif ($cnt === 1) {
                     while (($i = array_shift($keys)) !== null) {
@@ -1380,7 +1380,7 @@ 
                     }
                 } else {
                     while (($i = array_shift($keys)) !== null) {
-                        $out[] = call_user_func_array($callback, array($items[$i]) + $params);
+                        $out[] = call_user_func_array($callback, array($items[$i])+$params);
                     }
                 }
             }
@@ -1450,7 +1450,7 @@ 
         $tree = $this->scopeTree;
         $cur  = $this->data;
 
-        while ($parentLevels -- !== 0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1488,7 +1488,7 @@ 
                 } elseif ($varstr === '__' || $varstr === '_root') {
                     return $this->data;
                 } elseif ($varstr === '_' || $varstr === '_parent') {
-                    $varstr = '.' . $varstr;
+                    $varstr = '.'.$varstr;
                     $tree   = $this->scopeTree;
                     $cur    = $this->data;
                     array_pop($tree);
@@ -1514,7 +1514,7 @@ 
             }
 
             if (substr($varstr, 0, 1) === '.') {
-                $varstr = 'dwoo' . $varstr;
+                $varstr = 'dwoo'.$varstr;
             }
 
             preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
@@ -1621,7 +1621,7 @@ 
     public function assignInScope($value, $scope)
     {
         if (!is_string($scope)) {
-            $this->triggerError('Assignments must be done into strings, (' . gettype($scope) . ') ' . var_export($scope, true) . ' given', E_USER_ERROR);
+            $this->triggerError('Assignments must be done into strings, ('.gettype($scope).') '.var_export($scope, true).' given', E_USER_ERROR);
         }
         if (strstr($scope, '.') === false && strstr($scope, '->') === false) {
             $this->scope[$scope] = $value;
@@ -1772,7 +1772,7 @@ 
     {
         $proxy = $this->getPluginProxy();
         if (!$proxy) {
-            throw new Exception('Call to undefined method ' . __CLASS__ . '::' . $method . '()');
+            throw new Exception('Call to undefined method '.__CLASS__.'::'.$method.'()');
         }
 
         return call_user_func_array($proxy->getCallback($method), $args);