phptal / PHPTAL

classes/PHPTAL/Dom/Defs.php

Braces +3 added lines, -1 removed lines

@@ -119,7 +119,9 @@
      */
     public function isValidAttributeNS($namespace_uri, $local_name)
     {
-        if (!$this->isHandledNamespace($namespace_uri)) return false;
+        if (!$this->isHandledNamespace($namespace_uri)) {
+            return false;
+        }
 
         $attrs = $this->namespaces_by_uri[$namespace_uri]->getAttributes();
         return isset($attrs[$local_name]);

classes/PHPTAL/Dom/XmlnsState.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
                 $prefix_to_uri[$prefix] = $value;
             }
 
-            if ($qname == 'xmlns') {$changed=true;$current_default = $value;}
+            if ($qname == 'xmlns') {$changed = true; $current_default = $value; }
         }
 
         if ($changed) {

Braces +6 added lines, -2 removed lines

@@ -34,8 +34,12 @@
 
     public function prefixToNamespaceURI($prefix)
     {
-        if ($prefix === 'xmlns') return 'http://www.w3.org/2000/xmlns/';
-        if ($prefix === 'xml') return 'http://www.w3.org/XML/1998/namespace';
+        if ($prefix === 'xmlns') {
+            return 'http://www.w3.org/2000/xmlns/';
+        }
+        if ($prefix === 'xml') {
+            return 'http://www.w3.org/XML/1998/namespace';
+        }
 
         // domdefs provides fallback for all known phptal ns
         if (isset($this->prefix_to_uri[$prefix])) {

classes/PHPTAL/Dom/CDATASection.php

Braces +3 added lines, -1 removed lines

@@ -34,10 +34,12 @@
             $codewriter->pushHTML($codewriter->interpolateCDATA(str_replace('</', '<\/', $value)));
         } elseif (($mode === PHPTAL::XHTML && $inCDATAelement)  // safe for text/html
              || ($mode === PHPTAL::XML && preg_match('/[<>&]/', $value))  // non-useless in XML
-             || ($mode !== PHPTAL::HTML5 && preg_match('/<\?|\${structure/', $value)))  // hacks with structure (in X[HT]ML) may need it
+             || ($mode !== PHPTAL::HTML5 && preg_match('/<\?|\${structure/', $value))) {
+            // hacks with structure (in X[HT]ML) may need it
         {
             // in text/html "</" is dangerous and the only sensible way to escape is ECMAScript string escapes.
             if ($mode === PHPTAL::XHTML) $value = str_replace('</', '<\/', $value);
+        }
 
             $codewriter->pushHTML($codewriter->interpolateCDATA('<![CDATA['.$value.']]>'));
         } else {

classes/PHPTAL/Dom/DocumentBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 abstract class PHPTAL_Dom_DocumentBuilder
 {
-    protected $_stack;   /* array<PHPTAL_Dom_Node> */
+    protected $_stack; /* array<PHPTAL_Dom_Node> */
     protected $_current; /* PHPTAL_Dom_Node */
 
     protected $file, $line;

classes/PHPTAL/Dom/PHPTALDocumentBuilder.php

Braces +3 added lines, -1 removed lines

@@ -53,7 +53,9 @@
     {
         if (count($this->_stack) > 0) {
             $left='</'.$this->_current->getQualifiedName().'>';
-            for ($i = count($this->_stack)-1; $i>0; $i--) $left .= '</'.$this->_stack[$i]->getQualifiedName().'>';
+            for ($i = count($this->_stack)-1; $i>0; $i--) {
+                $left .= '</'.$this->_stack[$i]->getQualifiedName().'>';
+            }
             throw new PHPTAL_ParserException("Not all elements were closed before end of the document. Missing: ".$left,
                         $this->file, $this->line);
         }

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  */
 class PHPTAL_Dom_PHPTALDocumentBuilder extends PHPTAL_Dom_DocumentBuilder
 {
-    private $_xmlns;   /* PHPTAL_Dom_XmlnsState */
+    private $_xmlns; /* PHPTAL_Dom_XmlnsState */
     private $encoding;
     private ?PHPTAL_Dom_Element $documentElement = null;
 
@@ -53,8 +53,8 @@ 
     public function onDocumentEnd()
     {
         if (count($this->_stack) > 0) {
-            $left='</'.$this->_current->getQualifiedName().'>';
-            for ($i = count($this->_stack)-1; $i>0; $i--) $left .= '</'.$this->_stack[$i]->getQualifiedName().'>';
+            $left = '</'.$this->_current->getQualifiedName().'>';
+            for ($i = count($this->_stack)-1; $i > 0; $i--) $left .= '</'.$this->_stack[$i]->getQualifiedName().'>';
             throw new PHPTAL_ParserException("Not all elements were closed before end of the document. Missing: ".$left,
                         $this->file, $this->line);
         }
@@ -130,7 +130,7 @@ 
 
         $node = new PHPTAL_Dom_Element($element_qname, $namespace_uri, $attrnodes, $this->getXmlnsState());
         $this->pushNode($node);
-        $this->_stack[] =  $this->_current;
+        $this->_stack[] = $this->_current;
         $this->_current = $node;
     }
 

classes/PHPTAL/GetTextTranslator.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
      *
      * Encoding must be set before calling addDomain!
      */
-    public function addDomain($domain, $path='./locale/')
+    public function addDomain($domain, $path = './locale/')
     {
         bindtextdomain($domain, $path);
         if ($this->_encoding) {
@@ -140,7 +140,7 @@ 
      *
      * @param bool $htmlencode if true, output will be HTML-escaped.
      */
-    public function translate($key, $htmlencode=true)
+    public function translate($key, $htmlencode = true)
     {
         if ($this->_canonicalize) $key = self::_canonicalizeKey($key);
 
@@ -168,7 +168,7 @@ 
         $key_ = trim($key_);
         $key_ = str_replace("\n", "", $key_);
         $key_ = str_replace("\r", "", $key_);
-        for ($i = 0; $i<strlen($key_); $i++) {
+        for ($i = 0; $i < strlen($key_); $i++) {
             $c = $key_[$i];
             $o = ord($c);
             if ($o < 5 || $o > 127) {

Braces +12 added lines, -4 removed lines

@@ -34,7 +34,9 @@ 
 
     public function __construct()
     {
-        if (!function_exists('gettext')) throw new PHPTAL_ConfigurationException("Gettext not installed");
+        if (!function_exists('gettext')) {
+            throw new PHPTAL_ConfigurationException("Gettext not installed");
+        }
         $this->useDomain("messages"); // PHP bug #21965
     }
 
@@ -75,11 +77,15 @@ 
         $langs = func_get_args();
 
         $langCode = $this->trySettingLanguages(LC_ALL, $langs);
-        if ($langCode) return $langCode;
+        if ($langCode) {
+            return $langCode;
+        }
 
         if (defined("LC_MESSAGES")) {
             $langCode = $this->trySettingLanguages(LC_MESSAGES, $langs);
-            if ($langCode) return $langCode;
+            if ($langCode) {
+                return $langCode;
+            }
         }
 
         throw new PHPTAL_ConfigurationException('Language(s) code(s) "'.implode(', ', $langs).'" not supported by your system');
@@ -142,7 +148,9 @@ 
      */
     public function translate($key, $htmlencode=true)
     {
-        if ($this->_canonicalize) $key = self::_canonicalizeKey($key);
+        if ($this->_canonicalize) {
+            $key = self::_canonicalizeKey($key);
+        }
 
         $value = gettext($key);
 

tools/phptal_lint.php

Spacing +18 added lines, -18 removed lines

@@ -27,7 +27,7 @@ 
     {
         try
         {
-            if (! empty($_SERVER['REQUEST_URI'])) {
+            if (!empty($_SERVER['REQUEST_URI'])) {
                 throw new Exception("Please use this tool from command line");
             }
 
@@ -76,7 +76,7 @@ 
                 echo " Skipped ".$this->plural($lint->skipped, "non-template file").".";
             }
             echo "\n";
-            if (! $custom_extensions && count($lint->skipped_filenames)) {
+            if (!$custom_extensions && count($lint->skipped_filenames)) {
                 echo "Skipped file(s): ", implode(', ', array_keys($lint->skipped_filenames)), ".\n";
             }
 
@@ -86,7 +86,7 @@ 
                 echo "\n";
                 exit(2);
             } else if (count($lint->warnings)) {
-                echo "Found ".$this->plural(count($lint->warnings),"warning").":\n";
+                echo "Found ".$this->plural(count($lint->warnings), "warning").":\n";
                 $this->display_erorr_array($lint->warnings);
                 echo "\n";
                 exit(0);
@@ -95,8 +95,8 @@ 
                 exit($lint->checked ? 0 : 1);
             }
         }
-        catch(Exception $e) {
-            fwrite(STDERR, $e->getMessage() . "\n");
+        catch (Exception $e) {
+            fwrite(STDERR, $e->getMessage()."\n");
             $errcode = $e->getCode();
             exit($errcode ? $errcode : 1);
         }
@@ -119,7 +119,7 @@ 
     function usage()
     {
         $this->require_phptal();
-        echo "PHPTAL Lint 1.1.3 (PHPTAL ", strtr(PHPTAL_VERSION,"_","."), ")\n";
+        echo "PHPTAL Lint 1.1.3 (PHPTAL ", strtr(PHPTAL_VERSION, "_", "."), ")\n";
 
         echo "Usage: phptal_lint.php [-e extensions] [-i php_file_or_directory] file_or_directory_to_check ...\n";
         echo "  -e comma-separated list of extensions\n";
@@ -136,11 +136,11 @@ 
     function extended_getopt(array $options)
     {
         $results = array('--filenames--'=>array());
-        for ($i = 1; $i < count($_SERVER['argv']); $i ++) {
+        for ($i = 1; $i < count($_SERVER['argv']); $i++) {
             if (in_array($_SERVER['argv'][$i], $options)) {
-                $results[substr($_SERVER['argv'][$i], 1)][] = $_SERVER['argv'][++ $i];
+                $results[substr($_SERVER['argv'][$i], 1)][] = $_SERVER['argv'][++$i];
             } else if ($_SERVER['argv'][$i] == '--') {
-                $results['--filenames--'] = array_merge($results['--filenames--'], array_slice($_SERVER['argv'],$i+1));
+                $results['--filenames--'] = array_merge($results['--filenames--'], array_slice($_SERVER['argv'], $i+1));
                 break;
             } else if (substr($_SERVER['argv'][$i], 0, 1) == '-') {
                     $this->usage();
@@ -171,7 +171,7 @@ 
     {
         if (class_exists('PHPTAL', false)) return;
 
-        $myphptal = dirname(__FILE__) . '/../classes/PHPTAL.php';
+        $myphptal = dirname(__FILE__).'/../classes/PHPTAL.php';
         if (file_exists($myphptal)) {
             require_once $myphptal;
         } else {
@@ -202,7 +202,7 @@ 
     }
 
     function acceptExtensions(array $ext) {
-        $this->accept_pattern = '/\.(?:' . implode('|', $ext) . ')$/i';
+        $this->accept_pattern = '/\.(?:'.implode('|', $ext).')$/i';
     }
 
     protected function reportProgress($symbol)
@@ -226,17 +226,17 @@ 
 
             if ($entry->isDir()) {
                 $this->reportProgress('.');
-                $this->scan($path . DIRECTORY_SEPARATOR . $filename);
+                $this->scan($path.DIRECTORY_SEPARATOR.$filename);
                 continue;
             }
 
-            if (! preg_match($this->accept_pattern, $filename)) {
+            if (!preg_match($this->accept_pattern, $filename)) {
                 $this->skipped++;
                 $this->skipped_filenames[$filename] = true;
                 continue;
             }
 
-            $result = $this->testFile($path . DIRECTORY_SEPARATOR . $filename);
+            $result = $this->testFile($path.DIRECTORY_SEPARATOR.$filename);
 
             if (self::TEST_OK == $result) {
                 $this->reportProgress('.');
@@ -258,25 +258,25 @@ 
     function testFile($fullpath)
     {
         try {
-            $this->checked ++;
+            $this->checked++;
             $phptal = new PHPTAL($fullpath);
             $phptal->setForceReparse(true);
             $phptal->prepare();
             return self::TEST_OK;
         }
-        catch(PHPTAL_UnknownModifierException $e) {
+        catch (PHPTAL_UnknownModifierException $e) {
             if ($this->skipUnknownModifiers && is_callable(array($e, 'getModifierName'))) {
                 $this->warnings[] = array(dirname($fullpath), basename($fullpath), "Unknown expression modifier: ".$e->getModifierName()." (use -i to include your custom modifier functions)", $e->getLine());
                 return self::TEST_SKIPPED;
             }
             $log_exception = $e;
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             $log_exception = $e;
         }
 
         // Takes exception from either of the two catch blocks above
-        $this->errors[] = array(dirname($fullpath) , basename($fullpath) , $log_exception->getMessage() , $log_exception->getLine());
+        $this->errors[] = array(dirname($fullpath), basename($fullpath), $log_exception->getMessage(), $log_exception->getLine());
         return self::TEST_ERROR;
     }
 }

Braces +9 added lines, -8 removed lines

@@ -94,8 +94,7 @@ 
                 echo "No errors found!\n";
                 exit($lint->checked ? 0 : 1);
             }
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             fwrite(STDERR, $e->getMessage() . "\n");
             $errcode = $e->getCode();
             exit($errcode ? $errcode : 1);
@@ -129,7 +128,9 @@ 
 
     function plural($num, $word)
     {
-        if ($num == 1) return "$num $word";
+        if ($num == 1) {
+            return "$num $word";
+        }
         return "$num {$word}s";
     }
 
@@ -169,7 +170,9 @@ 
 
     function require_phptal()
     {
-        if (class_exists('PHPTAL', false)) return;
+        if (class_exists('PHPTAL', false)) {
+            return;
+        }
 
         $myphptal = dirname(__FILE__) . '/../classes/PHPTAL.php';
         if (file_exists($myphptal)) {
@@ -263,15 +266,13 @@ 
             $phptal->setForceReparse(true);
             $phptal->prepare();
             return self::TEST_OK;
-        }
-        catch(PHPTAL_UnknownModifierException $e) {
+        } catch(PHPTAL_UnknownModifierException $e) {
             if ($this->skipUnknownModifiers && is_callable(array($e, 'getModifierName'))) {
                 $this->warnings[] = array(dirname($fullpath), basename($fullpath), "Unknown expression modifier: ".$e->getModifierName()." (use -i to include your custom modifier functions)", $e->getLine());
                 return self::TEST_SKIPPED;
             }
             $log_exception = $e;
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             $log_exception = $e;
         }
 

classes/PHPTAL.php

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

Indentation +4 added lines, -4 removed lines

@@ -975,10 +975,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() ?? ''));
@@ -998,7 +998,7 @@ 
             $hash = strtr(rtrim(base64_encode($hash),"="),"+/=","_A_");
 
             $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()) .
-                                   $basename . '__' . $hash;
+                                    $basename . '__' . $hash;
         }
         return $this->_functionName;
     }

Spacing +32 added lines, -32 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;
     }
@@ -1222,7 +1222,7 @@ 
 
         // Prepending PHPTAL's autoloader helps if there are other autoloaders
         // that throw/die when file is not found. Only >5.3 though.
-        @spl_autoload_register(array(__CLASS__,'autoload'), true, true);
+        @spl_autoload_register(array(__CLASS__, 'autoload'), true, true);
 
         if ($uses_autoload) {
             spl_autoload_register('__autoload');

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);
+        }
     }
 
     /**