dwoo-project / dwoo

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/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.'"');
         }
     }
 }

lib/Dwoo/Plugins/Functions/PluginDump.php

Spacing +22 added lines, -22 removed lines

@@ -70,7 +70,7 @@ 
 
         $out .= $this->export($var, $scope);
 
-        return $out . '</div></div>';
+        return $out.'</div></div>';
     }
 
     /**
@@ -84,16 +84,16 @@ 
         $out = '';
         foreach ($var as $i => $v) {
             if (is_array($v) || (is_object($v) && $v instanceof Iterator)) {
-                $out .= $i . ' (' . (is_array($v) ? 'array' : 'object: ' . get_class($v)) . ')';
+                $out .= $i.' ('.(is_array($v) ? 'array' : 'object: '.get_class($v)).')';
                 if ($v === $scope) {
-                    $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">' . $this->export($v, $scope) . '</div>';
+                    $out .= ' (current scope):<div style="background:#ccc;padding-left:20px;">'.$this->export($v, $scope).'</div>';
                 } else {
-                    $out .= ':<div style="padding-left:20px;">' . $this->export($v, $scope) . '</div>';
+                    $out .= ':<div style="padding-left:20px;">'.$this->export($v, $scope).'</div>';
                 }
             } elseif (is_object($v)) {
-                $out .= $this->exportObj($i . ' (object: ' . get_class($v) . '):', $v);
+                $out .= $this->exportObj($i.' (object: '.get_class($v).'):', $v);
             } else {
-                $out .= $this->exportVar($i . ' = ', $v);
+                $out .= $this->exportVar($i.' = ', $v);
             }
         }
 
@@ -109,13 +109,13 @@ 
     protected function exportVar($i, $v)
     {
         if (is_string($v) || is_bool($v) || is_numeric($v)) {
-            return $i . htmlentities(var_export($v, true)) . '<br />';
+            return $i.htmlentities(var_export($v, true)).'<br />';
         } elseif (is_null($v)) {
-            return $i . 'null<br />';
+            return $i.'null<br />';
         } elseif (is_resource($v)) {
-            return $i . 'resource(' . get_resource_type($v) . ')<br />';
+            return $i.'resource('.get_resource_type($v).')<br />';
         } else {
-            return $i . htmlentities(var_export($v, true)) . '<br />';
+            return $i.htmlentities(var_export($v, true)).'<br />';
         }
     }
 
@@ -128,14 +128,14 @@ 
     protected function exportObj($i, $obj)
     {
         if (array_search($obj, $this->outputObjects, true) !== false) {
-            return $i . ' [recursion, skipped]<br />';
+            return $i.' [recursion, skipped]<br />';
         }
 
         $this->outputObjects[] = $obj;
 
-        $list = (array)$obj;
+        $list = (array) $obj;
 
-        $protectedLength = strlen(get_class($obj)) + 2;
+        $protectedLength = strlen(get_class($obj))+2;
 
         $out = array();
 
@@ -153,10 +153,10 @@ 
 
                 $params = array();
                 foreach ($method->getParameters() as $param) {
-                    $params[] = ($param->isPassedByReference() ? '&' : '') . '$' . $param->getName() . ($param->isOptional() ? ' = ' . var_export($param->getDefaultValue(), true) : '');
+                    $params[] = ($param->isPassedByReference() ? '&' : '').'$'.$param->getName().($param->isOptional() ? ' = '.var_export($param->getDefaultValue(), true) : '');
                 }
 
-                $out['method'] .= '(method) ' . $method->getName() . '(' . implode(', ', $params) . ')<br />';
+                $out['method'] .= '(method) '.$method->getName().'('.implode(', ', $params).')<br />';
             }
         }
 
@@ -175,19 +175,19 @@ 
                 $out[$key] = '';
             }
 
-            $out[$key] .= '(' . $key . ') ';
+            $out[$key] .= '('.$key.') ';
 
             if (is_array($attributeValue)) {
-                $out[$key] .= $attributeName . ' (array):<br />
-							<div style="padding-left:20px;">' . $this->export($attributeValue, false) . '</div>';
+                $out[$key] .= $attributeName.' (array):<br />
+							<div style="padding-left:20px;">' . $this->export($attributeValue, false).'</div>';
             } elseif (is_object($attributeValue)) {
-                $out[$key] .= $this->exportObj($attributeName . ' (object: ' . get_class($attributeValue) . '):', $attributeValue);
+                $out[$key] .= $this->exportObj($attributeName.' (object: '.get_class($attributeValue).'):', $attributeValue);
             } else {
-                $out[$key] .= $this->exportVar($attributeName . ' = ', $attributeValue);
+                $out[$key] .= $this->exportVar($attributeName.' = ', $attributeValue);
             }
         }
 
-        $return = $i . '<br /><div style="padding-left:20px;">';
+        $return = $i.'<br /><div style="padding-left:20px;">';
 
         if (!empty($out['method'])) {
             $return .= $out['method'];
@@ -205,6 +205,6 @@ 
             $return .= $out['private'];
         }
 
-        return $return . '</div>';
+        return $return.'</div>';
     }
 }

lib/Dwoo/Plugins/Functions/PluginCapitalize.php

Spacing +5 added lines, -5 removed lines

@@ -38,15 +38,15 @@
     public function process($value, $numwords = false)
     {
         if ($numwords || preg_match('#^[^0-9]+$#', $value)) {
-            return mb_convert_case((string)$value, MB_CASE_TITLE, $this->core->getCharset());
+            return mb_convert_case((string) $value, MB_CASE_TITLE, $this->core->getCharset());
         } else {
-            $bits = explode(' ', (string)$value);
+            $bits = explode(' ', (string) $value);
             $out  = '';
-            foreach ($bits as $k => $v){
+            foreach ($bits as $k => $v) {
                 if (preg_match('#^[^0-9]+$#', $v)) {
-                    $out .= ' ' . mb_convert_case($v, MB_CASE_TITLE, $this->core->getCharset());
+                    $out .= ' '.mb_convert_case($v, MB_CASE_TITLE, $this->core->getCharset());
                 } else {
-                    $out .= ' ' . $v;
+                    $out .= ' '.$v;
                 }
             }
 

lib/Dwoo/Plugins/Blocks/PluginWithelse.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         return '';
     }

lib/Dwoo/Plugins/Blocks/PluginElse.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         return '';
     }

lib/Dwoo/Plugins/Blocks/PluginForelse.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         }
 
         $block                      = &$compiler->getCurrentBlock();
-        $block['params']['hasElse'] = Compiler::PHP_OPEN . "else {\n" . Compiler::PHP_CLOSE . $content . Compiler::PHP_OPEN . "\n}" . Compiler::PHP_CLOSE;
+        $block['params']['hasElse'] = Compiler::PHP_OPEN."else {\n".Compiler::PHP_CLOSE.$content.Compiler::PHP_OPEN."\n}".Compiler::PHP_CLOSE;
 
         return '';
     }

lib/Dwoo/Template/Str.php

Spacing +13 added lines, -13 removed lines

@@ -124,13 +124,13 @@ 
         $this->cacheTime = $cacheTime;
 
         if ($compileId !== null) {
-            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->compileId = str_replace('../', '__', strtr($compileId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         } else {
             $this->compileId = $templateString;
         }
 
         if ($cacheId !== null) {
-            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+            $this->cacheId = str_replace('../', '__', strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
     }
 
@@ -277,7 +277,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($core))) {
+        } elseif ($this->compilationEnforced !== true && file_exists($cachedFile) && ($cacheLength === - 1 || filemtime($cachedFile) > ($_SERVER['REQUEST_TIME']-$cacheLength)) && $this->isValidCompiledFile($this->getCompiledFilename($core))) {
             // cache is still valid and can be loaded
             self::$cache['cached'][$this->cacheId] = true;
 
@@ -305,9 +305,9 @@ 
         // thanks for his help on avoiding concurency issues
         $temp = tempnam($cacheDir, 'temp');
         if (!($file = @fopen($temp, 'wb'))) {
-            $temp = $cacheDir . uniqid('temp');
+            $temp = $cacheDir.uniqid('temp');
             if (!($file = @fopen($temp, 'wb'))) {
-                trigger_error('Error writing temporary file \'' . $temp . '\'', E_USER_WARNING);
+                trigger_error('Error writing temporary file \''.$temp.'\'', E_USER_WARNING);
 
                 return false;
             }
@@ -343,7 +343,7 @@ 
     {
         $cachedFile = $this->getCacheFilename($core);
 
-        return !file_exists($cachedFile) || (filectime($cachedFile) < (time() - $olderThan) && unlink($cachedFile));
+        return !file_exists($cachedFile) || (filectime($cachedFile) < (time()-$olderThan) && unlink($cachedFile));
     }
 
     /**
@@ -446,7 +446,7 @@ 
      */
     protected function getCompiledFilename(Core $core)
     {
-        return $core->getCompileDir() . hash('md4', $this->compileId) . '.d' . Core::RELEASE_TAG . '.php';
+        return $core->getCompileDir().hash('md4', $this->compileId).'.d'.Core::RELEASE_TAG.'.php';
     }
 
     /**
@@ -464,7 +464,7 @@ 
             if (isset($_SERVER['REQUEST_URI']) === true) {
                 $cacheId = $_SERVER['REQUEST_URI'];
             } elseif (isset($_SERVER['SCRIPT_FILENAME']) && isset($_SERVER['argv'])) {
-                $cacheId = $_SERVER['SCRIPT_FILENAME'] . '-' . implode('-', $_SERVER['argv']);
+                $cacheId = $_SERVER['SCRIPT_FILENAME'].'-'.implode('-', $_SERVER['argv']);
             } else {
                 $cacheId = '';
             }
@@ -472,10 +472,10 @@ 
             $this->getCompiledFilename($core);
 
             $this->cacheId = str_replace('../', '__',
-                $this->compileId . strtr($cacheId, '\\%?=!:;' . PATH_SEPARATOR, '/-------'));
+                $this->compileId.strtr($cacheId, '\\%?=!:;'.PATH_SEPARATOR, '/-------'));
         }
 
-        return $core->getCacheDir() . $this->cacheId . '.html';
+        return $core->getCacheDir().$this->cacheId.'.html';
     }
 
     /**
@@ -512,7 +512,7 @@ 
         }
 
         $retries = 3;
-        while ($retries --) {
+        while ($retries--) {
             @mkdir($path, $chmod, true);
             if (is_dir($path)) {
                 break;
@@ -525,9 +525,9 @@ 
             $path    = strtr(str_replace($baseDir, '', $path), '\\', '/');
             $folders = explode('/', trim($path, '/'));
             foreach ($folders as $folder) {
-                $baseDir .= $folder . DIRECTORY_SEPARATOR;
+                $baseDir .= $folder.DIRECTORY_SEPARATOR;
                 if (!chmod($baseDir, $chmod)) {
-                    throw new Exception('Unable to chmod ' . "$baseDir to $chmod: " . print_r(error_get_last(), true));
+                    throw new Exception('Unable to chmod '."$baseDir to $chmod: ".print_r(error_get_last(), true));
                 }
             }
         }

lib/Dwoo/Template/File.php

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,7 @@ 
      */
     protected function isValidCompiledFile($file)
     {
-        return parent::isValidCompiledFile($file) && (int)$this->getUid() <= filemtime($file);
+        return parent::isValidCompiledFile($file) && (int) $this->getUid() <= filemtime($file);
     }
 
     /**
@@ -149,12 +149,12 @@ 
         } else {
             foreach ($this->getIncludePath() as $path) {
                 $path = rtrim($path, DIRECTORY_SEPARATOR);
-                if (file_exists($path . DIRECTORY_SEPARATOR . $this->file) === true) {
-                    return $this->resolvedPath = $path . DIRECTORY_SEPARATOR . $this->file;
+                if (file_exists($path.DIRECTORY_SEPARATOR.$this->file) === true) {
+                    return $this->resolvedPath = $path.DIRECTORY_SEPARATOR.$this->file;
                 }
             }
 
-            throw new DwooException('Template "' . $this->file . '" could not be found in any of your include path(s)');
+            throw new DwooException('Template "'.$this->file.'" could not be found in any of your include path(s)');
         }
     }
 
@@ -166,7 +166,7 @@ 
      */
     public function getUid()
     {
-        return (string)filemtime($this->getResourceIdentifier());
+        return (string) filemtime($this->getResourceIdentifier());
     }
 
     /**
@@ -224,7 +224,7 @@ 
                         throw new DwooException('When using an include path you can not reference a template into a parent directory (using ../)');
                     }
                 } else {
-                    $resourceId = dirname($parentTemplate->getResourceIdentifier()) . DIRECTORY_SEPARATOR . $resourceId;
+                    $resourceId = dirname($parentTemplate->getResourceIdentifier()).DIRECTORY_SEPARATOR.$resourceId;
                     if (file_exists($resourceId) === false) {
                         return null;
                     }
@@ -237,7 +237,7 @@ 
         if ($policy = $core->getSecurityPolicy()) {
             while (true) {
                 if (preg_match('{^([a-z]+?)://}i', $resourceId)) {
-                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>' . $resourceId . '</em>.');
+                    throw new SecurityException('The security policy prevents you to read files from external sources : <em>'.$resourceId.'</em>.');
                 }
 
                 if ($includePath) {
@@ -251,7 +251,7 @@ 
                         break 2;
                     }
                 }
-                throw new SecurityException('The security policy prevents you to read <em>' . $resourceId . '</em>');
+                throw new SecurityException('The security policy prevents you to read <em>'.$resourceId.'</em>');
             }
         }
 
@@ -271,6 +271,6 @@ 
      */
     public function getIsModifiedCode()
     {
-        return '"' . $this->getUid() . '" == filemtime(' . var_export($this->getResourceIdentifier(), true) . ')';
+        return '"'.$this->getUid().'" == filemtime('.var_export($this->getResourceIdentifier(), true).')';
     }
 }