dwoo-project / dwoo

lib/Dwoo/Smarty/Adapter.php

Spacing +12 added lines, -12 removed lines

@@ -63,12 +63,12 @@ 
         }
         if (array_key_exists($p, $this->compat['properties']) !== false) {
             if ($this->show_compat_errors) {
-                $this->triggerError('Property ' . $p . ' is not available in the Dwoo\Smarty\Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
+                $this->triggerError('Property '.$p.' is not available in the Dwoo\Smarty\Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
             }
             $this->compat['properties'][$p] = $v;
         } else {
             if ($this->show_compat_errors) {
-                $this->triggerError('Property ' . $p . ' is not available in the Dwoo\Smarty\Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
+                $this->triggerError('Property '.$p.' is not available in the Dwoo\Smarty\Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
             }
         }
     }
@@ -82,13 +82,13 @@ 
     {
         if (array_key_exists($p, $this->compat['properties']) !== false) {
             if ($this->show_compat_errors) {
-                $this->triggerError('Property ' . $p . ' is not available in the Dwoo\Smarty\Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
+                $this->triggerError('Property '.$p.' is not available in the Dwoo\Smarty\Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
             }
 
             return $this->compat['properties'][$p];
         } else {
             if ($this->show_compat_errors) {
-                $this->triggerError('Property ' . $p . ' is not available in the Dwoo\Smarty\Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
+                $this->triggerError('Property '.$p.' is not available in the Dwoo\Smarty\Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
             }
         }
     }
@@ -110,9 +110,9 @@ 
             );
         } elseif ($this->show_compat_errors) {
             if (array_search($m, $this->compat['methods']) !== false) {
-                $this->triggerError('Method ' . $m . ' is not available in the Dwoo\Smarty\Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
+                $this->triggerError('Method '.$m.' is not available in the Dwoo\Smarty\Adapter, however it might be implemented in the future, check out http://wiki.dwoo.org/index.php/SmartySupport for more details.', E_USER_NOTICE);
             } else {
-                $this->triggerError('Method ' . $m . ' is not available in the Dwoo\Smarty\Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
+                $this->triggerError('Method '.$m.' is not available in the Dwoo\Smarty\Adapter, but it is not listed as such, so you might want to tell me about it at j.boggiano@seld.be', E_USER_NOTICE);
             }
         }
     }
@@ -525,7 +525,7 @@ 
         if (isset($data[$name]) && is_object($data[$name])) {
             return $data[$name];
         } else {
-            trigger_error('Dwoo_Compiler: object "' . $name . '" was not registered or is not an object', E_USER_ERROR);
+            trigger_error('Dwoo_Compiler: object "'.$name.'" was not registered or is not an object', E_USER_ERROR);
         }
     }
 
@@ -537,10 +537,10 @@ 
     public function template_exists($filename)
     {
         if (!is_array($this->template_dir)) {
-            return file_exists($this->template_dir . DIRECTORY_SEPARATOR . $filename);
+            return file_exists($this->template_dir.DIRECTORY_SEPARATOR.$filename);
         } else {
             foreach ($this->template_dir as $tpl_dir) {
-                if (file_exists($tpl_dir . DIRECTORY_SEPARATOR . $filename)) {
+                if (file_exists($tpl_dir.DIRECTORY_SEPARATOR.$filename)) {
                     return true;
                 }
             }
@@ -669,7 +669,7 @@ 
             $compileId = $this->compile_id;
         }
 
-        $hash = bin2hex(md5($file . $cacheId . $compileId, true));
+        $hash = bin2hex(md5($file.$cacheId.$compileId, true));
         if (!isset(self::$tplCache[$hash])) {
             // abs path
             if (substr($file, 0, 1) === '/' || substr($file, 1, 1) === ':') {
@@ -677,7 +677,7 @@ 
             } elseif (is_string($this->template_dir) || is_array($this->template_dir)) {
                 self::$tplCache[$hash] = new TemplateFile($file, null, $cacheId, $compileId, $this->template_dir);
             } else {
-                throw new Exception('Unable to load "' . $file . '", check the template_dir');
+                throw new Exception('Unable to load "'.$file.'", check the template_dir');
             }
         }
 
@@ -693,6 +693,6 @@ 
         if (is_object($this->template)) {
             parent::triggerError($message, $level);
         }
-        trigger_error('Dwoo error : ' . $message, $level);
+        trigger_error('Dwoo error : '.$message, $level);
     }
 }

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/Block/Plugin.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
      */
     public static function preProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $type)
     {
-        return DwooCompiler::PHP_OPEN . $prepend . '$this->addStack("' . $type . '", array(' . DwooCompiler::implode_r($compiler->getCompiledParams($params)) . '));' . $append . DwooCompiler::PHP_CLOSE;
+        return DwooCompiler::PHP_OPEN.$prepend.'$this->addStack("'.$type.'", array('.DwooCompiler::implode_r($compiler->getCompiledParams($params)).'));'.$append.DwooCompiler::PHP_CLOSE;
     }
 
     /**
@@ -114,6 +114,6 @@ 
      */
     public static function postProcessing(DwooCompiler $compiler, array $params, $prepend, $append, $content)
     {
-        return $content . DwooCompiler::PHP_OPEN . $prepend . '$this->delStack();' . $append . DwooCompiler::PHP_CLOSE;
+        return $content.DwooCompiler::PHP_OPEN.$prepend.'$this->delStack();'.$append.DwooCompiler::PHP_CLOSE;
     }
 }

lib/Dwoo/Plugins/Processors/PluginSmartyCompatible.php

Spacing +16 added lines, -16 removed lines

@@ -38,38 +38,38 @@ 
         $rl           = preg_quote($l, '/');
         $rr           = preg_quote($r, '/');
         $sectionParam = '(?:(name|loop|start|step|max|show)\s*=\s*(\S+))?\s*';
-        $input        = preg_replace_callback('/' . $rl . '\s*section ' . str_repeat($sectionParam, 6) . '\s*' . $rr . '(.+?)(?:' . $rl . '\s*sectionelse\s*' . $rr . '(.+?))?' . $rl . '\s*\/section\s*' . $rr . '/is', array(
+        $input        = preg_replace_callback('/'.$rl.'\s*section '.str_repeat($sectionParam, 6).'\s*'.$rr.'(.+?)(?:'.$rl.'\s*sectionelse\s*'.$rr.'(.+?))?'.$rl.'\s*\/section\s*'.$rr.'/is', array(
             $this,
             'convertSection'
         ), $input);
-        $input        = str_replace('$smarty.section.', '$smarty.for.', $input);
+        $input = str_replace('$smarty.section.', '$smarty.for.', $input);
 
         $smarty = array(
-            '/' . $rl . '\s*ldelim\s*' . $rr . '/',
-            '/' . $rl . '\s*rdelim\s*' . $rr . '/',
-            '/' . $rl . '\s*\$smarty\.ldelim\s*' . $rr . '/',
-            '/' . $rl . '\s*\$smarty\.rdelim\s*' . $rr . '/',
+            '/'.$rl.'\s*ldelim\s*'.$rr.'/',
+            '/'.$rl.'\s*rdelim\s*'.$rr.'/',
+            '/'.$rl.'\s*\$smarty\.ldelim\s*'.$rr.'/',
+            '/'.$rl.'\s*\$smarty\.rdelim\s*'.$rr.'/',
             '/\$smarty\./',
-            '/' . $rl . '\s*php\s*' . $rr . '/',
-            '/' . $rl . '\s*\/php\s*' . $rr . '/',
-            '/\|(@?)strip(\||' . $rr . ')/',
-            '/' . $rl . '\s*sectionelse\s*' . $rr . '/',
+            '/'.$rl.'\s*php\s*'.$rr.'/',
+            '/'.$rl.'\s*\/php\s*'.$rr.'/',
+            '/\|(@?)strip(\||'.$rr.')/',
+            '/'.$rl.'\s*sectionelse\s*'.$rr.'/',
         );
 
         $dwoo = array(
-            '\\' . $l,
+            '\\'.$l,
             $r,
-            '\\' . $l,
+            '\\'.$l,
             $r,
             '$dwoo.',
             '<?php ',
             ' ?>',
             '|$1whitespace$2',
-            $l . 'else' . $r,
+            $l.'else'.$r,
         );
 
         if (preg_match('{\|@([a-z][a-z0-9_]*)}i', $input, $matches)) {
-            trigger_error('The Smarty Compatibility Module has detected that you use |@' . $matches[1] . ' in your template, this might lead to problems as Dwoo interprets the @ operator differently than Smarty, see http://wiki.dwoo.org/index.php/Syntax#The_.40_Operator', E_USER_NOTICE);
+            trigger_error('The Smarty Compatibility Module has detected that you use |@'.$matches[1].' in your template, this might lead to problems as Dwoo interprets the @ operator differently than Smarty, see http://wiki.dwoo.org/index.php/Syntax#The_.40_Operator', E_USER_NOTICE);
         }
 
         return preg_replace($smarty, $dwoo, $input);
@@ -85,10 +85,10 @@ 
         $params = array();
         $index  = 1;
         while (!empty($matches[$index]) && $index < 13) {
-            $params[$matches[$index]] = $matches[$index + 1];
+            $params[$matches[$index]] = $matches[$index+1];
             $index += 2;
         }
 
-        return str_replace('[' . trim($params['name'], '"\'') . ']', '[$' . trim($params['name'], '"\'') . ']', $matches[0]);
+        return str_replace('['.trim($params['name'], '"\'').']', '[$'.trim($params['name'], '"\'').']', $matches[0]);
     }
 }

lib/Dwoo/Plugins/Functions/PluginCycle.php

Spacing +2 added lines, -2 removed lines

@@ -74,10 +74,10 @@
         }
 
         if ($advance) {
-            if ($this->cycles[$name]['index'] >= count($values) - 1) {
+            if ($this->cycles[$name]['index'] >= count($values)-1) {
                 $this->cycles[$name]['index'] = 0;
             } else {
-                ++ $this->cycles[$name]['index'];
+                ++$this->cycles[$name]['index'];
             }
         }
 

lib/Dwoo/Plugins/Functions/PluginCounter.php

Spacing +11 added lines, -11 removed lines

@@ -51,35 +51,35 @@
         // init counter
         if (!isset($this->counters[$name])) {
             $this->counters[$name] = array(
-                'count'     => $start === null ? 1 : (int)$start,
-                'skip'      => $skip === null ? 1 : (int)$skip,
-                'print'     => $print === null ? true : (bool)$print,
-                'assign'    => $assign === null ? null : (string)$assign,
-                'direction' => strtolower($direction) === 'down' ? - 1 : 1,
+                'count'     => $start === null ? 1 : (int) $start,
+                'skip'      => $skip === null ? 1 : (int) $skip,
+                'print'     => $print === null ? true : (bool) $print,
+                'assign'    => $assign === null ? null : (string) $assign,
+                'direction' => strtolower($direction) === 'down' ? -1 : 1,
             );
         } // increment
         else {
             // override setting if present
             if ($skip !== null) {
-                $this->counters[$name]['skip'] = (int)$skip;
+                $this->counters[$name]['skip'] = (int) $skip;
             }
 
             if ($direction !== null) {
-                $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? - 1 : 1;
+                $this->counters[$name]['direction'] = strtolower($direction) === 'down' ? -1 : 1;
             }
 
             if ($print !== null) {
-                $this->counters[$name]['print'] = (bool)$print;
+                $this->counters[$name]['print'] = (bool) $print;
             }
 
             if ($assign !== null) {
-                $this->counters[$name]['assign'] = (string)$assign;
+                $this->counters[$name]['assign'] = (string) $assign;
             }
 
             if ($start !== null) {
-                $this->counters[$name]['count'] = (int)$start;
+                $this->counters[$name]['count'] = (int) $start;
             } else {
-                $this->counters[$name]['count'] += ($this->counters[$name]['skip'] * $this->counters[$name]['direction']);
+                $this->counters[$name]['count'] += ($this->counters[$name]['skip']*$this->counters[$name]['direction']);
             }
         }
 

lib/Dwoo/Plugins/Blocks/PluginForeachelse.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/PluginSmartyinterface.php

Spacing +8 added lines, -8 removed lines

@@ -58,26 +58,26 @@ 
             $callback      = $customPlugins[$func]['callback'];
             if (is_array($callback)) {
                 if (is_object($callback[0])) {
-                    $callback = '$this->customPlugins[\'' . $func . '\'][0]->' . $callback[1] . '(';
+                    $callback = '$this->customPlugins[\''.$func.'\'][0]->'.$callback[1].'(';
                 } else {
-                    $callback = '' . $callback[0] . '::' . $callback[1] . '(';
+                    $callback = ''.$callback[0].'::'.$callback[1].'(';
                 }
             } else {
-                $callback = $callback . '(';
+                $callback = $callback.'(';
             }
         } else {
-            $callback = 'smarty_block_' . $func . '(';
+            $callback = 'smarty_block_'.$func.'(';
         }
 
         $paramsOut = '';
         foreach ($params as $i => $p) {
-            $paramsOut .= var_export($i, true) . ' => ' . $p . ',';
+            $paramsOut .= var_export($i, true).' => '.$p.',';
         }
 
         $curBlock                      = &$compiler->getCurrentBlock();
-        $curBlock['params']['postOut'] = Compiler::PHP_OPEN . ' $_block_content = ob_get_clean(); $_block_repeat=false; echo ' . $callback . '$_tag_stack[count($_tag_stack)-1], $_block_content, $this, $_block_repeat); } array_pop($_tag_stack);' . Compiler::PHP_CLOSE;
+        $curBlock['params']['postOut'] = Compiler::PHP_OPEN.' $_block_content = ob_get_clean(); $_block_repeat=false; echo '.$callback.'$_tag_stack[count($_tag_stack)-1], $_block_content, $this, $_block_repeat); } array_pop($_tag_stack);'.Compiler::PHP_CLOSE;
 
-        return Compiler::PHP_OPEN . $prepend . ' if (!isset($_tag_stack)){ $_tag_stack = array(); } $_tag_stack[] = array(' . $paramsOut . '); $_block_repeat=true; ' . $callback . '$_tag_stack[count($_tag_stack)-1], null, $this, $_block_repeat); while ($_block_repeat) { ob_start();' . Compiler::PHP_CLOSE;
+        return Compiler::PHP_OPEN.$prepend.' if (!isset($_tag_stack)){ $_tag_stack = array(); } $_tag_stack[] = array('.$paramsOut.'); $_block_repeat=true; '.$callback.'$_tag_stack[count($_tag_stack)-1], null, $this, $_block_repeat); while ($_block_repeat) { ob_start();'.Compiler::PHP_CLOSE;
     }
 
     /**
@@ -91,6 +91,6 @@ 
      */
     public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content)
     {
-        return $content . $params['postOut'];
+        return $content.$params['postOut'];
     }
 }

lib/Dwoo/Plugins/Blocks/PluginDynamic.php

Spacing +6 added lines, -6 removed lines

@@ -67,18 +67,18 @@ 
         }
         catch (CompilationException $e) {
         }
-        $output = Compiler::PHP_OPEN . 'if($doCache) {' . "\n\t" . 'echo \'<dwoo:dynamic_\'.$dynamicId.\'>' . str_replace('\'', '\\\'', $content) . '</dwoo:dynamic_\'.$dynamicId.\'>\';' . "\n} else {\n\t";
+        $output = Compiler::PHP_OPEN.'if($doCache) {'."\n\t".'echo \'<dwoo:dynamic_\'.$dynamicId.\'>'.str_replace('\'', '\\\'', $content).'</dwoo:dynamic_\'.$dynamicId.\'>\';'."\n} else {\n\t";
         if (substr($content, 0, strlen(Compiler::PHP_OPEN)) == Compiler::PHP_OPEN) {
             $output .= substr($content, strlen(Compiler::PHP_OPEN));
         } else {
-            $output .= Compiler::PHP_CLOSE . $content;
+            $output .= Compiler::PHP_CLOSE.$content;
         }
         if (substr($output, - strlen(Compiler::PHP_CLOSE)) == Compiler::PHP_CLOSE) {
             $output = substr($output, 0, - strlen(Compiler::PHP_CLOSE));
         } else {
             $output .= Compiler::PHP_OPEN;
         }
-        $output .= "\n}" . Compiler::PHP_CLOSE;
+        $output .= "\n}".Compiler::PHP_CLOSE;
 
         return $output;
     }
@@ -92,13 +92,13 @@ 
      */
     public static function unescape($output, $dynamicId, $compiledFile)
     {
-        $output = preg_replace_callback('/<dwoo:dynamic_(' . $dynamicId . ')>(.+?)<\/dwoo:dynamic_' . $dynamicId . '>/s', array(
+        $output = preg_replace_callback('/<dwoo:dynamic_('.$dynamicId.')>(.+?)<\/dwoo:dynamic_'.$dynamicId.'>/s', array(
             'self',
             'unescapePhp'
         ), $output, - 1, $count);
         // re-add the includes on top of the file
         if ($count && preg_match('#/\* template head \*/(.+?)/\* end template head \*/#s', file_get_contents($compiledFile), $m)) {
-            $output = '<?php ' . $m[1] . ' ?>' . $output;
+            $output = '<?php '.$m[1].' ?>'.$output;
         }
 
         return $output;
@@ -111,6 +111,6 @@ 
      */
     public static function unescapePhp($match)
     {
-        return preg_replace('{<\?php /\*' . $match[1] . '\*/ echo \'(.+?)\'; \?>}s', '$1', $match[2]);
+        return preg_replace('{<\?php /\*'.$match[1].'\*/ echo \'(.+?)\'; \?>}s', '$1', $match[2]);
     }
 }