phptal / PHPTAL

classes/PHPTAL/Php/Attribute/I18N/Source.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         $codewriter->end();
 
         // push current source and use new one
-        $codewriter->pushCode('$_i18n_sources[] = ' . $codewriter->getTranslatorReference(). '->setSource('.$codewriter->str($this->expression).')');
+        $codewriter->pushCode('$_i18n_sources[] = '.$codewriter->getTranslatorReference().'->setSource('.$codewriter->str($this->expression).')');
     }
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)

classes/PHPTAL/Php/Attribute/METAL/UseMacro.php

Indentation +8 added lines, -8 removed lines

@@ -52,14 +52,14 @@
 
         $macroname = strtr($this->expression, '-', '_');
 
-	// throw error if attempting to define and use macro at same time
-	// [should perhaps be a TemplateException? but I don't know how to set that up...]
-	if ($defineAttr = $this->phpelement->getAttributeNodeNS(
-		'http://xml.zope.org/namespaces/metal', 'define-macro')) {
-		if ($defineAttr->getValue() == $macroname) 
-            		throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
-                		$this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
-	}
+    // throw error if attempting to define and use macro at same time
+    // [should perhaps be a TemplateException? but I don't know how to set that up...]
+    if ($defineAttr = $this->phpelement->getAttributeNodeNS(
+        'http://xml.zope.org/namespaces/metal', 'define-macro')) {
+        if ($defineAttr->getValue() == $macroname) 
+                    throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
+                        $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
+    }
 
         // local macro (no filename specified) and non dynamic macro name
         // can be called directly if it's a known function (just generated or seen in previous compilation)

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         // local macro (no filename specified) and non dynamic macro name
         // can be called directly if it's a known function (just generated or seen in previous compilation)
         if (preg_match('/^[a-z0-9_]+$/i', $macroname) && $codewriter->functionExists($macroname)) {
-            $code = $codewriter->getFunctionPrefix() . $macroname . '($_thistpl, $tpl)';
+            $code = $codewriter->getFunctionPrefix().$macroname.'($_thistpl, $tpl)';
             $codewriter->pushCode($code);
         }
         // external macro or ${macroname}, use PHPTAL at runtime to resolve it

Braces +4 added lines, -3 removed lines

@@ -56,9 +56,10 @@
 	// [should perhaps be a TemplateException? but I don't know how to set that up...]
 	if ($defineAttr = $this->phpelement->getAttributeNodeNS(
 		'http://xml.zope.org/namespaces/metal', 'define-macro')) {
-		if ($defineAttr->getValue() == $macroname) 
-            		throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
-                		$this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
+		if ($defineAttr->getValue() == $macroname) {
+		            		throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
+                		$this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+		}
 	}
 
         // local macro (no filename specified) and non dynamic macro name

classes/PHPTAL/Php/Attribute/METAL/FillSlot.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             return 0;
         }
 
-        $estimated_bytes = 2*(3+strlen($element->getQualifiedName()));
+        $estimated_bytes = 2 * (3+strlen($element->getQualifiedName()));
 
         foreach ($element->getAttributeNodes() as $attr) {
             $estimated_bytes += 4+strlen($attr->getQualifiedName());

classes/PHPTAL/Php/Attribute/PHPTAL/Cache.php

Indentation +3 added lines, -3 removed lines

@@ -67,12 +67,12 @@
         } elseif ($cache_per_expression == 'nothing') {
             /* do nothing */
         } elseif ($cache_per_expression) {
-             $code = $codewriter->evaluateExpression($cache_per_expression);
+                $code = $codewriter->evaluateExpression($cache_per_expression);
 
-             if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
+                if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
                                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
 
-             $cache_tag = '('.$code.')."@".' . $cache_tag;
+                $cache_tag = '('.$code.')."@".' . $cache_tag;
         }
 
         $this->cache_filename_var = $codewriter->createTempVariable();

Braces +6 added lines, -2 removed lines

@@ -50,8 +50,10 @@ 
         if (!is_numeric($cache_len)) {
             $cache_len = $codewriter->evaluateExpression($cache_len);
 
-            if (is_array($cache_len)) throw new PHPTAL_ParserException("Chained expressions in cache length are not supported",
+            if (is_array($cache_len)) {
+                throw new PHPTAL_ParserException("Chained expressions in cache length are not supported",
                                         $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+            }
         }
         switch ($matches[2]) {
             case 'd': $cache_len .= '*24'; /* no break */
@@ -69,8 +71,10 @@ 
         } elseif ($cache_per_expression) {
              $code = $codewriter->evaluateExpression($cache_per_expression);
 
-             if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
+             if (is_array($code)) {
+                 throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
                                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+             }
 
              $cache_tag = '('.$code.')."@".' . $cache_tag;
         }

Spacing +4 added lines, -4 removed lines

@@ -59,9 +59,9 @@ 
             case 'm': $cache_len .= '*60'; /* no break */
         }
 
-        $cache_tag = '"'.addslashes( $this->phpelement->getQualifiedName() . ':' . $this->phpelement->getSourceLine()).'"';
+        $cache_tag = '"'.addslashes($this->phpelement->getQualifiedName().':'.$this->phpelement->getSourceLine()).'"';
 
-        $cache_per_expression = isset($matches[3])?trim($matches[3]):null;
+        $cache_per_expression = isset($matches[3]) ?trim($matches[3]) : null;
         if ($cache_per_expression == 'url') {
             $cache_tag .= '.$_SERVER["REQUEST_URI"]';
         } elseif ($cache_per_expression == 'nothing') {
@@ -72,11 +72,11 @@ 
              if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
                                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
 
-             $cache_tag = '('.$code.')."@".' . $cache_tag;
+             $cache_tag = '('.$code.')."@".'.$cache_tag;
         }
 
         $this->cache_filename_var = $codewriter->createTempVariable();
-        $codewriter->doSetVar($this->cache_filename_var, $codewriter->str($codewriter->getCacheFilesBaseName()).'.md5('.$cache_tag.')' );
+        $codewriter->doSetVar($this->cache_filename_var, $codewriter->str($codewriter->getCacheFilesBaseName()).'.md5('.$cache_tag.')');
 
         $cond = '!file_exists('.$this->cache_filename_var.') || time() - '.$cache_len.' >= filemtime('.$this->cache_filename_var.')';
 

classes/PHPTAL/Php/Attribute/PHPTAL/Tales.php

Braces +3 added lines, -2 removed lines

@@ -24,8 +24,9 @@
         $mode = trim($this->expression);
         $mode = strtolower($mode);
 
-        if ($mode == '' || $mode == 'default')
-            $mode = 'tales';
+        if ($mode == '' || $mode == 'default') {
+                    $mode = 'tales';
+        }
 
         if ($mode != 'php' && $mode != 'tales') {
             throw new PHPTAL_TemplateException("Unsupported TALES mode '$mode'",

classes/PHPTAL/Php/State.php

Spacing +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
      */
     public function interpolateTalesVarsInString($string)
     {
-        return PHPTAL_Php_TalesInternal::parseString($string, false, ($this->getTalesMode() === 'tales') ? '' : 'php:' );
+        return PHPTAL_Php_TalesInternal::parseString($string, false, ($this->getTalesMode() === 'tales') ? '' : 'php:');
     }
 
     /**
@@ -153,7 +153,7 @@ 
     public function interpolateTalesVarsInHTML($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInHTMLCallback'), $src);
+                                     array($this, '_interpolateTalesVarsInHTMLCallback'), $src);
     }
 
     /**
@@ -172,7 +172,7 @@ 
     public function interpolateTalesVarsInCDATA($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInCDATACallback'), $src);
+                                     array($this, '_interpolateTalesVarsInCDATACallback'), $src);
     }
 
     /**
@@ -187,11 +187,11 @@ 
     {
         // replaces $${ with literal ${ (or $$$${ with $${ etc)
         if (!empty($matches[4])) {
-            return substr($matches[4], strlen($matches[4])/2).'{';
+            return substr($matches[4], strlen($matches[4]) / 2).'{';
         }
 
         // same replacement, but before executed expression
-        $dollars = substr($matches[1], strlen($matches[1])/2);
+        $dollars = substr($matches[1], strlen($matches[1]) / 2);
 
         $code = $matches[3];
         if ($format == 'html') {

Indentation +2 added lines, -2 removed lines

@@ -153,7 +153,7 @@ 
     public function interpolateTalesVarsInHTML($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInHTMLCallback'), $src);
+                                        array($this,'_interpolateTalesVarsInHTMLCallback'), $src);
     }
 
     /**
@@ -172,7 +172,7 @@ 
     public function interpolateTalesVarsInCDATA($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInCDATACallback'), $src);
+                                        array($this,'_interpolateTalesVarsInCDATACallback'), $src);
     }
 
     /**

classes/PHPTAL/Php/CodeWriter.php

Spacing +22 added lines, -22 removed lines

@@ -24,11 +24,11 @@ 
     /**
      * max id of variable to give as temp
      */
-    private $temp_var_counter=0;
+    private $temp_var_counter = 0;
     /**
      * stack with free'd variables
      */
-    private $temp_recycling=array();
+    private $temp_recycling = array();
 
     /**
      * keeps track of seen functions for function_exists
@@ -49,7 +49,7 @@ 
 
     public function recycleTempVariable($var)
     {
-        if (substr($var, 0, 6)!=='$_tmp_') throw new PHPTAL_Exception("Invalid variable recycled");
+        if (substr($var, 0, 6) !== '$_tmp_') throw new PHPTAL_Exception("Invalid variable recycled");
         $this->temp_recycling[] = $var;
     }
 
@@ -140,12 +140,12 @@ 
 
     public function indent()
     {
-        $this->_indentation ++;
+        $this->_indentation++;
     }
 
     public function unindent()
     {
-        $this->_indentation --;
+        $this->_indentation--;
     }
 
     public function flush()
@@ -187,7 +187,7 @@ 
             }
             $this->_result .= $codeLine;
         }
-        $this->_result .= "?>\n";// PHP consumes newline
+        $this->_result .= "?>\n"; // PHP consumes newline
         $this->_codeBuffer = array();
     }
 
@@ -207,7 +207,7 @@ 
     public function doDoctype($called_from_macro = false)
     {
         if ($this->_doctype) {
-            $code = '$ctx->setDocType('.$this->str($this->_doctype).','.($called_from_macro?'true':'false').')';
+            $code = '$ctx->setDocType('.$this->str($this->_doctype).','.($called_from_macro ? 'true' : 'false').')';
             $this->pushCode($code);
         }
     }
@@ -220,21 +220,21 @@ 
     public function doXmlDeclaration($called_from_macro = false)
     {
         if ($this->_xmldeclaration && $this->getOutputMode() !== PHPTAL::HTML5) {
-            $code = '$ctx->setXmlDeclaration('.$this->str($this->_xmldeclaration).','.($called_from_macro?'true':'false').')';
+            $code = '$ctx->setXmlDeclaration('.$this->str($this->_xmldeclaration).','.($called_from_macro ? 'true' : 'false').')';
             $this->pushCode($code);
         }
     }
 
     public function functionExists($name)
     {
-        return isset($this->known_functions[$this->_functionPrefix . $name]);
+        return isset($this->known_functions[$this->_functionPrefix.$name]);
     }
 
     public function doTemplateFile($functionName, PHPTAL_Dom_Element $treeGen)
     {
         $this->doComment("\n*** DO NOT EDIT THIS FILE ***\n\nGenerated by PHPTAL from ".$treeGen->getSourceFile()." (edit that file instead)");
         $this->doFunction($functionName, 'PHPTAL $tpl, PHPTAL_Context $ctx');
-        $this->setFunctionPrefix($functionName . "_");
+        $this->setFunctionPrefix($functionName."_");
         $this->doSetVar('$_thistpl', '$tpl');
         $this->doInitTranslator();
         $treeGen->generateCode($this);
@@ -244,13 +244,13 @@ 
 
     public function doFunction($name, $params)
     {
-        $name = $this->_functionPrefix . $name;
+        $name = $this->_functionPrefix.$name;
         $this->known_functions[$name] = true;
 
         $this->pushCodeWriterContext();
         $this->pushCode("function $name($params) {\n");
         $this->indent();
-        $this->_segments[] =  'function';
+        $this->_segments[] = 'function';
     }
 
     public function doComment($comment)
@@ -281,7 +281,7 @@ 
 
     public function doForeach($out, $source)
     {
-        $this->_segments[] =  'foreach';
+        $this->_segments[] = 'foreach';
         $this->pushCode("foreach ($source as $out):");
         $this->indent();
     }
@@ -304,7 +304,7 @@ 
             $this->flush();
             $functionCode = $this->_result;
             $this->popCodeWriterContext();
-            $this->_result = $functionCode . $this->_result;
+            $this->_result = $functionCode.$this->_result;
         } elseif ($segment == 'try')
             $this->pushCode('}');
         elseif ($segment == 'catch')
@@ -315,7 +315,7 @@ 
 
     public function doTry()
     {
-        $this->_segments[] =  'try';
+        $this->_segments[] = 'try';
         $this->pushCode('try {');
         $this->indent();
     }
@@ -328,14 +328,14 @@ 
     public function doCatch($catch)
     {
         $this->doEnd('try');
-        $this->_segments[] =  'catch';
+        $this->_segments[] = 'catch';
         $this->pushCode('catch('.$catch.') {');
         $this->indent();
     }
 
     public function doIf($condition)
     {
-        $this->_segments[] =  'if';
+        $this->_segments[] = 'if';
         $this->pushCode('if ('.$condition.'): ');
         $this->indent();
     }
@@ -387,14 +387,14 @@ 
     {
         if ($html === "") return;
         $this->flushCode();
-        $this->_htmlBuffer[] =  $html;
+        $this->_htmlBuffer[] = $html;
     }
 
     public function pushCode($codeLine)
     {
         $this->flushHtml();
-        $codeLine = $this->indentSpaces() . $codeLine;
-        $this->_codeBuffer[] =  $codeLine;
+        $codeLine = $this->indentSpaces().$codeLine;
+        $this->_codeBuffer[] = $codeLine;
     }
 
     /**
@@ -402,7 +402,7 @@ 
      */
     public function str($string)
     {
-        return "'".strtr($string,array("'"=>'\\\'','\\'=>'\\\\'))."'";
+        return "'".strtr($string, array("'"=>'\\\'', '\\'=>'\\\\'))."'";
     }
 
     public function escapeCode($code)
@@ -479,7 +479,7 @@ 
 
     private function pushCodeWriterContext()
     {
-        $this->_contexts[] =  clone $this;
+        $this->_contexts[] = clone $this;
         $this->_result = "";
         $this->_indentation = 0;
         $this->_codeBuffer = array();

Braces +45 added lines, -20 removed lines

@@ -43,13 +43,17 @@ 
 
     public function createTempVariable()
     {
-        if (count($this->temp_recycling)) return array_shift($this->temp_recycling);
+        if (count($this->temp_recycling)) {
+            return array_shift($this->temp_recycling);
+        }
         return '$_tmp_'.(++$this->temp_var_counter);
     }
 
     public function recycleTempVariable($var)
     {
-        if (substr($var, 0, 6)!=='$_tmp_') throw new PHPTAL_Exception("Invalid variable recycled");
+        if (substr($var, 0, 6)!=='$_tmp_') {
+            throw new PHPTAL_Exception("Invalid variable recycled");
+        }
         $this->temp_recycling[] = $var;
     }
 
@@ -129,7 +133,9 @@ 
     {
         preg_match_all('/(?:[^;]+|;;)+/sm', $src, $array);
         $array = $array[0];
-        foreach ($array as &$a) $a = str_replace(';;', ';', $a);
+        foreach ($array as &$a) {
+            $a = str_replace(';;', ';', $a);
+        }
         return $array;
     }
 
@@ -165,16 +171,22 @@ 
 
     public function flushCode()
     {
-        if (count($this->_codeBuffer) == 0) return;
+        if (count($this->_codeBuffer) == 0) {
+            return;
+        }
 
         // special treatment for one code line
         if (count($this->_codeBuffer) == 1) {
             $codeLine = $this->_codeBuffer[0];
             // avoid adding ; after } and {
-            if (!preg_match('/\}\s*$|\{\s*$/', $codeLine))
-                $this->_result .= '<?php '.$codeLine."; ?>\n"; // PHP consumes newline
-            else
-                $this->_result .= '<?php '.$codeLine." ?>\n"; // PHP consumes newline
+            if (!preg_match('/\}\s*$|\{\s*$/', $codeLine)) {
+                            $this->_result .= '<?php '.$codeLine."; ?>\n";
+            }
+            // PHP consumes newline
+            else {
+                            $this->_result .= '<?php '.$codeLine." ?>\n";
+            }
+            // PHP consumes newline
             $this->_codeBuffer = array();
             return;
         }
@@ -193,7 +205,9 @@ 
 
     public function flushHtml()
     {
-        if (count($this->_htmlBuffer) == 0) return;
+        if (count($this->_htmlBuffer) == 0) {
+            return;
+        }
 
         $this->_result .= implode('', $this->_htmlBuffer);
         $this->_htmlBuffer = array();
@@ -289,7 +303,9 @@ 
     public function doEnd($expects = null)
     {
         if (!count($this->_segments)) {
-            if (!$expects) $expects = 'anything';
+            if (!$expects) {
+                $expects = 'anything';
+            }
             throw new PHPTAL_Exception("Bug: CodeWriter generated end of block without $expects open");
         }
 
@@ -305,12 +321,13 @@ 
             $functionCode = $this->_result;
             $this->popCodeWriterContext();
             $this->_result = $functionCode . $this->_result;
-        } elseif ($segment == 'try')
-            $this->pushCode('}');
-        elseif ($segment == 'catch')
-            $this->pushCode('}');
-        else
-            $this->pushCode("end$segment");
+        } elseif ($segment == 'try') {
+                    $this->pushCode('}');
+        } elseif ($segment == 'catch') {
+                    $this->pushCode('}');
+        } else {
+                    $this->pushCode("end$segment");
+        }
     }
 
     public function doTry()
@@ -362,14 +379,18 @@ 
 
     public function doEcho($code)
     {
-        if ($code === "''") return;
+        if ($code === "''") {
+            return;
+        }
         $this->flush();
         $this->pushCode('echo '.$this->escapeCode($code));
     }
 
     public function doEchoRaw($code)
     {
-        if ($code === "''") return;
+        if ($code === "''") {
+            return;
+        }
         $this->pushCode('echo '.$this->stringifyCode($code));
     }
 
@@ -385,7 +406,9 @@ 
 
     public function pushHTML($html)
     {
-        if ($html === "") return;
+        if ($html === "") {
+            return;
+        }
         $this->flushCode();
         $this->_htmlBuffer[] =  $html;
     }
@@ -444,11 +467,13 @@ 
     {
         // FIXME: interpolation is done _after_ that function, so ${} must be forbidden for now
 
-        if ($this->getEncoding() == 'UTF-8') // HTML 5: 8.1.2.3 Attributes ; http://code.google.com/p/html5lib/issues/detail?id=93
+        if ($this->getEncoding() == 'UTF-8') {
+            // HTML 5: 8.1.2.3 Attributes ; http://code.google.com/p/html5lib/issues/detail?id=93
         {
             // regex excludes unicode control characters, all kinds of whitespace and unsafe characters
             // and trailing / to avoid confusion with self-closing syntax
             $unsafe_attr_regex = '/^$|[&=\'"><\s`\pM\pC\pZ\p{Pc}\p{Sk}]|\/$|\${/u';
+        }
         } else {
             $unsafe_attr_regex = '/^$|[&=\'"><\s`\0177-\377]|\/$|\${/';
         }

classes/PHPTAL/Php/TalesInternal.php

Braces +29 added lines, -14 removed lines

@@ -124,9 +124,15 @@ 
     static public function path($expression, $nothrow=false)
     {
         $expression = trim($expression);
-        if ($expression == 'default') return self::DEFAULT_KEYWORD;
-        if ($expression == 'nothing') return self::NOTHING_KEYWORD;
-        if ($expression == '')        return self::NOTHING_KEYWORD;
+        if ($expression == 'default') {
+            return self::DEFAULT_KEYWORD;
+        }
+        if ($expression == 'nothing') {
+            return self::NOTHING_KEYWORD;
+        }
+        if ($expression == '') {
+            return self::NOTHING_KEYWORD;
+        }
 
         // split OR expressions terminated by a string
         if (preg_match('/^(.*?)\s*\|\s*?(string:.*)$/sm', $expression, $m)) {
@@ -148,8 +154,7 @@ 
             foreach ($exps as $i=>$exp) {
                 if(isset($string) || $i < count($exps) - 1) {
                     $result[] = self::compileToPHPExpressions(trim($exp), true);
-                }
-                else {
+                } else {
                     // the last expression can thorw exception.
                     $result[] = self::compileToPHPExpressions(trim($exp), false);
                 }
@@ -183,7 +188,11 @@ 
             return '$ctx->path($ctx, ' . $next . ($expression === null ? '' : '."/".'.$expression) . ', true)';
         }
 
-        if (preg_match('/^\'[a-z][a-z0-9_]*\'$/i', $next)) $next = substr($next, 1, -1); else $next = '{'.$next.'}';
+        if (preg_match('/^\'[a-z][a-z0-9_]*\'$/i', $next)) {
+            $next = substr($next, 1, -1);
+        } else {
+            $next = '{'.$next.'}';
+        }
 
         // if no sub part for this expression, just optimize the generated code
         // and access the $ctx->var
@@ -260,8 +269,7 @@ 
                     if ($inAccoladePath) {
                         $subPath .= $c;
                         $c = '';
-                    }
-                    else {
+                    } else {
                         $c = '\\\\';
                     }
                     break;
@@ -270,8 +278,7 @@ 
                     if ($inAccoladePath) {
                         $subPath .= $c;
                         $c = '';
-                    }
-                    else {
+                    } else {
                         $c = '\\\'';
                     }
                     break;
@@ -384,7 +391,9 @@ 
     static public function exists($src, $nothrow)
     {
         $src = trim($src);
-        if (ctype_alnum($src)) return 'isset($ctx->'.$src.')';
+        if (ctype_alnum($src)) {
+            return 'isset($ctx->'.$src.')';
+        }
         return '(null !== ' . self::compileToPHPExpression($src, true) . ')';
     }
 
@@ -395,7 +404,9 @@ 
      */
     static public function number($src, $nothrow)
     {
-        if (!is_numeric(trim($src))) throw new PHPTAL_ParserException("'$src' is not a number");
+        if (!is_numeric(trim($src))) {
+            throw new PHPTAL_ParserException("'$src' is not a number");
+        }
         return trim($src);
     }
 
@@ -425,7 +436,9 @@ 
     public static function compileToPHPExpression($expression, $nothrow=false)
     {
         $r = self::compileToPHPExpressions($expression, $nothrow);
-        if (!is_array($r)) return $r;
+        if (!is_array($r)) {
+            return $r;
+        }
 
         // this weird ternary operator construct is to execute noThrow inside the expression
         return '($ctx->noThrow(true)||1?'.self::convertExpressionsToExpression($r, $nothrow).':"")';
@@ -437,9 +450,11 @@ 
      */
     private static function convertExpressionsToExpression(array $array, $nothrow)
     {
-        if (count($array)==1) return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
+        if (count($array)==1) {
+            return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
             ($array[0]==self::NOTHING_KEYWORD?'null':$array[0]).
             '):"")';
+        }
 
         $expr = array_shift($array);
 

Spacing +22 added lines, -22 removed lines

@@ -55,7 +55,7 @@ 
 
     static public function true($src, $nothrow)
     {
-        return 'phptal_true(' . self::compileToPHPExpression($src, true) . ')';
+        return 'phptal_true('.self::compileToPHPExpression($src, true).')';
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     static public function not($expression, $nothrow)
     {
-        return '!phptal_true(' . self::compileToPHPExpression($expression, $nothrow) . ')';
+        return '!phptal_true('.self::compileToPHPExpression($expression, $nothrow).')';
     }
 
 
@@ -121,7 +121,7 @@ 
      *
      * @returns string or array
      */
-    static public function path($expression, $nothrow=false)
+    static public function path($expression, $nothrow = false)
     {
         $expression = trim($expression);
         if ($expression == 'default') return self::DEFAULT_KEYWORD;
@@ -146,7 +146,7 @@ 
         if (count($exps) > 1 || isset($string)) {
             $result = array();
             foreach ($exps as $i=>$exp) {
-                if(isset($string) || $i < count($exps) - 1) {
+                if (isset($string) || $i < count($exps)-1) {
                     $result[] = self::compileToPHPExpressions(trim($exp), true);
                 }
                 else {
@@ -180,7 +180,7 @@ 
         }
 
         if ($nothrow) {
-            return '$ctx->path($ctx, ' . $next . ($expression === null ? '' : '."/".'.$expression) . ', true)';
+            return '$ctx->path($ctx, '.$next.($expression === null ? '' : '."/".'.$expression).', true)';
         }
 
         if (preg_match('/^\'[a-z][a-z0-9_]*\'$/i', $next)) $next = substr($next, 1, -1); else $next = '{'.$next.'}';
@@ -221,7 +221,7 @@ 
      *      string:hello, ${user/name}
      *      string:you have $$130 in your bank account
      */
-    static public function string($expression, $nothrow=false)
+    static public function string($expression, $nothrow = false)
     {
         return self::parseString($expression, $nothrow, '');
     }
@@ -241,7 +241,7 @@ 
         $lastWasDollar = false;
         $result = '';
         $len = strlen($expression);
-        for ($i=0; $i<$len; $i++) {
+        for ($i = 0; $i < $len; $i++) {
             $c = $expression[$i];
             switch ($c) {
                 case '$':
@@ -291,8 +291,8 @@ 
                 case '}':
                     if ($inAccoladePath) {
                         $inAccoladePath = false;
-                        $subEval = self::compileToPHPExpression($tales_prefix.$subPath,false);
-                        $result .= "'.(" . $subEval . ").'";
+                        $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
+                        $result .= "'.(".$subEval.").'";
                         $subPath = '';
                         $lastWasDollar = false;
                         $c = '';
@@ -315,8 +315,8 @@ 
                             $c = '';
                         } else {
                             $inPath = false;
-                            $subEval = self::compileToPHPExpression($tales_prefix.$subPath,false);
-                            $result .= "'.(" . $subEval . ").'";
+                            $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
+                            $result .= "'.(".$subEval.").'";
                             }
                         }
                     break;
@@ -325,7 +325,7 @@ 
         }
         if ($inPath) {
             $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
-            $result .= "'.(" . $subEval . ").'";
+            $result .= "'.(".$subEval.").'";
         }
 
         // optimize ''.foo.'' to foo
@@ -365,7 +365,7 @@ 
         $src = rawurldecode($src);
 
         // Simple echo can be supported via regular method
-        if (preg_match('/^\s*echo\s+((?:[^;]+|"[^"\\\\]*"|\'[^\'\\\\]*\'|\/\*.*?\*\/)+);*\s*$/s',$src,$m))
+        if (preg_match('/^\s*echo\s+((?:[^;]+|"[^"\\\\]*"|\'[^\'\\\\]*\'|\/\*.*?\*\/)+);*\s*$/s', $src, $m))
         {
             return $m[1];
         }
@@ -385,7 +385,7 @@ 
     {
         $src = trim($src);
         if (ctype_alnum($src)) return 'isset($ctx->'.$src.')';
-        return '(null !== ' . self::compileToPHPExpression($src, true) . ')';
+        return '(null !== '.self::compileToPHPExpression($src, true).')';
     }
 
     /**
@@ -404,7 +404,7 @@ 
      */
     static public function json($src, $nothrow)
     {
-        return 'json_encode('.phptal_tale($src,$nothrow).')';
+        return 'json_encode('.phptal_tale($src, $nothrow).')';
     }
 
     /**
@@ -412,7 +412,7 @@ 
      */
     static public function urlencode($src, $nothrow)
     {
-        return 'rawurlencode('.phptal_tale($src,$nothrow).')';
+        return 'rawurlencode('.phptal_tale($src, $nothrow).')';
     }
 
     /**
@@ -422,7 +422,7 @@ 
      * @see PHPTAL_Php_TalesInternal::compileToPHPExpressions()
      * @return string
      */
-    public static function compileToPHPExpression($expression, $nothrow=false)
+    public static function compileToPHPExpression($expression, $nothrow = false)
     {
         $r = self::compileToPHPExpressions($expression, $nothrow);
         if (!is_array($r)) return $r;
@@ -437,8 +437,8 @@ 
      */
     private static function convertExpressionsToExpression(array $array, $nothrow)
     {
-        if (count($array)==1) return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
-            ($array[0]==self::NOTHING_KEYWORD?'null':$array[0]).
+        if (count($array) == 1) return '($ctx->noThrow('.($nothrow ? 'true' : 'false').')||1?('.
+            ($array[0] == self::NOTHING_KEYWORD ? 'null' : $array[0]).
             '):"")';
 
         $expr = array_shift($array);
@@ -457,7 +457,7 @@ 
      *
      * @return string or array
      */
-    public static function compileToPHPExpressions($expression, $nothrow=false)
+    public static function compileToPHPExpressions($expression, $nothrow = false)
     {
         $expression = trim($expression ?? '');
 
@@ -488,13 +488,13 @@ 
         throw new PHPTAL_UnknownModifierException("Unknown phptal modifier '$typePrefix'. Function '$func' does not exist", $typePrefix);
     }
 
-    private static function verifyPHPExpressions($typePrefix,$expressions)
+    private static function verifyPHPExpressions($typePrefix, $expressions)
     {
         if (!is_array($expressions)) {
             $expressions = array($expressions);
         }
 
-        foreach($expressions as $expr) {
+        foreach ($expressions as $expr) {
             if (preg_match('/;\s*$/', $expr)) {
                 throw new PHPTAL_ParserException("Modifier $typePrefix generated PHP statement rather than expression (don't add semicolons)");
             }

classes/PHPTAL/RepeatController.php

Spacing +18 added lines, -18 removed lines

@@ -57,9 +57,9 @@ 
      */
     public function __construct($source)
     {
-        if ( is_string($source) ) {
-            $this->iterator = new ArrayIterator( str_split($source) );  // FIXME: invalid for UTF-8 encoding, use preg_match_all('/./u') trick
-        } elseif ( is_array($source) ) {
+        if (is_string($source)) {
+            $this->iterator = new ArrayIterator(str_split($source)); // FIXME: invalid for UTF-8 encoding, use preg_match_all('/./u') trick
+        } elseif (is_array($source)) {
             $this->iterator = new ArrayIterator($source);
         } elseif ($source instanceof IteratorAggregate) {
             $this->iterator = $source->getIterator();
@@ -74,11 +74,11 @@ 
         } elseif ($source instanceof Traversable) {
             $this->iterator = new IteratorIterator($source);
         } elseif ($source instanceof Closure) {
-            $this->iterator = new ArrayIterator( (array) $source() );
+            $this->iterator = new ArrayIterator((array) $source());
         } elseif ($source instanceof stdClass) {
-            $this->iterator = new ArrayIterator( (array) $source );
+            $this->iterator = new ArrayIterator((array) $source);
         } else {
-            $this->iterator = new ArrayIterator( array() );
+            $this->iterator = new ArrayIterator(array());
         }
     }
 
@@ -120,11 +120,11 @@ 
         if ($this->length === null) {
             if ($this->iterator instanceof Countable) {
                 return $this->length = count($this->iterator);
-            } elseif ( is_object($this->iterator) ) {
+            } elseif (is_object($this->iterator)) {
                 // for backwards compatibility with existing PHPTAL templates
-                if ( method_exists($this->iterator, 'size') ) {
+                if (method_exists($this->iterator, 'size')) {
                     return $this->length = $this->iterator->size();
-                } elseif ( method_exists($this->iterator, 'length') ) {
+                } elseif (method_exists($this->iterator, 'length')) {
                     return $this->length = $this->iterator->length();
                 }
             }
@@ -133,7 +133,7 @@ 
 
         if ($this->length === '_PHPTAL_LENGTH_UNKNOWN_') // return length if end is discovered
         {
-            return $this->end ? $this->index + 1 : null;
+            return $this->end ? $this->index+1 : null;
         }
         return $this->length;
     }
@@ -203,7 +203,7 @@ 
     {
         switch ($var) {
             case 'number':
-                return $this->index + 1;
+                return $this->index+1;
             case 'start':
                 return $this->index === 0;
             case 'even':
@@ -213,13 +213,13 @@ 
             case 'length':
                 return $this->length();
             case 'letter':
-                return strtolower( $this->int2letter($this->index+1) );
+                return strtolower($this->int2letter($this->index+1));
             case 'Letter':
-                return strtoupper( $this->int2letter($this->index+1) );
+                return strtoupper($this->int2letter($this->index+1));
             case 'roman':
-                return strtolower( $this->int2roman($this->index+1) );
+                return strtolower($this->int2roman($this->index+1));
             case 'Roman':
-                return strtoupper( $this->int2roman($this->index+1) );
+                return strtoupper($this->int2roman($this->index+1));
 
             case 'groups':
                 $this->initializeGroups();
@@ -234,7 +234,7 @@ 
             case 'last':
                 $this->initializeGroups();
                 // Compare the next one with the dictionary
-                $res = $this->groups->last( $this->iterator->current() );
+                $res = $this->groups->last($this->iterator->current());
                 return is_bool($res) ? $res : $this->groups;
 
             default:
@@ -255,7 +255,7 @@ 
         $this->key = $this->iterator->key();
 
         $this->iterator->next();
-        if ( !$this->iterator->valid() ) {
+        if (!$this->iterator->valid()) {
             $this->valid = false;
             $this->end = true;
         }
@@ -277,7 +277,7 @@ 
         $letters = '';
         while ($int > 0) {
             $int--;
-            $letters = $lookup[$int % $size] . $letters;
+            $letters = $lookup[$int % $size].$letters;
             $int = floor($int / $size);
         }
         return $letters;

Braces +6 added lines, -2 removed lines

@@ -131,10 +131,12 @@ 
             $this->length = '_PHPTAL_LENGTH_UNKNOWN_';
         }
 
-        if ($this->length === '_PHPTAL_LENGTH_UNKNOWN_') // return length if end is discovered
+        if ($this->length === '_PHPTAL_LENGTH_UNKNOWN_') {
+            // return length if end is discovered
         {
             return $this->end ? $this->index + 1 : null;
         }
+        }
         return $this->length;
     }
 
@@ -173,7 +175,9 @@ 
         $this->index++;
 
         // Prefetch the next element
-        if ($this->validOnNext) $this->prefetch();
+        if ($this->validOnNext) {
+            $this->prefetch();
+        }
 
         if ($this->uses_groups) {
             // Notify the grouping helper of the change