dwoo-project / dwoo

lib/Dwoo/Plugin.php

Spacing +7 added lines, -7 removed lines

@@ -79,24 +79,24 @@
 
         $out = '';
         foreach ($params as $attr => $val) {
-            $out .= ' ' . $attr . '=';
+            $out .= ' '.$attr.'=';
             if (trim($val, '"\'') == '' || $val == 'null') {
-                $out .= str_replace($delim, '\\' . $delim, '""');
+                $out .= str_replace($delim, '\\'.$delim, '""');
             } elseif (substr($val, 0, 1) === $delim && substr($val, - 1) === $delim) {
-                $out .= str_replace($delim, '\\' . $delim, '"' . substr($val, 1, - 1) . '"');
+                $out .= str_replace($delim, '\\'.$delim, '"'.substr($val, 1, - 1).'"');
             } else {
                 if (!$compiler) {
                     // disable double encoding since it can not be determined if it was encoded
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset, false) : $tmp2).';
                 } elseif (!$compiler->getAutoEscape() || false === strpos($val, 'isset($this->scope')) {
                     // escape if auto escaping is disabled, or there was no variable in the string
-                    $escapedVal = '.(is_string($tmp2=' . $val . ') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
+                    $escapedVal = '.(is_string($tmp2='.$val.') ? htmlspecialchars($tmp2, ENT_QUOTES, $this->charset) : $tmp2).';
                 } else {
                     // print as is
-                    $escapedVal = '.' . $val . '.';
+                    $escapedVal = '.'.$val.'.';
                 }
 
-                $out .= str_replace($delim, '\\' . $delim, '"') . $delim . $escapedVal . $delim . str_replace($delim, '\\' . $delim, '"');
+                $out .= str_replace($delim, '\\'.$delim, '"').$delim.$escapedVal.$delim.str_replace($delim, '\\'.$delim, '"');
             }
         }
 

lib/Dwoo/Loader.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
         $cacheFile = $this->cacheDir.'classpath.cache.d'.Dwoo_Core::RELEASE_TAG.'.php';
         if (file_exists($cacheFile)) {
             $classpath = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
+            $this->classPath = unserialize($classpath)+$this->classPath;
         } else {
             $this->rebuildClassPathCache($this->corePluginDir, $cacheFile);
         }
@@ -153,7 +153,7 @@ 
         $this->paths[$pluginDir] = $cacheFile;
         if (file_exists($cacheFile)) {
             $classpath = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
+            $this->classPath = unserialize($classpath)+$this->classPath;
         } else {
             $this->rebuildClassPathCache($pluginDir, $cacheFile);
         }

lib/Dwoo/Compiler.php

Spacing +80 added lines, -80 removed lines

@@ -788,23 +788,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 (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 Dwoo_Compilation_Exception($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);
@@ -836,7 +836,7 @@ 
                         continue 2;
                     }
 
-                    $len = $subptr - $ptr;
+                    $len = $subptr-$ptr;
                     $this->push($parsed, substr_count(substr($tpl, $ptr, $len), "\n"));
                     $ptr += $len;
 
@@ -932,7 +932,7 @@ 
             $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";
         }
@@ -980,7 +980,7 @@ 
 
         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'])) {
@@ -1068,7 +1068,7 @@ 
         $params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
         $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);
     }
@@ -1094,7 +1094,7 @@ 
         $params = $this->mapParams($params, array($class, 'init'), $paramtype);
 
         $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);
     }
@@ -1118,7 +1118,7 @@ 
             $this->dwoo->getLoader()->loadPlugin($type);
         }
         $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];
     }
 
     /**
@@ -1151,7 +1151,7 @@ 
                     $class = 'Dwoo_Plugin_'.$top['type'];
                 }
                 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'), $this, $top['params'], '', '', $top['buffer']), 0);
                 } else {
                     $null = null;
@@ -1241,7 +1241,7 @@ 
             $class = 'Dwoo_Plugin_'.$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']);
     }
@@ -1353,16 +1353,16 @@ 
             $first = $in[$from];
         }
 
-        $substr = substr($in, $from, $to - $from);
+        $substr = substr($in, $from, $to-$from);
 
         if ($this->debug) {
-            echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to - $from, 50))).(($to - $from) > 50 ? '...' : '').'</b>" @ '.$from.':'.$to.' in '.$curBlock.' : pointer='.$pointer."\n";
+            echo 'PARSE CALL : PARSING "<b>'.htmlentities(substr($in, $from, min($to-$from, 50))).(($to-$from) > 50 ? '...' : '').'</b>" @ '.$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 {
@@ -1378,7 +1378,7 @@ 
                 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) {
@@ -1393,33 +1393,33 @@ 
 
                         if ($open !== false && $close !== false) {
                             if ($open < $close) {
-                                $ptr = $open + strlen($comOpen);
+                                $ptr = $open+strlen($comOpen);
                                 ++$level;
                             } else {
-                                $ptr = $close + strlen($comClose);
+                                $ptr = $close+strlen($comClose);
                                 --$level;
                             }
                         } elseif ($open !== false) {
-                            $ptr = $open + strlen($comOpen);
+                            $ptr = $open+strlen($comOpen);
                             ++$level;
                         } elseif ($close !== false) {
-                            $ptr = $close + strlen($comClose);
+                            $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);
                     if ($endpos == false) {
                         throw new Dwoo_Compilation_Exception($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;
@@ -1449,7 +1449,7 @@ 
                 ++$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') {
@@ -1491,14 +1491,14 @@ 
                 echo 'NAMED PARAM FOUND'."\n";
             }
             $len = strlen($match[1]);
-            while (substr($in, $from + $len, 1) === ' ') {
+            while (substr($in, $from+$len, 1) === ' ') {
                 ++$len;
             }
             if ($pointer !== null) {
                 $pointer += $len;
             }
 
-            $output = array(trim($match[1], " \t\r\n=>'\""), $this->parse($in, $from + $len, $to, false, 'namedparam', $pointer));
+            $output = array(trim($match[1], " \t\r\n=>'\""), $this->parse($in, $from+$len, $to, false, 'namedparam', $pointer));
 
             $parsingParams[] = $output;
 
@@ -1518,14 +1518,14 @@ 
             $out = $this->parseOthers($in, $from, $to, $parsingParams, $curBlock, $pointer);
         } else {
             // parse error
-            throw new Dwoo_Compilation_Exception($this, 'Parse error in "'.substr($in, $from, $to - $from).'"');
+            throw new Dwoo_Compilation_Exception($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') {
@@ -1534,15 +1534,15 @@ 
                     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);
@@ -1610,7 +1610,7 @@ 
                     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));
@@ -1625,9 +1625,9 @@ 
             // parse modifier on funcs or vars
             $srcPointer = $pointer;
             if (is_array($parsingParams)) {
-                $tmp = $this->replaceModifiers(array(null, null, $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);
+                $tmp = $this->replaceModifiers(array(null, null, $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);
             } else {
                 $out = $this->replaceModifiers(array(null, null, $out, $match[0]), $curBlock, $pointer);
             }
@@ -1639,10 +1639,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);
             }
@@ -1675,7 +1675,7 @@ 
      */
     protected function parseFunction($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
-        $cmdstr = substr($in, $from, $to - $from);
+        $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])) {
@@ -1701,7 +1701,7 @@ 
             $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) {
@@ -1730,8 +1730,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);
             }
@@ -1794,7 +1794,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";
                         }
                     }
                 }
@@ -1818,9 +1818,9 @@ 
         }
 
         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";
             }
         }
 
@@ -2062,29 +2062,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 Dwoo_Compilation_Exception($this, 'Unfinished string, started with '.substr($in, $from, $to - $from));
+                throw new Dwoo_Compilation_Exception($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);
@@ -2093,7 +2093,7 @@ 
         $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) === '}') {
@@ -2107,7 +2107,7 @@ 
             if ($pointer !== null) {
                 $pointer += $ptr;
             }
-            $srcOutput .= substr($substr, $strend + 1 - $from, $ptr);
+            $srcOutput .= substr($substr, $strend+1-$from, $ptr);
         }
 
         if (is_array($parsingParams)) {
@@ -2137,7 +2137,7 @@ 
      */
     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";
@@ -2203,12 +2203,12 @@ 
      */
     protected function parseVar($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
-        $substr = substr($in, $from, $to - $from);
+        $substr = substr($in, $from, $to-$from);
 
-        if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)'. // var key
-            ($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'expression' || $curBlock === 'delimited_string' ? '(\(.*)?' : '()'). // method call
-            ($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)' : '()'). // simple math expressions
-            ($curBlock !== 'modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?' : '(())'). // modifiers
+        if (preg_match('#(\$?\.?[a-z0-9_:]*(?:(?:(?:\.|->)(?:[a-z0-9_:]+|(?R))|\[(?:[a-z0-9_:]+|(?R)|(["\'])[^\2]*?\2)\]))*)'.// var key
+            ($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'expression' || $curBlock === 'delimited_string' ? '(\(.*)?' : '()').// method call
+            ($curBlock === 'root' || $curBlock === 'function' || $curBlock === 'namedparam' || $curBlock === 'condition' || $curBlock === 'variable' || $curBlock === 'delimited_string' ? '((?:(?:[+/*%=-])(?:(?<!=)=?-?[$%][a-z0-9.[\]>_:-]+(?:\([^)]*\))?|(?<!=)=?-?[0-9.,]*|[+-]))*)' : '()').// simple math expressions
+            ($curBlock !== 'modifier' ? '((?:\|(?:@?[a-z0-9_]+(?:(?::("|\').*?\5|:[^`]*))*))+)?' : '(())').// modifiers
             '#i', $substr, $match)) {
             $key = substr($match[1], 1);
 
@@ -2223,8 +2223,8 @@ 
             }
 
             if ($hasMethodCall) {
-                $matchedLength -= strlen($match[3]) + strlen(substr($match[1], strrpos($match[1], '->')));
-                $key = substr($match[1], 1, strrpos($match[1], '->') - 1);
+                $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];
             }
 
@@ -2266,7 +2266,7 @@ 
                             ++$bracketCount;
                         } else {
                             $tree[] = &$current;
-                            $current[$uid] = array($uid + 1 => '');
+                            $current[$uid] = array($uid+1 => '');
                             $current = &$current[$uid++];
                             $curTxt = &$current[$uid++];
                             continue;
@@ -2275,7 +2275,7 @@ 
                         if ($bracketCount > 0) {
                             --$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] = '';
@@ -2439,7 +2439,7 @@ 
                 // method
                 if (substr($methMatch[2], 0, 2) === '()') {
                     $parsedCall = $methMatch[1].'()';
-                    $ptr += strlen($methMatch[1]) + 2;
+                    $ptr += strlen($methMatch[1])+2;
                 } else {
                     $parsedCall = $this->parseFunction($methodCall, $ptr, strlen($methodCall), false, 'method', $ptr);
                 }
@@ -2608,7 +2608,7 @@ 
                     if ($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, '$');
                             }
@@ -2673,7 +2673,7 @@ 
     protected function parseOthers($in, $from, $to, $parsingParams = false, $curBlock = '', &$pointer = null)
     {
         $first = $in[$from];
-        $substr = substr($in, $from, $to - $from);
+        $substr = substr($in, $from, $to-$from);
 
         $end = strlen($substr);
 
@@ -2790,7 +2790,7 @@ 
         }
         // replace vars
         while (($pos = strpos($string, '$', $pos)) !== false) {
-            $prev = substr($string, $pos - 1, 1);
+            $prev = substr($string, $pos-1, 1);
             if ($prev === '\\') {
                 ++$pos;
                 continue;
@@ -2800,12 +2800,12 @@ 
             $len = $var[0];
             $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);
             }
-            $pos += strlen($var[1]) + 2;
+            $pos += strlen($var[1])+2;
             if ($this->debug) {
                 echo 'STRING VAR REPLACEMENT DONE : '.$string."\n";
             }
@@ -2886,7 +2886,7 @@ 
                     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);
                 }
@@ -2919,7 +2919,7 @@ 
                         if ($paramstr[$ptr] !== '|') {
                             $continue = false;
                             if ($pointer !== null) {
-                                $pointer -= strlen($paramstr) - $ptr;
+                                $pointer -= strlen($paramstr)-$ptr;
                             }
                         }
                         ++$ptr;
@@ -2929,7 +2929,7 @@ 
                         ++$ptr;
                     }
                 }
-                $cmdstrsrc = substr($cmdstrsrc, strlen($func) + 1 + $ptr);
+                $cmdstrsrc = substr($cmdstrsrc, strlen($func)+1+$ptr);
                 $paramstr = substr($paramstr, 0, $ptr);
                 foreach ($params as $k => $p) {
                     if (is_array($p) && is_array($p[1])) {

lib/Dwoo/Data.php

Spacing +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
                 }
 
                 if ($merge === true && is_array($val)) {
-                    $this->data[$key] = $val + $this->data[$key];
+                    $this->data[$key] = $val+$this->data[$key];
                 } else {
                     $this->data[$key][] = $val;
                 }
@@ -156,7 +156,7 @@ 
             }
 
             if ($merge === true && is_array($val)) {
-                $this->data[$name] = $val + $this->data[$name];
+                $this->data[$name] = $val+$this->data[$name];
             } else {
                 $this->data[$name][] = $val;
             }

lib/Dwoo/Smarty/Adapter.php

Spacing +4 added lines, -4 removed lines

@@ -5,10 +5,10 @@
 }
 
 if (!defined('SMARTY_PHP_PASSTHRU')) {
-    define('SMARTY_PHP_PASSTHRU',   0);
-    define('SMARTY_PHP_QUOTE',      1);
-    define('SMARTY_PHP_REMOVE',     2);
-    define('SMARTY_PHP_ALLOW',      3);
+    define('SMARTY_PHP_PASSTHRU', 0);
+    define('SMARTY_PHP_QUOTE', 1);
+    define('SMARTY_PHP_REMOVE', 2);
+    define('SMARTY_PHP_ALLOW', 3);
 }
 
 /**

lib/Dwoo/Template/String.php

Spacing +2 added lines, -2 removed lines

@@ -269,7 +269,7 @@ 
         if (isset(self::$cache['cached'][$this->cacheId]) === true && file_exists($cachedFile)) {
             // already checked, return cache file
             return $cachedFile;
-        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME'] - $cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
+        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === -1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($dwoo))) {
             // cache is still valid and can be loaded
             self::$cache['cached'][$this->cacheId] = true;
 
@@ -335,7 +335,7 @@ 
     {
         $cachedFile = $this->getCacheFilename($dwoo);
 
-        return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+        return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
     }
 
     /**

lib/Dwoo/Core.php

Spacing +33 added lines, -33 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!defined('DWOO_DIRECTORY')) {
-    define('DWOO_DIRECTORY', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR);
+    define('DWOO_DIRECTORY', dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR);
 }
 
 /**
@@ -374,7 +374,7 @@ 
             }
 
             if ($doCache === true) {
-                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*' . $dynamicId . '*/ echo \'$1\'; ?>', $out);
+                $out = preg_replace('/(<%|%>|<\?php|<\?|\?>)/', '<?php /*'.$dynamicId.'*/ echo \'$1\'; ?>', $out);
                 if (!class_exists('Dwoo_plugin_dynamic')) {
                     $this->getLoader()->loadPlugin('dynamic');
                 }
@@ -550,7 +550,7 @@ 
     public function addFilter($callback, $autoload = false)
     {
         if ($autoload) {
-            $class = 'Dwoo_Filter_' . $callback;
+            $class = 'Dwoo_Filter_'.$callback;
 
             if (!class_exists($class) && !function_exists($class)) {
                 try {
@@ -558,9 +558,9 @@ 
                 }
                 catch (Dwoo_Exception $e) {
                     if (strstr($callback, 'Dwoo_Filter_')) {
-                        throw new Dwoo_Exception('Wrong filter name : ' . $callback . ', the "Dwoo_Filter_" prefix should not be used, please only use "' . str_replace('Dwoo_Filter_', '', $callback) . '"');
+                        throw new Dwoo_Exception('Wrong filter name : '.$callback.', the "Dwoo_Filter_" prefix should not be used, please only use "'.str_replace('Dwoo_Filter_', '', $callback).'"');
                     } else {
-                        throw new Dwoo_Exception('Wrong filter name : ' . $callback . ', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
+                        throw new Dwoo_Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
                     }
                 }
             }
@@ -573,7 +573,7 @@ 
             } elseif (function_exists($class)) {
                 $callback = $class;
             } else {
-                throw new Dwoo_Exception('Wrong filter name : ' . $callback . ', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
+                throw new Dwoo_Exception('Wrong filter name : '.$callback.', when using autoload the filter must be in one of your plugin dir as "name.php" containg a class or function named "Dwoo_Filter_name"');
             }
 
             $this->filters[] = $callback;
@@ -591,12 +591,12 @@ 
      */
     public function removeFilter($callback)
     {
-        if (($index = array_search('Dwoo_Filter_' . $callback, $this->filters, true)) !== false) {
+        if (($index = array_search('Dwoo_Filter_'.$callback, $this->filters, true)) !== false) {
             unset($this->filters[$index]);
         } elseif (($index = array_search($callback, $this->filters, true)) !== false) {
             unset($this->filters[$index]);
         } else {
-            $class = 'Dwoo_Filter_' . $callback;
+            $class = 'Dwoo_Filter_'.$callback;
             foreach ($this->filters as $index => $filter) {
                 if (is_array($filter) && $filter[0] instanceof $class) {
                     unset($this->filters[$index]);
@@ -702,7 +702,7 @@ 
     public function getCacheDir()
     {
         if ($this->cacheDir === null) {
-            $this->setCacheDir(DWOO_DIRECTORY . 'cache' . DIRECTORY_SEPARATOR);
+            $this->setCacheDir(DWOO_DIRECTORY.'cache'.DIRECTORY_SEPARATOR);
         }
 
         return $this->cacheDir;
@@ -718,9 +718,9 @@ 
      */
     public function setCacheDir($dir)
     {
-        $this->cacheDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $this->cacheDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
         if (is_writable($this->cacheDir) === false) {
-            throw new Dwoo_Exception('The cache directory must be writable, chmod "' . $this->cacheDir . '" to make it writable');
+            throw new Dwoo_Exception('The cache directory must be writable, chmod "'.$this->cacheDir.'" to make it writable');
         }
     }
 
@@ -732,7 +732,7 @@ 
     public function getCompileDir()
     {
         if ($this->compileDir === null) {
-            $this->setCompileDir(DWOO_DIRECTORY . 'compiled' . DIRECTORY_SEPARATOR);
+            $this->setCompileDir(DWOO_DIRECTORY.'compiled'.DIRECTORY_SEPARATOR);
         }
 
         return $this->compileDir;
@@ -748,9 +748,9 @@ 
      */
     public function setCompileDir($dir)
     {
-        $this->compileDir = rtrim($dir, '/\\') . DIRECTORY_SEPARATOR;
+        $this->compileDir = rtrim($dir, '/\\').DIRECTORY_SEPARATOR;
         if (is_writable($this->compileDir) === false) {
-            throw new Dwoo_Exception('The compile directory must be writable, chmod "' . $this->compileDir . '" to make it writable');
+            throw new Dwoo_Exception('The compile directory must be writable, chmod "'.$this->compileDir.'" to make it writable');
         }
     }
 
@@ -773,7 +773,7 @@ 
      */
     public function setCacheTime($seconds)
     {
-        $this->cacheTime = (int)$seconds;
+        $this->cacheTime = (int) $seconds;
     }
 
     /**
@@ -797,7 +797,7 @@ 
      */
     public function setCharset($charset)
     {
-        $this->charset = strtolower((string)$charset);
+        $this->charset = strtolower((string) $charset);
     }
 
     /**
@@ -934,11 +934,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;
             }
         }
 
@@ -968,7 +968,7 @@ 
             ), $this, $resourceId, $cacheTime, $cacheId, $compileId, $parentTemplate);
         }
 
-        throw new Dwoo_Exception('Unknown resource type : ' . $resourceName);
+        throw new Dwoo_Exception('Unknown resource type : '.$resourceName);
     }
 
     /**
@@ -1068,7 +1068,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);
     }
 
     /**
@@ -1084,7 +1084,7 @@ 
         if (isset($this->plugins[$blockName])) {
             $class = $this->plugins[$blockName]['class'];
         } else {
-            $class = 'Dwoo_Plugin_' . $blockName;
+            $class = 'Dwoo_Plugin_'.$blockName;
         }
 
         if ($this->curBlock !== null) {
@@ -1179,7 +1179,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;
@@ -1197,7 +1197,7 @@ 
         if (isset($this->plugins[$type])) {
             $type = $this->plugins[$type]['class'];
         } else {
-            $type = 'Dwoo_Plugin_' . str_replace('Dwoo_Plugin_', '', $type);
+            $type = 'Dwoo_Plugin_'.str_replace('Dwoo_Plugin_', '', $type);
         }
 
         $keys = array_keys($this->stack);
@@ -1238,7 +1238,7 @@ 
      */
     public function classCall($plugName, array $params = array())
     {
-        $class = 'Dwoo_Plugin_' . $plugName;
+        $class = 'Dwoo_Plugin_'.$plugName;
 
         $plugin = $this->getObjectPlugin($class);
 
@@ -1291,7 +1291,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) {
@@ -1307,7 +1307,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 {
@@ -1316,7 +1316,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) {
@@ -1336,7 +1336,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);
                     }
                 }
             }
@@ -1406,7 +1406,7 @@ 
         $tree = $this->scopeTree;
         $cur  = $this->data;
 
-        while ($parentLevels -- !== 0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1444,7 +1444,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);
@@ -1470,7 +1470,7 @@ 
             }
 
             if (substr($varstr, 0, 1) === '.') {
-                $varstr = 'dwoo' . $varstr;
+                $varstr = 'dwoo'.$varstr;
             }
 
             preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
@@ -1580,7 +1580,7 @@ 
         $data = &$this->data;
 
         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;
@@ -1731,7 +1731,7 @@ 
     {
         $proxy = $this->getPluginProxy();
         if (!$proxy) {
-            throw new Dwoo_Exception('Call to undefined method ' . __CLASS__ . '::' . $method . '()');
+            throw new Dwoo_Exception('Call to undefined method '.__CLASS__.'::'.$method.'()');
         }
 
         return call_user_func_array($proxy->getCallback($method), $args);

lib/plugins/builtin/blocks/if.php

Spacing +15 added lines, -15 removed lines

@@ -150,37 +150,37 @@ 
                     $p[] = $v;
                     break;
                 }
-                if (isset($params[$k + 1]) && strtolower(trim($params[$k + 1], '"\'')) === 'not' && $tokens[$k + 1] === Dwoo_Compiler::T_UNQUOTED_STRING) {
+                if (isset($params[$k+1]) && strtolower(trim($params[$k+1], '"\'')) === 'not' && $tokens[$k+1] === Dwoo_Compiler::T_UNQUOTED_STRING) {
                     $negate = true;
                     next($params);
                 } else {
                     $negate = false;
                 }
-                $ptr = 1 + (int) $negate;
-                if ($tokens[$k + $ptr] !== Dwoo_Compiler::T_UNQUOTED_STRING) {
+                $ptr = 1+(int) $negate;
+                if ($tokens[$k+$ptr] !== Dwoo_Compiler::T_UNQUOTED_STRING) {
                     break;
                 }
-                if (!isset($params[$k + $ptr])) {
-                    $params[$k + $ptr] = '';
+                if (!isset($params[$k+$ptr])) {
+                    $params[$k+$ptr] = '';
                 } else {
-                    $params[$k + $ptr] = trim($params[$k + $ptr], '"\'');
+                    $params[$k+$ptr] = trim($params[$k+$ptr], '"\'');
                 }
-                switch ($params[$k + $ptr]) {
+                switch ($params[$k+$ptr]) {
 
                 case 'div':
-                    if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                        $p[] = ' % '.$params[$k + $ptr + 2].' '.($negate ? '!' : '=').'== 0';
+                    if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
+                        $p[] = ' % '.$params[$k+$ptr+2].' '.($negate ? '!' : '=').'== 0';
                         next($params);
                         next($params);
                         next($params);
                     } else {
-                        throw new Dwoo_Compilation_Exception($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found '.$params[$k - 1].' is '.($negate ? 'not ' : '').'div '.$params[$k + $ptr + 1].' '.$params[$k + $ptr + 2]);
+                        throw new Dwoo_Compilation_Exception($compiler, 'If : Syntax error : syntax should be "if $a is [not] div by $b", found '.$params[$k-1].' is '.($negate ? 'not ' : '').'div '.$params[$k+$ptr+1].' '.$params[$k+$ptr+2]);
                     }
                     break;
                 case 'even':
                     $a = array_pop($p);
-                    if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                        $b = $params[$k + $ptr + 2];
+                    if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
+                        $b = $params[$k+$ptr+2];
                         $p[] = '('.$a.' / '.$b.') % 2 '.($negate ? '!' : '=').'== 0';
                         next($params);
                         next($params);
@@ -191,8 +191,8 @@ 
                     break;
                 case 'odd':
                     $a = array_pop($p);
-                    if (isset($params[$k + $ptr + 1]) && strtolower(trim($params[$k + $ptr + 1], '"\'')) === 'by') {
-                        $b = $params[$k + $ptr + 2];
+                    if (isset($params[$k+$ptr+1]) && strtolower(trim($params[$k+$ptr+1], '"\'')) === 'by') {
+                        $b = $params[$k+$ptr+2];
                         $p[] = '('.$a.' / '.$b.') % 2 '.($negate ? '=' : '!').'== 0';
                         next($params);
                         next($params);
@@ -202,7 +202,7 @@ 
                     next($params);
                     break;
                 default:
-                    throw new Dwoo_Compilation_Exception($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found '.$params[$k - 1].' is '.$params[$k + $ptr + 1]);
+                    throw new Dwoo_Compilation_Exception($compiler, 'If : Syntax error : syntax should be "if $a is [not] (div|even|odd) [by $b]", found '.$params[$k-1].' is '.$params[$k+$ptr+1]);
 
                 }
                 break;

lib/plugins/builtin/blocks/textformat.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
         $this->wrapCut = (bool) $wrap_cut;
         $this->indent = (int) $indent;
         $this->indChar = (string) $indent_char;
-        $this->indFirst = (int) $indent_first + $this->indent;
+        $this->indFirst = (int) $indent_first+$this->indent;
         $this->assign = (string) $assign;
     }
 
@@ -82,7 +82,7 @@ 
             $pgs[$i] = str_repeat($this->indChar, $this->indFirst).
                     wordwrap(
                             $pgs[$i],
-                            max($this->wrap - $this->indent, 1),
+                            max($this->wrap-$this->indent, 1),
                             $this->wrapChar.str_repeat($this->indChar, $this->indent),
                             $this->wrapCut
                     );