dwoo-project / dwoo

lib/Dwoo/Adapters/ZendFramework/PluginProxy.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     /**
      * Dwoo_Adapters_ZendFramework_PluginProxy's constructor.
      *
-     * @param Zend_View_Interface $view
+     * @param Dwoo_Adapters_ZendFramework_View $view
      */
     public function __construct(Zend_View_Interface $view)
     {

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/Adapters/CodeIgniter/libraries/Dwootemplate.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      * @param string $sTemplate
      * @param bool   $return
      *
-     * @return mixed
+     * @return null|string
      */
     public function display($sTemplate, $return = false)
     {

lib/Dwoo/Adapters/ZendFramework/View.php

Doc Comments +1 added lines, -2 removed lines

@@ -87,7 +87,6 @@ 
      *  - type class name or object for engine, dataProvider or compiler
      *  - any set* method (compileDir for setCompileDir ...)
      *
-     * @param array $options
      *
      * @return Dwoo_Adapters_ZendFramework_View
      */
@@ -279,6 +278,7 @@ 
      * Sets Dwoo data object.
      *
      * @param string|Dwoo_Data Object or name of the class
+     * @param Dwoo_Data $data
      */
     public function setDataProvider($data)
     {
@@ -441,7 +441,6 @@ 
      * Processes a view script and outputs it. Output is then
      * passed through filters.
      *
-     * @param string $name The script script name to process
      *
      * @return string The script output
      */

lib/Dwoo/Compiler.php

Doc Comments +3 added lines, -3 removed lines

@@ -274,7 +274,7 @@ 
     /**
      * returns the left and right template delimiters.
      *
-     * @return array containing the left and the right delimiters
+     * @return string[] containing the left and the right delimiters
      */
     public function getDelimiters()
     {
@@ -366,7 +366,7 @@ 
      * adds a preprocessor to the compiler, it will be called
      * before the template is compiled.
      *
-     * @param mixed $callback either a valid callback to the preprocessor or a simple name if the autoload is set to true
+     * @param string $callback either a valid callback to the preprocessor or a simple name if the autoload is set to true
      * @param bool  $autoload if set to true, the preprocessor is auto-loaded from one of the plugin directories, else you must provide a valid callback
      */
     public function addPreProcessor($callback, $autoload = false)
@@ -1287,7 +1287,7 @@ 
      *
      * @param array $params parameter array
      *
-     * @return array tokens
+     * @return Dwoo_Compiler tokens
      */
     public function getParamTokens(array $params)
     {

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

Doc Comments -1 removed lines

@@ -70,7 +70,6 @@
      * merges the given array(s) with the current data with array_merge.
      *
      * @param array $data  the array to merge
-     * @param array $data2 $data3 ... other arrays to merge, optional, etc
      */
     public function mergeData(array $data)
     {

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/ICompiler.php

Doc Comments +3 added lines, -1 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * compiles the provided string down to php code.
      *
-     * @param string $templateStr the template to compile
+     * @param string $template the template to compile
      *
      * @return string a compiled php code string
      */
@@ -39,6 +39,7 @@ 
      * @see Dwoo_Core::addPlugin
      *
      * @param array $customPlugins an array of custom plugins
+     * @return void
      */
     public function setCustomPlugins(array $customPlugins);
 
@@ -49,6 +50,7 @@ 
      * set it on the Dwoo object as it will be passed onto the compiler automatically
      *
      * @param Dwoo_Security_Policy $policy the security policy object
+     * @return void
      */
     public function setSecurityPolicy(Dwoo_Security_Policy $policy = null);
 }

lib/Dwoo/Loader.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 
     protected $corePluginDir;
 
+    /**
+     * @param string $cacheDir
+     */
     public function __construct($cacheDir)
     {
         $this->corePluginDir = DWOO_DIRECTORY.'plugins';

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/Template/String.php

Doc Comments +1 added lines, -1 removed lines

@@ -286,7 +286,7 @@
      * @param Dwoo_Core $dwoo   the dwoo instance that requests it
      * @param string    $output the template output
      *
-     * @return mixed full path of the cached file or false upon failure
+     * @return false|string full path of the cached file or false upon failure
      */
     public function cache(Dwoo_Core $dwoo, $output)
     {

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));
     }
 
     /**