phptal / PHPTAL

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

Braces +6 added lines, -4 removed lines

@@ -79,10 +79,12 @@
                 $this->_reader->talesChainPart($this, $exp, $lastkey === $key);
             }
 
-            if ($this->_state == self::CHAIN_BREAK)
-                break;
-            if ($this->_state == self::CHAIN_CONT)
-                continue;
+            if ($this->_state == self::CHAIN_BREAK) {
+                            break;
+            }
+            if ($this->_state == self::CHAIN_CONT) {
+                            continue;
+            }
         }
 
         $this->codewriter->doEnd('if');

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/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

classes/PHPTAL/RepeatControllerGroups.php

Spacing +11 added lines, -11 removed lines

@@ -54,13 +54,13 @@ 
      */
     public function first($data)
     {
-        if ( !is_array($data) && !is_object($data) && !is_null($data) ) {
+        if (!is_array($data) && !is_object($data) && !is_null($data)) {
 
-            if ( !isset($this->cache['F']) ) {
+            if (!isset($this->cache['F'])) {
 
                 $hash = md5($data);
 
-                if ( !isset($this->dict['F']) || $this->dict['F'] !== $hash ) {
+                if (!isset($this->dict['F']) || $this->dict['F'] !== $hash) {
                     $this->dict['F'] = $hash;
                     $res = true;
                 } else {
@@ -89,9 +89,9 @@ 
      */
     public function last($data)
     {
-        if ( !is_array($data) && !is_object($data) && !is_null($data) ) {
+        if (!is_array($data) && !is_object($data) && !is_null($data)) {
 
-            if ( !isset($this->cache['L']) ) {
+            if (!isset($this->cache['L'])) {
 
                 $hash = md5($data);
 
@@ -131,7 +131,7 @@ 
         // When the iterator item is empty we just let the tal
         // expression consume by continuously returning this
         // same object which should evaluate to true for 'last'
-        if ( is_null($this->data) ) {
+        if (is_null($this->data)) {
             return $this;
         }
 
@@ -139,7 +139,7 @@ 
         $value = PHPTAL_Context::path($this->data, $var, true);
 
         // Check if it's an object or an array
-        if ( is_array($value) || is_object($value) ) {
+        if (is_array($value) || is_object($value)) {
             // Move the context to the requested variable and return
             $this->data = $value;
             $this->addVarName($var);
@@ -150,12 +150,12 @@ 
         $hash = md5($value);
 
         // compute a path for the variable to use as dictionary key
-        $path = $this->branch . $this->getVarPath() . $var;
+        $path = $this->branch.$this->getVarPath().$var;
 
         // If we don't know about this var store in the dictionary
-        if ( !isset($this->cache[$path]) ) {
+        if (!isset($this->cache[$path])) {
 
-            if ( !isset($this->dict[$path]) ) {
+            if (!isset($this->dict[$path])) {
                 $this->dict[$path] = $hash;
                 $res = $this->branch === 'F';
             } else {
@@ -194,6 +194,6 @@ 
      */
     protected function getVarPath()
     {
-        return implode('/', $this->vars) . '/';
+        return implode('/', $this->vars).'/';
     }
 }

classes/PHPTAL/FileSource.php

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
     public function __construct($path)
     {
         $this->_path = realpath($path);
-        if ($this->_path === false) throw new PHPTAL_IOException("Unable to find real path of file '$path' (in ".getcwd().')');
+        if ($this->_path === false) {
+            throw new PHPTAL_IOException("Unable to find real path of file '$path' (in ".getcwd().')');
+        }
     }
 
     public function getRealPath()

classes/PHPTAL/Tokenizer.php

Braces +6 added lines, -2 removed lines

@@ -36,7 +36,9 @@ 
 
     function skipSpace()
     {
-        while ($this->current_token === 'SPACE') $this->nextToken();
+        while ($this->current_token === 'SPACE') {
+            $this->nextToken();
+        }
     }
 
     function nextToken()
@@ -47,7 +49,9 @@ 
         }
 
         //if (!preg_match_all($this->regex, $this->str, $m, PREG_SET_ORDER, $this->offset)) throw new Exception("FAIL {$this->regex} at {$this->offset}");
-        if (!preg_match($this->regex, $this->str, $m, null, $this->offset)) throw new Exception("FAIL {$this->regex} didn't match '{$this->str}' at {$this->offset}");
+        if (!preg_match($this->regex, $this->str, $m, null, $this->offset)) {
+            throw new Exception("FAIL {$this->regex} didn't match '{$this->str}' at {$this->offset}");
+        }
 
         $this->offset += strlen($m[0]); // in bytes
 

classes/PHPTAL/Tales.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  * @see PHPTAL_Php_TalesInternal::compileToPHPExpressions()
  * @return string
  */
-function phptal_tale($expression, $nothrow=false)
+function phptal_tale($expression, $nothrow = false)
 {
     return PHPTAL_Php_TalesInternal::compileToPHPExpression($expression, $nothrow);
 }
@@ -51,7 +51,7 @@ 
  * @param bool $nothrow if true, invalid expression will return NULL (at run time) rather than throwing exception
  * @return string or array
  */
-function phptal_tales($expression, $nothrow=false)
+function phptal_tales($expression, $nothrow = false)
 {
     return PHPTAL_Php_TalesInternal::compileToPHPExpressions($expression, $nothrow);
 }

classes/PHPTAL/TranslationService.php

Spacing +1 added lines, -1 removed lines

@@ -58,5 +58,5 @@
      * @param string $key - translation key, e.g. "hello ${username}!"
      * @param string $htmlescape - if true, you should HTML-escape translated string. You should never HTML-escape interpolated variables.
      */
-    function translate($key, $htmlescape=true);
+    function translate($key, $htmlescape = true);
 }