dwoo-project / dwoo

lib/Dwoo/Plugins/Functions/PluginDefault.php

Spacing +1 added lines, -1 removed lines

@@ -40,6 +40,6 @@
      */
     public static function compile(Compiler $compiler, $value, $default = '')
     {
-        return '(($tmp = ' . $value . ')===null||$tmp===\'\' ? ' . $default . ' : $tmp)';
+        return '(($tmp = '.$value.')===null||$tmp===\'\' ? '.$default.' : $tmp)';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginCat.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public static function compile(Compiler $compiler, $value, array $rest)
     {
-        return '(' . $value . ').(' . implode(').(', $rest) . ')';
+        return '('.$value.').('.implode(').(', $rest).')';
     }
 }

lib/Dwoo/Plugins/Functions/PluginCountCharacters.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
     public static function compile(Compiler $compiler, $value, $count_spaces = false)
     {
         if ($count_spaces === 'false') {
-            return 'preg_match_all(\'#[^\s\pZ]#u\', ' . $value . ', $tmp)';
+            return 'preg_match_all(\'#[^\s\pZ]#u\', '.$value.', $tmp)';
         }
 
-        return 'mb_strlen(' . $value . ', $this->charset)';
+        return 'mb_strlen('.$value.', $this->charset)';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginExtendsCheck.php

Spacing +9 added lines, -9 removed lines

@@ -45,29 +45,29 @@
 
         if ($tpl === null) {
             throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . ':' . $identifier . '" not found.');
+                'Load Templates : Resource "'.$resource.':'.$identifier.'" not found.');
         } elseif ($tpl === false) {
             throw new CompilationException($compiler,
-                'Load Templates : Resource "' . $resource . '" does not support includes.');
+                'Load Templates : Resource "'.$resource.'" does not support includes.');
         }
 
-        $out = '\'\';// checking for modification in ' . $resource . ':' . $identifier . "\r\n";
+        $out = '\'\';// checking for modification in '.$resource.':'.$identifier."\r\n";
 
         $modCheck = $tpl->getIsModifiedCode();
 
         if ($modCheck) {
-            $out .= 'if (!(' . $modCheck . ')) { ob_end_clean(); return false; }';
+            $out .= 'if (!('.$modCheck.')) { ob_end_clean(); return false; }';
         } else {
             $out .= 'try {
-	$tpl = $this->templateFactory("' . $resource . '", "' . $identifier . '");
+	$tpl = $this->templateFactory("' . $resource.'", "'.$identifier.'");
 } catch (Dwoo\Exception $e) {
-	$this->triggerError(\'Load Templates : Resource <em>' . $resource . '</em> was not added to Dwoo, can not extend <em>' . $identifier . '</em>\', E_USER_WARNING);
+	$this->triggerError(\'Load Templates : Resource <em>' . $resource.'</em> was not added to Dwoo, can not extend <em>'.$identifier.'</em>\', E_USER_WARNING);
 }
 if ($tpl === null)
-	$this->triggerError(\'Load Templates : Resource "' . $resource . ':' . $identifier . '" was not found.\', E_USER_WARNING);
+	$this->triggerError(\'Load Templates : Resource "' . $resource.':'.$identifier.'" was not found.\', E_USER_WARNING);
 elseif ($tpl === false)
-	$this->triggerError(\'Load Templates : Resource "' . $resource . '" does not support extends.\', E_USER_WARNING);
-if ($tpl->getUid() != "' . $tpl->getUid() . '") { ob_end_clean(); return false; }';
+	$this->triggerError(\'Load Templates : Resource "' . $resource.'" does not support extends.\', E_USER_WARNING);
+if ($tpl->getUid() != "' . $tpl->getUid().'") { ob_end_clean(); return false; }';
         }
 
         return $out;

lib/Dwoo/Plugins/Functions/PluginNl2br.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
      */
     public static function compile(Compiler $compiler, $value)
     {
-        return 'nl2br((string) ' . $value . ')';
+        return 'nl2br((string) '.$value.')';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Functions/PluginMath.php

Spacing +13 added lines, -13 removed lines

@@ -121,8 +121,8 @@ 
             $equation);
 
         $delim      = $equation[0];
-        $open       = $delim . '.';
-        $close      = '.' . $delim;
+        $open       = $delim.'.';
+        $close      = '.'.$delim;
         $equation   = substr($equation, 1, - 1);
         $out        = '';
         $ptr        = 1;
@@ -139,7 +139,7 @@ 
                 $out .= $substr;
                 $equation = substr($equation, $ptr);
                 $ptr      = 0;
-                ++ $allowcomma;
+                ++$allowcomma;
                 if ($allowcomma === 1) {
                     $allowed[] = ',';
                 }
@@ -150,17 +150,17 @@ 
                 $ptr      = 0;
             } elseif ($substr === $open) {
                 // pre-replaced variable
-                preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+                preg_match('#.*\((?:[^()]*?|(?R))\)'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
                 if (empty($m)) {
-                    preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+                    preg_match('#.*?'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
                 }
                 $out .= substr($m[0], 0, - 2);
-                $equation = substr($equation, strlen($m[0]) + 2);
+                $equation = substr($equation, strlen($m[0])+2);
                 $ptr      = 0;
             } elseif ($substr === '(') {
                 // opening parenthesis
                 if ($allowcomma > 0) {
-                    ++ $allowcomma;
+                    ++$allowcomma;
                 }
 
                 $out .= $substr;
@@ -169,7 +169,7 @@ 
             } elseif ($substr === ')') {
                 // closing parenthesis
                 if ($allowcomma > 0) {
-                    -- $allowcomma;
+                    --$allowcomma;
                     if ($allowcomma === 0) {
                         array_pop($allowed);
                     }
@@ -181,19 +181,19 @@ 
             } elseif ($ptr >= strlen($equation)) {
                 // parse error if we've consumed the entire equation without finding anything valid
                 throw new CompilationException($compiler,
-                    'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
+                    'Math : Syntax error or variable undefined in equation '.$equationSrc.' at '.$substr);
             } else {
                 // nothing special, advance
-                ++ $ptr;
+                ++$ptr;
             }
         }
         if ($format !== '\'\'') {
-            $out = 'sprintf(' . $format . ', ' . $out . ')';
+            $out = 'sprintf('.$format.', '.$out.')';
         }
         if ($assign !== '\'\'') {
-            return '($this->assignInScope(' . $out . ', ' . $assign . '))';
+            return '($this->assignInScope('.$out.', '.$assign.'))';
         }
 
-        return '(' . $out . ')';
+        return '('.$out.')';
     }
 }
\ No newline at end of file

lib/Dwoo/Plugins/Helpers/PluginArray.php

Spacing +3 added lines, -3 removed lines

@@ -46,11 +46,11 @@
         $out = array();
         foreach ($rest as $key => $value) {
             if (!is_numeric($key) && !strstr($key, '$this->scope')) {
-                $key = "'" . $key . "'";
+                $key = "'".$key."'";
             }
-            $out[] = $key . '=>' . $value;
+            $out[] = $key.'=>'.$value;
         }
 
-        return 'array(' . implode(', ', $out) . ')';
+        return 'array('.implode(', ', $out).')';
     }
 }
\ No newline at end of file

lib/Dwoo/Core.php

Spacing +35 added lines, -35 removed lines

@@ -383,8 +383,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);
@@ -585,7 +585,7 @@ 
     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);
@@ -593,12 +593,12 @@ 
                 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) . '"'
+                            '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
+                            '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>"'
                         );
@@ -612,7 +612,7 @@ 
                 $callback = $class;
             } else {
                 throw new Exception(
-                    'Wrong filter name : ' . $callback . ', when using autoload the filter must be in
+                    '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>"'
                 );
             }
@@ -632,14 +632,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]);
@@ -762,7 +762,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;
@@ -778,9 +778,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 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');
         }
     }
 
@@ -792,7 +792,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;
@@ -808,9 +808,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 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');
         }
     }
 
@@ -834,9 +834,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;
     }
@@ -860,7 +860,7 @@ 
      */
     public function setCacheTime($seconds)
     {
-        $this->cacheTime = (int)$seconds;
+        $this->cacheTime = (int) $seconds;
     }
 
     /**
@@ -884,7 +884,7 @@ 
      */
     public function setCharset($charset)
     {
-        $this->charset = strtolower((string)$charset);
+        $this->charset = strtolower((string) $charset);
     }
 
     /**
@@ -1021,11 +1021,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;
             }
         }
 
@@ -1058,7 +1058,7 @@ 
             return $class::templateFactory($this, $resourceId, $cacheTime, $cacheId, $compileId, $parentTemplate);
         }
 
-        throw new Exception('Unknown resource type : ' . $resourceName);
+        throw new Exception('Unknown resource type : '.$resourceName);
     }
 
     /**
@@ -1158,7 +1158,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,7 +1174,7 @@ 
         if (isset($this->plugins[$blockName])) {
             $class = $this->plugins[$blockName]['class'];
         } else {
-            $class = self::NAMESPACE_PLUGINS_BLOCKS . 'Plugin' . self::toCamelCase($blockName);
+            $class = self::NAMESPACE_PLUGINS_BLOCKS.'Plugin'.self::toCamelCase($blockName);
         }
 
         if ($this->curBlock !== null) {
@@ -1237,7 +1237,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;
@@ -1255,7 +1255,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);
         }
 
@@ -1333,7 +1333,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) {
@@ -1349,7 +1349,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 {
@@ -1358,7 +1358,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) {
@@ -1378,7 +1378,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);
                     }
                 }
             }
@@ -1448,7 +1448,7 @@ 
         $tree = $this->scopeTree;
         $cur  = $this->data;
 
-        while ($parentLevels -- !== 0) {
+        while ($parentLevels-- !== 0) {
             array_pop($tree);
         }
 
@@ -1486,7 +1486,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);
@@ -1512,7 +1512,7 @@ 
             }
 
             if (substr($varstr, 0, 1) === '.') {
-                $varstr = 'dwoo' . $varstr;
+                $varstr = 'dwoo'.$varstr;
             }
 
             preg_match_all('#(\[|->|\.)?((?:[^.[\]-]|-(?!>))+)\]?#i', $varstr, $m);
@@ -1619,7 +1619,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;
@@ -1770,7 +1770,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);

lib/Dwoo/Data.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
     {
         if (is_array($name)) {
             reset($name);
-            foreach ($name as $k => $v){
+            foreach ($name as $k => $v) {
                 $this->data[$k] = $v;
             }
         } else {
@@ -146,7 +146,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;
                 }
@@ -159,7 +159,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;
             }
@@ -258,7 +258,7 @@ 
         if (isset($this->data[$name])) {
             return $this->data[$name];
         } else {
-            throw new Exception('Tried to read a value that was not assigned yet : "' . $name . '"');
+            throw new Exception('Tried to read a value that was not assigned yet : "'.$name.'"');
         }
     }
 }