phptal / PHPTAL

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

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         $code = $codewriter->evaluateExpression($expression);
 
         // instantiate controller using expression
-        $codewriter->doSetVar( $this->var.'->'.$varName, 'new PHPTAL_RepeatController('.$code.')'."\n" );
+        $codewriter->doSetVar($this->var.'->'.$varName, 'new PHPTAL_RepeatController('.$code.')'."\n");
 
         $codewriter->pushContext();
 

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

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
     /**
      * Prevents generation of invalid PHP code when given invalid TALES
      */
-    private $_chainPartGenerated=false;
+    private $_chainPartGenerated = false;
 
     public function before(PHPTAL_Php_CodeWriter $codewriter)
     {
@@ -79,7 +79,7 @@ 
             $code = $codewriter->evaluateExpression($expression);
             if (is_array($code)) {
                 $this->chainedDefine($codewriter, $code);
-            } elseif ( $code == PHPTAL_Php_TalesInternal::NOTHING_KEYWORD) {
+            } elseif ($code == PHPTAL_Php_TalesInternal::NOTHING_KEYWORD) {
                 $this->doDefineVarWith($codewriter, 'null');
             } else {
                 $this->doDefineVarWith($codewriter, $code);
@@ -127,7 +127,7 @@ 
 
     public function talesChainPart(PHPTAL_Php_TalesChainExecutor $executor, $exp, $islast)
     {
-        $this->_chainPartGenerated=true;
+        $this->_chainPartGenerated = true;
 
         if ($this->_defineScope == 'global') {
             $var = '$tpl->getGlobalContext()->'.$this->_defineVar;
@@ -173,7 +173,7 @@ 
     {
         if (!$this->_buffered) {
             $this->tmp_content_var = $codewriter->createTempVariable();
-            $codewriter->pushCode( 'ob_start()' );
+            $codewriter->pushCode('ob_start()');
             $this->phpelement->generateContent($codewriter);
             $codewriter->doSetVar($this->tmp_content_var, 'ob_get_clean()');
             $this->_buffered = true;

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

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@
  */
 class PHPTAL_Php_Attribute_I18N_Target extends PHPTAL_Php_Attribute
 {
-    public function before(PHPTAL_Php_CodeWriter $codewriter){}
-    public function after(PHPTAL_Php_CodeWriter $codewriter){}
+    public function before(PHPTAL_Php_CodeWriter $codewriter) {}
+    public function after(PHPTAL_Php_CodeWriter $codewriter) {}
 }
 

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

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
                     $code = $this->_getTranslationCode($codewriter, $attr->getValue());
                 } elseif ($attr->getReplacedState() === PHPTAL_Dom_Attr::VALUE_REPLACED && $attr->getOverwrittenVariableName()) {
                     // sadly variables won't be interpolated in this translation
-                    $code = 'echo '.$codewriter->escapeCode($codewriter->getTranslatorReference(). '->translate('.$attr->getOverwrittenVariableName().', false)');
+                    $code = 'echo '.$codewriter->escapeCode($codewriter->getTranslatorReference().'->translate('.$attr->getOverwrittenVariableName().', false)');
                 } else {
                     throw new PHPTAL_TemplateException("Unable to translate attribute $qname, because other TAL attributes are using it",
                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
@@ -104,7 +104,7 @@ 
             array_shift($m);
             $m = array_shift($m);
             foreach ($m as $name) {
-                $code .= "\n".$codewriter->getTranslatorReference(). '->setVar('.$codewriter->str($name).','.PHPTAL_Php_TalesInternal::compileToPHPExpression($name).');'; // allow more complex TAL expressions
+                $code .= "\n".$codewriter->getTranslatorReference().'->setVar('.$codewriter->str($name).','.PHPTAL_Php_TalesInternal::compileToPHPExpression($name).');'; // allow more complex TAL expressions
             }
             $code .= "\n";
         }

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

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@
  */
 class PHPTAL_Php_Attribute_I18N_Data extends PHPTAL_Php_Attribute
 {
-    public function before(PHPTAL_Php_CodeWriter $codewriter){}
-    public function after(PHPTAL_Php_CodeWriter $codewriter){}
+    public function before(PHPTAL_Php_CodeWriter $codewriter) {}
+    public function after(PHPTAL_Php_CodeWriter $codewriter) {}
 }
 

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