phptal / PHPTAL

classes/PHPTAL/Php/Transformer.php

Spacing +25 added lines, -25 removed lines

@@ -37,20 +37,20 @@ 
 class PHPTAL_Php_Transformer
 {
     const ST_WHITE  = -1; // start of string or whitespace
-    const ST_NONE   = 0;  // pass through (operators, parens, etc.)
-    const ST_STR    = 1;  // 'foo'
-    const ST_ESTR   = 2;  // "foo ${x} bar"
-    const ST_VAR    = 3;  // abcd
-    const ST_NUM    = 4;  // 123.02
-    const ST_EVAL   = 5;  // $somevar
-    const ST_MEMBER = 6;  // abcd.x
-    const ST_STATIC = 7;  // class::[$]static|const
-    const ST_DEFINE = 8;  // @MY_DEFINE
+    const ST_NONE   = 0; // pass through (operators, parens, etc.)
+    const ST_STR    = 1; // 'foo'
+    const ST_ESTR   = 2; // "foo ${x} bar"
+    const ST_VAR    = 3; // abcd
+    const ST_NUM    = 4; // 123.02
+    const ST_EVAL   = 5; // $somevar
+    const ST_MEMBER = 6; // abcd.x
+    const ST_STATIC = 7; // class::[$]static|const
+    const ST_DEFINE = 8; // @MY_DEFINE
 
     /**
      * transform PHPTAL's php-like syntax into real PHP
      */
-    public static function transform($str, $prefix='$')
+    public static function transform($str, $prefix = '$')
     {
         $len = strlen($str);
         $state = self::ST_WHITE;
@@ -119,7 +119,7 @@ 
                             $result .= '->';
                             $state = self::ST_MEMBER;
                             $mark = $i+2;
-                            $i+=2;
+                            $i += 2;
                         }
                     }
                     // @ is an access to some defined variable
@@ -140,7 +140,7 @@ 
                 // $xxx
                 case self::ST_EVAL:
                     if (!self::isVarNameChar($c)) {
-                        $result .= $prefix . substr($str, $mark, $i-$mark);
+                        $result .= $prefix.substr($str, $mark, $i-$mark);
                         $result .= '}';
                         $state = self::ST_NONE;
                     }
@@ -177,10 +177,10 @@ 
                     // instring interpolation, search } and transform the
                     // interpollation to insert it into the string
                     elseif ($c === '$' && $i+1 < $len && $str[$i+1] === '{') {
-                        $result .= substr($str, $mark, $i-$mark) . '{';
+                        $result .= substr($str, $mark, $i-$mark).'{';
 
                         $sub = 0;
-                        for ($j = $i; $j<$len; $j++) {
+                        for ($j = $i; $j < $len; $j++) {
                             if ($str[$j] === '{') {
                                 $sub++;
                             } elseif ($str[$j] === '}' && (--$sub) == 0) {
@@ -199,7 +199,7 @@ 
                     }
                     // end of var, begin of member (method or var)
                     elseif ($c === '.') {
-                        $result .= $prefix . substr($str, $mark, $i-$mark);
+                        $result .= $prefix.substr($str, $mark, $i-$mark);
                         $result .= '->';
                         $state = self::ST_MEMBER;
                         $mark = $i+1;
@@ -219,10 +219,10 @@ 
                     }
                     // array index, the var is done
                     elseif ($c === '[') {
-                        if ($str[$mark]==='_') { // superglobal?
-                            $result .= '$' . substr($str, $mark, $i-$mark+1);
+                        if ($str[$mark] === '_') { // superglobal?
+                            $result .= '$'.substr($str, $mark, $i-$mark+1);
                         } else {
-                            $result .= $prefix . substr($str, $mark, $i-$mark+1);
+                            $result .= $prefix.substr($str, $mark, $i-$mark+1);
                         }
                         $state = self::ST_NONE;
                     }
@@ -252,7 +252,7 @@ 
                         }
                         // regular variable
                         else {
-                            $result .= $prefix . $var;
+                            $result .= $prefix.$var;
                         }
                         $i--;
                         $state = self::ST_NONE;
@@ -265,7 +265,7 @@ 
                     }
                     // eval mode ${foo}
                     elseif ($c === '$' && ($i >= $len-2 || $str[$i+1] !== '{')) {
-                        $result .= '{' . $prefix;
+                        $result .= '{'.$prefix;
                         $mark++;
                         $eval = true;
                     }
@@ -276,7 +276,7 @@ 
                     // end of var member var, begin of new member
                     elseif ($c === '.') {
                         $result .= substr($str, $mark, $i-$mark);
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $result .= '->';
                         $mark = $i+1;
                         $state = self::ST_MEMBER;
@@ -284,24 +284,24 @@ 
                     // begin of static access
                     elseif ($c === ':') {
                         $result .= substr($str, $mark, $i-$mark+1);
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $state = self::ST_STATIC;
                         break;
                     }
                     // the member is a method or an array
                     elseif ($c === '(' || $c === '[') {
                         $result .= substr($str, $mark, $i-$mark+1);
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $state = self::ST_NONE;
                     }
                     // regular end of member, it is a var
                     else {
                         $var = substr($str, $mark, $i-$mark);
-                        if ($var !== '' && !preg_match('/^[a-z][a-z0-9_\x7f-\xff]*$/i',$var)) {
+                        if ($var !== '' && !preg_match('/^[a-z][a-z0-9_\x7f-\xff]*$/i', $var)) {
                             throw new PHPTAL_ParserException("Invalid field name '$var' in expression php:$str");
                         }
                         $result .= $var;
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $state = self::ST_NONE;
                         $i--;
                     }

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

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
         $executor->doElse();
         $attr_str = ($this->_default_escaped !== false)
             ? ' '.$this->_attribute.'='.$codewriter->quoteAttributeValue($this->_default_escaped)  // default value
-            : '';                                 // do not print attribute
+            : ''; // do not print attribute
         $codewriter->doSetVar($this->_attkey, $codewriter->str($attr_str));
         $executor->breakChain();
     }

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

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
             $code = 'false';
         }
 
-        $codewriter->doIf('phptal_true(' . $code . ')');
+        $codewriter->doIf('phptal_true('.$code.')');
     }
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
@@ -65,12 +65,12 @@ 
     {
         // check if the expression is empty
         if ($exp !== 'false') {
-            $this->expressions[] = '!phptal_isempty(' . $exp . ')';
+            $this->expressions[] = '!phptal_isempty('.$exp.')';
         }
 
         if ($islast) {
             // for the last one in the chain build a ORed condition
-            $executor->getCodeWriter()->doIf( implode(' || ', $this->expressions ) );
+            $executor->getCodeWriter()->doIf(implode(' || ', $this->expressions));
             // The executor will always end an if so we output a dummy if
             $executor->doIf('false');
         }

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

Spacing +7 added lines, -7 removed lines

@@ -34,8 +34,8 @@ 
         $escape = true;
         $this->_echoType = PHPTAL_Php_Attribute::ECHO_TEXT;
         if (preg_match('/^(text|structure)(?:\s+(.*)|\s*$)/', $this->expression, $m)) {
-            if ($m[1]=='structure') { $escape=false; $this->_echoType = PHPTAL_Php_Attribute::ECHO_STRUCTURE; }
-            $this->expression = isset($m[2])?$m[2]:'';
+            if ($m[1] == 'structure') { $escape = false; $this->_echoType = PHPTAL_Php_Attribute::ECHO_STRUCTURE; }
+            $this->expression = isset($m[2]) ? $m[2] : '';
         }
 
         $this->_prepareNames($codewriter, $this->phpelement);
@@ -44,7 +44,7 @@ 
         // a translation key
         if (strlen(trim($this->expression)) == 0) {
             $key = $this->_getTranslationKey($this->phpelement, !$escape, $codewriter->getEncoding());
-            $key = trim(preg_replace('/\s+/sm'.($codewriter->getEncoding()=='UTF-8'?'u':''), ' ', $key));
+            $key = trim(preg_replace('/\s+/sm'.($codewriter->getEncoding() == 'UTF-8' ? 'u' : ''), ' ', $key));
             if ('' === trim($key)) {
                 throw new PHPTAL_TemplateException("Empty translation key",
                             $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
@@ -58,7 +58,7 @@ 
             $code = $codewriter->evaluateExpression($this->expression);
         }
 
-        $codewriter->pushCode('echo '.$codewriter->getTranslatorReference().'->translate('.$code.','.($escape ? 'true':'false').');');
+        $codewriter->pushCode('echo '.$codewriter->getTranslatorReference().'->translate('.$code.','.($escape ? 'true' : 'false').');');
     }
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
@@ -70,7 +70,7 @@ 
         $codewriter = $executor->getCodeWriter();
 
         $escape = !($this->_echoType == PHPTAL_Php_Attribute::ECHO_STRUCTURE);
-        $exp = $codewriter->getTranslatorReference()."->translate($exp, " . ($escape ? 'true':'false') . ')';
+        $exp = $codewriter->getTranslatorReference()."->translate($exp, ".($escape ? 'true' : 'false').')';
         if (!$islast) {
             $var = $codewriter->createTempVariable();
             $executor->doIf('!phptal_isempty('.$var.' = '.$exp.')');
@@ -94,7 +94,7 @@ 
                 }
             } elseif ($child instanceof PHPTAL_Dom_Element) {
                 if ($attr = $child->getAttributeNodeNS('http://xml.zope.org/namespaces/i18n', 'name')) {
-                    $result .= '${' . $attr->getValue() . '}';
+                    $result .= '${'.$attr->getValue().'}';
                 } else {
 
                     if ($preserve_tags) {
@@ -104,7 +104,7 @@ 
 
                             $result .= ' '.$attr->getQualifiedName().'="'.$attr->getValueEscaped().'"';
                         }
-                        $result .= '>'.$this->_getTranslationKey($child, $preserve_tags, $encoding) . '</'.$child->getQualifiedName().'>';
+                        $result .= '>'.$this->_getTranslationKey($child, $preserve_tags, $encoding).'</'.$child->getQualifiedName().'>';
                     } else {
                         $result .= $this->_getTranslationKey($child, $preserve_tags, $encoding);
                     }

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().'"';
                         }