phptal / PHPTAL

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

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);
 

classes/PHPTAL/RepeatController.php

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/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/PreFilter/Normalize.php

Braces +6 added lines, -2 removed lines

@@ -76,7 +76,9 @@ 
     protected function findElementToFilter(PHPTAL_Dom_Element $root)
     {
         foreach ($root->childNodes as $node) {
-            if (!$node instanceof PHPTAL_Dom_Element) continue;
+            if (!$node instanceof PHPTAL_Dom_Element) {
+                continue;
+            }
 
             if ($node->getAttributeNS("http://www.w3.org/XML/1998/namespace", 'space') == 'default') {
                 $this->filterDOM($node);
@@ -99,7 +101,9 @@ 
         foreach ($element->getAttributeNodes() as $attrnode) {
 
             // skip replaced attributes (because getValueEscaped on them is meaningless)
-            if ($attrnode->getReplacedState() !== PHPTAL_Dom_Attr::NOT_REPLACED) continue;
+            if ($attrnode->getReplacedState() !== PHPTAL_Dom_Attr::NOT_REPLACED) {
+                continue;
+            }
 
             $val = $this->normalizeSpace($attrnode->getValueEscaped(), $attrnode->getEncoding());
             $attrnode->setValueEscaped(trim($val, ' '));

classes/PHPTAL/PreFilter/Compress.php

Braces +1 added lines, -2 removed lines

@@ -260,8 +260,7 @@
 	            $element->removeAttributeNS('','http-equiv');
 	            $element->removeAttributeNS('','content');
 	            $element->setAttributeNS('','charset',strtolower($this->getPHPTAL()->getEncoding()));
-        }
-        elseif (('link' === $element->getLocalName() && $element->getAttributeNS('','rel') === 'stylesheet') ||
+        } elseif (('link' === $element->getLocalName() && $element->getAttributeNS('','rel') === 'stylesheet') ||
             ('style' === $element->getLocalName())) {
             // There's only one type of stylesheets that works.
             $element->removeAttributeNS('','type');

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

Braces +14 added lines, -10 removed lines

@@ -116,8 +116,7 @@ 
             } else {
                 throw new PHPTAL_ConfigurationException("Executed macro in file with DOCTYPE when using echoExecute(). This is not supported yet. Remove DOCTYPE or use PHPTAL->execute().");
             }
-        }
-        else if (!$this->_docType) {
+        } else if (!$this->_docType) {
             $this->_docType = $doctype;
         }
     }
@@ -317,7 +316,9 @@ 
     {
         if ($current !== $path) {
             $pathinfo = " (in path '.../$path')";
-        } else $pathinfo = '';
+        } else {
+            $pathinfo = '';
+        }
 
         if (!empty($basename)) {
             $basename = "'" . $basename . "' ";
@@ -353,7 +354,9 @@ 
     public static function path($base, $path, $nothrow=false)
     {
         if ($base === null) {
-            if ($nothrow) return null;
+            if ($nothrow) {
+                return null;
+            }
             PHPTAL_Context::pathError($base, $path, $path, $path);
         }
 
@@ -413,8 +416,7 @@ 
                     {
                         $base = $base->__call($current, array());
                         continue;
-                    }
-                    catch(BadMethodCallException $e) {}
+                    } catch(BadMethodCallException $e) {}
                 }
 
                 if (is_callable($base)) {
@@ -444,8 +446,9 @@ 
                     continue;
                 }
 
-                if ($nothrow)
-                    return null;
+                if ($nothrow) {
+                                    return null;
+                }
 
                 PHPTAL_Context::pathError($base, $path, $current, $prev);
             }
@@ -467,8 +470,9 @@ 
 
             // if this point is reached, then the part cannot be resolved
 
-            if ($nothrow)
-                return null;
+            if ($nothrow) {
+                            return null;
+            }
 
             PHPTAL_Context::pathError($base, $path, $current, $prev);
         }