phptal / PHPTAL

classes/PHPTAL.php

Indentation +4 added lines, -4 removed lines

@@ -966,10 +966,10 @@ 
      */
     public function getFunctionName()
     {
-       // function name is used as base for caching, so it must be unique for
-       // every combination of settings that changes code in compiled template
+        // function name is used as base for caching, so it must be unique for
+        // every combination of settings that changes code in compiled template
 
-       if (!$this->_functionName) {
+        if (!$this->_functionName) {
 
             // just to make tempalte name recognizable
             $basename = preg_replace('/\.[a-z]{3,5}$/', '', basename($this->_source->getRealPath()));
@@ -989,7 +989,7 @@ 
             $hash = strtr(rtrim(base64_encode($hash),"="),"+/=","_A_");
 
             $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()) .
-                                   $basename . '__' . $hash;
+                                    $basename . '__' . $hash;
         }
         return $this->_functionName;
     }

Braces +23 added lines, -15 removed lines

@@ -379,7 +379,9 @@ 
         $enc = strtoupper($enc);
         if ($enc != $this->_encoding) {
             $this->_encoding = $enc;
-            if ($this->_translator) $this->_translator->setEncoding($enc);
+            if ($this->_translator) {
+                $this->_translator->setEncoding($enc);
+            }
 
             $this->resetPrepared();
         }
@@ -666,8 +668,7 @@ 
                 ob_start();
                 $templateFunction($this, $this->_context);
                 $res = ob_get_clean();
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 ob_end_clean();
                 throw $e;
@@ -686,8 +687,7 @@ 
             if ($this->_postfilter) {
                 return $this->_postfilter->filter($res);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             PHPTAL_ExceptionHandler::handleException($e, $this->getEncoding());
         }
@@ -717,8 +717,7 @@ 
 
             $templateFunction = $this->getFunctionName();
             $templateFunction($this, $this->_context);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             PHPTAL_ExceptionHandler::handleException($e, $this->getEncoding());
         }
@@ -835,8 +834,7 @@ 
                 ob_start();
                 try {
                     eval("?>\n".$result);
-                }
-                catch(ParseError $parseError) {
+                } catch(ParseError $parseError) {
                     ob_end_clean();
                     throw new PHPTAL_TemplateException(
                         'Parse error: ' . $parseError->getMessage(),
@@ -844,8 +842,7 @@ 
                         $parseError->getLine(),
                         $parseError
                     );
-                }
-                catch(Exception $e) {
+                } catch(Exception $e) {
                     ob_end_clean();
                     throw $e;
                 }
@@ -854,7 +851,11 @@ 
                     $msg = str_replace('eval()\'d code', $this->getCodePath(), ob_get_clean());
 
                     // greedy .* ensures last match
-                    if (preg_match('/.*on line (\d+)$/m', $msg, $m)) $line=$m[1]; else $line=0;
+                    if (preg_match('/.*on line (\d+)$/m', $msg, $m)) {
+                        $line=$m[1];
+                    } else {
+                        $line=0;
+                    }
                     throw new PHPTAL_TemplateException(trim($msg), $this->getCodePath(), $line);
                 }
                 ob_end_clean();
@@ -948,7 +949,10 @@ 
         $cacheFiles = glob($filename . '?*');
         if ($cacheFiles) {
             foreach ($cacheFiles as $file) {
-                if (substr($file, 0, strlen($filename)) !== $filename) continue; // safety net
+                if (substr($file, 0, strlen($filename)) !== $filename) {
+                    continue;
+                }
+                // safety net
                 @unlink($file);
             }
         }
@@ -965,7 +969,9 @@ 
      */
     public function getCodePath()
     {
-        if (!$this->_codeFile) $this->setCodeFile();
+        if (!$this->_codeFile) {
+            $this->setCodeFile();
+        }
         return $this->_codeFile;
     }
 
@@ -1196,7 +1202,9 @@ 
             $class = strtr($class, '\\', '_');
         }
 
-        if (substr($class, 0, 7) !== 'PHPTAL_') return;
+        if (substr($class, 0, 7) !== 'PHPTAL_') {
+            return;
+        }
 
         $path = dirname(__FILE__) . strtr("_".$class, "_", DIRECTORY_SEPARATOR) . '.php';
 

classes/PHPTAL/Php/Transformer.php

Braces +10 added lines, -7 removed lines

@@ -63,8 +63,11 @@ 
 
 
         for ($i = 0; $i <= $len; $i++) {
-            if ($i == $len) $c = "\0";
-            else $c = $str[$i];
+            if ($i == $len) {
+                $c = "\0";
+            } else {
+                $c = $str[$i];
+            }
 
             switch ($state) {
 
@@ -85,8 +88,7 @@ 
                         $state = self::ST_EVAL;
                         $mark = $i+1;
                         $result .= $prefix.'{';
-                    }
-                    elseif (self::isDigit($c))
+                    } elseif (self::isDigit($c))
                     {
                         $state = self::ST_NUM;
                         $mark = $i;
@@ -126,8 +128,7 @@ 
                     elseif ($c === '@') {
                         $state = self::ST_DEFINE;
                         $mark = $i+1;
-                    }
-                    elseif (ctype_space($c)) {
+                    } elseif (ctype_space($c)) {
                         $state = self::ST_WHITE;
                         $result .= $c;
                     }
@@ -377,7 +378,9 @@ 
         $result = trim($result);
 
         // CodeWriter doesn't like expressions that look like blocks
-        if ($result[strlen($result)-1] === '}') return '('.$result.')';
+        if ($result[strlen($result)-1] === '}') {
+            return '('.$result.')';
+        }
 
         return $result;
     }

classes/PHPTAL/Php/Attribute.php

Braces +5 added lines, -4 removed lines

@@ -76,10 +76,11 @@
 
     protected function doEchoAttribute(PHPTAL_Php_CodeWriter $codewriter, $code)
     {
-        if ($this->_echoType === self::ECHO_TEXT)
-            $codewriter->doEcho($code);
-        else
-            $codewriter->doEchoRaw($code);
+        if ($this->_echoType === self::ECHO_TEXT) {
+                    $codewriter->doEcho($code);
+        } else {
+                    $codewriter->doEchoRaw($code);
+        }
     }
 
     protected function parseSetExpression($exp)

classes/PHPTAL/Php/Attribute/TAL/Attributes.php

Braces +13 added lines, -9 removed lines

@@ -115,10 +115,11 @@ 
 
         $codewriter->doIf("null !== ($attkey = ($code))");
 
-        if ($this->_echoType !== PHPTAL_Php_Attribute::ECHO_STRUCTURE)
-            $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->escapeCode($attkey).".'\"'");
-        else
-            $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->stringifyCode($attkey).".'\"'");
+        if ($this->_echoType !== PHPTAL_Php_Attribute::ECHO_STRUCTURE) {
+                    $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->escapeCode($attkey).".'\"'");
+        } else {
+                    $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->stringifyCode($attkey).".'\"'");
+        }
 
         $codewriter->doElse();
         $codewriter->doSetVar($attkey, "''");
@@ -166,7 +167,9 @@ 
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
     {
-        foreach ($this->vars_to_recycle as $var) $codewriter->recycleTempVariable($var);
+        foreach ($this->vars_to_recycle as $var) {
+            $codewriter->recycleTempVariable($var);
+        }
     }
 
     public function talesChainNothingKeyword(PHPTAL_Php_TalesChainExecutor $executor)
@@ -202,10 +205,11 @@ 
         }
         $executor->doIf($condition);
 
-        if ($this->_echoType == PHPTAL_Php_Attribute::ECHO_STRUCTURE)
-            $value = $codewriter->stringifyCode($this->_attkey);
-        else
-            $value = $codewriter->escapeCode($this->_attkey);
+        if ($this->_echoType == PHPTAL_Php_Attribute::ECHO_STRUCTURE) {
+                    $value = $codewriter->stringifyCode($this->_attkey);
+        } else {
+                    $value = $codewriter->escapeCode($this->_attkey);
+        }
 
         $codewriter->doSetVar($this->_attkey, $codewriter->str(" {$this->_attribute}=\"").".$value.'\"'");
     }

classes/PHPTAL/Php/Attribute/TAL/OmitTag.php

Braces +3 added lines, -1 removed lines

@@ -64,7 +64,9 @@
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
     {
-        if ($this->varname) $codewriter->recycleTempVariable($this->varname);
+        if ($this->varname) {
+            $codewriter->recycleTempVariable($this->varname);
+        }
     }
 }
 

classes/PHPTAL/Php/Attribute/TAL/Define.php

Braces +15 added lines, -5 removed lines

@@ -62,7 +62,9 @@ 
             $this->_defineScope = $defineScope;
 
             // <span tal:define="global foo" /> should be invisible, but <img tal:define="bar baz" /> not
-            if ($defineScope != 'global') $definesAnyNonGlobalVars = true;
+            if ($defineScope != 'global') {
+                $definesAnyNonGlobalVars = true;
+            }
 
             if ($this->_defineScope != 'global' && !$this->_pushedContext) {
                 $codewriter->pushContext();
@@ -94,7 +96,9 @@ 
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
     {
-        if ($this->tmp_content_var) $codewriter->recycleTempVariable($this->tmp_content_var);
+        if ($this->tmp_content_var) {
+            $codewriter->recycleTempVariable($this->tmp_content_var);
+        }
         if ($this->_pushedContext) {
             $codewriter->popContext();
         }
@@ -109,7 +113,9 @@ 
 
     public function talesChainNothingKeyword(PHPTAL_Php_TalesChainExecutor $executor)
     {
-        if (!$this->_chainPartGenerated) throw new PHPTAL_TemplateException("Invalid expression in tal:define", $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+        if (!$this->_chainPartGenerated) {
+            throw new PHPTAL_TemplateException("Invalid expression in tal:define", $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+        }
 
         $executor->doElse();
         $this->doDefineVarWith($executor->getCodeWriter(), 'null');
@@ -118,7 +124,9 @@ 
 
     public function talesChainDefaultKeyword(PHPTAL_Php_TalesChainExecutor $executor)
     {
-        if (!$this->_chainPartGenerated) throw new PHPTAL_TemplateException("Invalid expression in tal:define", $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+        if (!$this->_chainPartGenerated) {
+            throw new PHPTAL_TemplateException("Invalid expression in tal:define", $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+        }
 
         $executor->doElse();
         $this->bufferizeContent($executor->getCodeWriter());
@@ -165,7 +173,9 @@ 
 
         // extract varname and expression from remaining of expression
         list($defineVar, $exp) = $this->parseSetExpression($exp);
-        if ($exp !== null) $exp = trim($exp);
+        if ($exp !== null) {
+            $exp = trim($exp);
+        }
         return array($defineScope, $defineVar, $exp);
     }
 

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

Braces +3 added lines, -1 removed lines

@@ -73,8 +73,10 @@
                 $code = $this->_getTranslationCode($codewriter, $key);
             } else {
                 $attr = $this->phpelement->getAttributeNode($qname);
-                if (!$attr) throw new PHPTAL_TemplateException("Unable to translate attribute $qname, because there is no translation key specified",
+                if (!$attr) {
+                    throw new PHPTAL_TemplateException("Unable to translate attribute $qname, because there is no translation key specified",
                                         $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
+                }
 
                 if ($attr->getReplacedState() === PHPTAL_Dom_Attr::NOT_REPLACED) {
                     $code = $this->_getTranslationCode($codewriter, $attr->getValue());

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

Braces +6 added lines, -3 removed lines

@@ -52,8 +52,9 @@ 
             $code = $codewriter->str($key);
         } else {
             $code = $codewriter->evaluateExpression($this->expression);
-            if (is_array($code))
-                return $this->generateChainedContent($codewriter, $code);
+            if (is_array($code)) {
+                            return $this->generateChainedContent($codewriter, $code);
+            }
 
             $code = $codewriter->evaluateExpression($this->expression);
         }
@@ -100,7 +101,9 @@ 
                     if ($preserve_tags) {
                         $result .= '<'.$child->getQualifiedName();
                         foreach ($child->getAttributeNodes() as $attr) {
-                            if ($attr->getReplacedState() === PHPTAL_Dom_Attr::HIDDEN) continue;
+                            if ($attr->getReplacedState() === PHPTAL_Dom_Attr::HIDDEN) {
+                                continue;
+                            }
 
                             $result .= ' '.$attr->getQualifiedName().'="'.$attr->getValueEscaped().'"';
                         }

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)

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