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

Spacing +33 added lines, -33 removed lines

@@ -175,7 +175,7 @@ 
      *
      * @param string $path Template file path.
      */
-    public function __construct($path=false)
+    public function __construct($path = false)
     {
         $this->_path = $path;
         $this->_globalContext = new stdClass();
@@ -203,7 +203,7 @@ 
      *
      * @return PHPTAL
      */
-    public static function create($path=false)
+    public static function create($path = false)
     {
         return new PHPTAL($path);
     }
@@ -408,7 +408,7 @@ 
      */
     public function setPhpCodeDestination($path)
     {
-        $this->_phpCodeDestination = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $this->_phpCodeDestination = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
         $this->resetPrepared();
         return $this;
     }
@@ -548,7 +548,7 @@ 
     private function getPreFiltersCacheId()
     {
         $cacheid = '';
-        foreach($this->getPreFilters() as $key => $prefilter) {
+        foreach ($this->getPreFilters() as $key => $prefilter) {
             if ($prefilter instanceof PHPTAL_PreFilter) {
                 $cacheid .= $key.$prefilter->getCacheId();
             } elseif ($prefilter instanceof PHPTAL_Filter) {
@@ -569,7 +569,7 @@ 
     {
         $prefilters = $this->getPreFilters();
 
-        foreach($prefilters as $prefilter) {
+        foreach ($prefilters as $prefilter) {
             if ($prefilter instanceof PHPTAL_PreFilter) {
                 $prefilter->setPHPTAL($this);
             }
@@ -675,12 +675,12 @@ 
 
             // unshift doctype
             if ($this->_context->_docType) {
-                $res = $this->_context->_docType . $res;
+                $res = $this->_context->_docType.$res;
             }
 
             // unshift xml declaration
             if ($this->_context->_xmlDeclaration) {
-                $res = $this->_context->_xmlDeclaration . "\n" . $res;
+                $res = $this->_context->_xmlDeclaration."\n".$res;
             }
 
             if ($this->_postfilter) {
@@ -768,7 +768,7 @@ 
                 $this->externalMacroTemplatesCache[$file] = $tpl;
             }
 
-            $fun = $tpl->getFunctionName() . '_' . strtr($macroName, "-", "_");
+            $fun = $tpl->getFunctionName().'_'.strtr($macroName, "-", "_");
             if (!function_exists($fun)) {
                 throw new PHPTAL_MacroMissingException("Macro '$macroName' is not defined in $file", $this->_source->getRealPath());
             }
@@ -777,11 +777,11 @@ 
 
         } else {
             // call local macro
-            $fun = $local_tpl->getFunctionName() . '_' . strtr($path, "-", "_");
+            $fun = $local_tpl->getFunctionName().'_'.strtr($path, "-", "_");
             if (!function_exists($fun)) {
                 throw new PHPTAL_MacroMissingException("Macro '$path' is not defined", $local_tpl->_source->getRealPath());
             }
-            $fun( $local_tpl, $this);
+            $fun($local_tpl, $this);
         }
     }
 
@@ -791,7 +791,7 @@ 
     private function setCodeFile()
     {
         $this->findTemplate();
-        $this->_codeFile = $this->getPhpCodeDestination() . $this->getFunctionName() . '.' . $this->getPhpCodeExtension();
+        $this->_codeFile = $this->getPhpCodeDestination().$this->getFunctionName().'.'.$this->getPhpCodeExtension();
     }
 
     protected function resetPrepared()
@@ -819,7 +819,7 @@ 
 
                 // i'm not sure where that belongs, but not in normal path of execution
                 // because some sites have _a lot_ of files in temp
-                if ($this->getCachePurgeFrequency() && mt_rand()%$this->getCachePurgeFrequency() == 0) {
+                if ($this->getCachePurgeFrequency() && mt_rand() % $this->getCachePurgeFrequency() == 0) {
                     $this->cleanUpGarbage();
                 }
 
@@ -836,16 +836,16 @@ 
                 try {
                     eval("?>\n".$result);
                 }
-                catch(ParseError $parseError) {
+                catch (ParseError $parseError) {
                     ob_end_clean();
                     throw new PHPTAL_TemplateException(
-                        'Parse error: ' . $parseError->getMessage(),
+                        'Parse error: '.$parseError->getMessage(),
                         $this->getCodePath(),
                         $parseError->getLine(),
                         $parseError
                     );
                 }
-                catch(Exception $e) {
+                catch (Exception $e) {
                     ob_end_clean();
                     throw $e;
                 }
@@ -854,7 +854,7 @@ 
                     $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();
@@ -895,7 +895,7 @@ 
      */
     public function setCachePurgeFrequency($n)
     {
-        $this->_cachePurgeFrequency = (int)$n;
+        $this->_cachePurgeFrequency = (int) $n;
         return $this;
     }
 
@@ -915,14 +915,14 @@ 
      */
     public function cleanUpGarbage()
     {
-        $cacheFilesExpire = time() - $this->getCacheLifetime() * 3600 * 24;
+        $cacheFilesExpire = time()-$this->getCacheLifetime() * 3600 * 24;
 
         // relies on templates sorting order being related to their modification dates
-        $upperLimit = $this->getPhpCodeDestination() . $this->getFunctionNamePrefix($cacheFilesExpire) . '_';
-        $lowerLimit = $this->getPhpCodeDestination() . $this->getFunctionNamePrefix(0);
+        $upperLimit = $this->getPhpCodeDestination().$this->getFunctionNamePrefix($cacheFilesExpire).'_';
+        $lowerLimit = $this->getPhpCodeDestination().$this->getFunctionNamePrefix(0);
 
         // second * gets phptal:cache
-        $cacheFiles = glob($this->getPhpCodeDestination() . 'tpl_????????_*.' . $this->getPhpCodeExtension() . '*');
+        $cacheFiles = glob($this->getPhpCodeDestination().'tpl_????????_*.'.$this->getPhpCodeExtension().'*');
 
         if ($cacheFiles) {
             foreach ($cacheFiles as $index => $file) {
@@ -945,7 +945,7 @@ 
     public function cleanUpCache()
     {
         $filename = $this->getCodePath();
-        $cacheFiles = glob($filename . '?*');
+        $cacheFiles = glob($filename.'?*');
         if ($cacheFiles) {
             foreach ($cacheFiles as $file) {
                 if (substr($file, 0, strlen($filename)) !== $filename) continue; // safety net
@@ -984,7 +984,7 @@ 
             $basename = preg_replace('/\.[a-z]{3,5}$/', '', basename($this->_source->getRealPath()));
             $basename = substr(trim(preg_replace('/[^a-zA-Z0-9]+/', '_', $basename), "_"), 0, 20);
 
-            $hash = md5(PHPTAL_VERSION . PHP_VERSION
+            $hash = md5(PHPTAL_VERSION.PHP_VERSION
                     . $this->_source->getRealPath()
                     . $this->getEncoding()
                     . $this->getPrefiltersCacheId()
@@ -995,10 +995,10 @@ 
             // uses base64 rather than hex to make filename shorter.
             // there is loss of some bits due to name constraints and case-insensivity,
             // but that's still over 110 bits in addition to basename and timestamp.
-            $hash = strtr(rtrim(base64_encode($hash),"="),"+/=","_A_");
+            $hash = strtr(rtrim(base64_encode($hash), "="), "+/=", "_A_");
 
-            $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()) .
-                                   $basename . '__' . $hash;
+            $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()).
+                                   $basename.'__'.$hash;
         }
         return $this->_functionName;
     }
@@ -1015,7 +1015,7 @@ 
     {
         // tpl_ prefix and last modified time must not be changed,
         // because cache cleanup relies on that
-        return 'tpl_' . sprintf("%08x", $timestamp) .'_';
+        return 'tpl_'.sprintf("%08x", $timestamp).'_';
     }
 
     /**
@@ -1045,7 +1045,7 @@ 
      */
     public function addError(Exception $error)
     {
-        $this->_errors[] =  $error;
+        $this->_errors[] = $error;
     }
 
     /**
@@ -1101,7 +1101,7 @@ 
         $data = $this->_source->getData();
 
         $prefilters = $this->getPreFilterInstances();
-        foreach($prefilters as $prefilter) {
+        foreach ($prefilters as $prefilter) {
             $data = $prefilter->filter($data);
         }
 
@@ -1111,7 +1111,7 @@ 
         $builder = new PHPTAL_Dom_PHPTALDocumentBuilder();
         $tree = $parser->parseString($builder, $data, $realpath)->getResult();
 
-        foreach($prefilters as $prefilter) {
+        foreach ($prefilters as $prefilter) {
             if ($prefilter instanceof PHPTAL_PreFilter) {
                 if ($prefilter->filterDOM($tree) !== NULL) {
                     throw new PHPTAL_ConfigurationException("Don't return value from filterDOM()");
@@ -1198,7 +1198,7 @@ 
 
         if (substr($class, 0, 7) !== 'PHPTAL_') return;
 
-        $path = dirname(__FILE__) . strtr("_".$class, "_", DIRECTORY_SEPARATOR) . '.php';
+        $path = dirname(__FILE__).strtr("_".$class, "_", DIRECTORY_SEPARATOR).'.php';
 
         require $path;
     }
@@ -1223,9 +1223,9 @@ 
         // Prepending PHPTAL's autoloader helps if there are other autoloaders
         // that throw/die when file is not found. Only >5.3 though.
         if (version_compare(PHP_VERSION, '5.3', '>=')) {
-            spl_autoload_register(array(__CLASS__,'autoload'), false, true);
+            spl_autoload_register(array(__CLASS__, 'autoload'), false, true);
         } else {
-            spl_autoload_register(array(__CLASS__,'autoload'));
+            spl_autoload_register(array(__CLASS__, 'autoload'));
         }
 
         if ($uses_autoload) {

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

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

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;

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";
         }

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