phptal / PHPTAL

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

classes/PHPTAL/Php/TalesChainExecutor.php

Braces +6 added lines, -4 removed lines

@@ -82,10 +82,12 @@
                 $this->reader->talesChainPart($this, $exp, $lastkey === $key);
             }
 
-            if ($this->state == self::CHAIN_BREAK)
-                break;
-            if ($this->state == self::CHAIN_CONT)
-                continue;
+            if ($this->state == self::CHAIN_BREAK) {
+                            break;
+            }
+            if ($this->state == self::CHAIN_CONT) {
+                            continue;
+            }
         }
 
         $this->codewriter->doEnd('if');

classes/PHPTAL/Php/TalesInternal.php

Spacing +22 added lines, -22 removed lines

@@ -55,7 +55,7 @@ 
 
     static public function true($src, $nothrow)
     {
-        return 'phptal_true(' . self::compileToPHPExpression($src, true) . ')';
+        return 'phptal_true('.self::compileToPHPExpression($src, true).')';
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     static public function not($expression, $nothrow)
     {
-        return '!phptal_true(' . self::compileToPHPExpression($expression, $nothrow) . ')';
+        return '!phptal_true('.self::compileToPHPExpression($expression, $nothrow).')';
     }
 
 
@@ -121,7 +121,7 @@ 
      *
      * @returns string or array
      */
-    static public function path($expression, $nothrow=false)
+    static public function path($expression, $nothrow = false)
     {
         $expression = trim($expression);
         if ($expression == 'default') return self::DEFAULT_KEYWORD;
@@ -146,7 +146,7 @@ 
         if (count($exps) > 1 || isset($string)) {
             $result = array();
             foreach ($exps as $i=>$exp) {
-                if(isset($string) || $i < count($exps) - 1) {
+                if (isset($string) || $i < count($exps)-1) {
                     $result[] = self::compileToPHPExpressions(trim($exp), true);
                 }
                 else {
@@ -180,7 +180,7 @@ 
         }
 
         if ($nothrow) {
-            return '$ctx->path($ctx, ' . $next . ($expression === null ? '' : '."/".'.$expression) . ', true)';
+            return '$ctx->path($ctx, '.$next.($expression === null ? '' : '."/".'.$expression).', true)';
         }
 
         if (preg_match('/^\'[a-z][a-z0-9_]*\'$/i', $next)) $next = substr($next, 1, -1); else $next = '{'.$next.'}';
@@ -221,7 +221,7 @@ 
      *      string:hello, ${user/name}
      *      string:you have $$130 in your bank account
      */
-    static public function string($expression, $nothrow=false)
+    static public function string($expression, $nothrow = false)
     {
         return self::parseString($expression, $nothrow, '');
     }
@@ -241,7 +241,7 @@ 
         $lastWasDollar = false;
         $result = '';
         $len = strlen($expression);
-        for ($i=0; $i<$len; $i++) {
+        for ($i = 0; $i < $len; $i++) {
             $c = $expression[$i];
             switch ($c) {
                 case '$':
@@ -291,8 +291,8 @@ 
                 case '}':
                     if ($inAccoladePath) {
                         $inAccoladePath = false;
-                        $subEval = self::compileToPHPExpression($tales_prefix.$subPath,false);
-                        $result .= "'.(" . $subEval . ").'";
+                        $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
+                        $result .= "'.(".$subEval.").'";
                         $subPath = '';
                         $lastWasDollar = false;
                         $c = '';
@@ -315,8 +315,8 @@ 
                             $c = '';
                         } else {
                             $inPath = false;
-                            $subEval = self::compileToPHPExpression($tales_prefix.$subPath,false);
-                            $result .= "'.(" . $subEval . ").'";
+                            $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
+                            $result .= "'.(".$subEval.").'";
                             }
                         }
                     break;
@@ -325,7 +325,7 @@ 
         }
         if ($inPath) {
             $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
-            $result .= "'.(" . $subEval . ").'";
+            $result .= "'.(".$subEval.").'";
         }
 
         // optimize ''.foo.'' to foo
@@ -365,7 +365,7 @@ 
         $src = rawurldecode($src);
 
         // Simple echo can be supported via regular method
-        if (preg_match('/^\s*echo\s+((?:[^;]+|"[^"\\\\]*"|\'[^\'\\\\]*\'|\/\*.*?\*\/)+);*\s*$/s',$src,$m))
+        if (preg_match('/^\s*echo\s+((?:[^;]+|"[^"\\\\]*"|\'[^\'\\\\]*\'|\/\*.*?\*\/)+);*\s*$/s', $src, $m))
         {
             return $m[1];
         }
@@ -385,7 +385,7 @@ 
     {
         $src = trim($src);
         if (ctype_alnum($src)) return 'isset($ctx->'.$src.')';
-        return '(null !== ' . self::compileToPHPExpression($src, true) . ')';
+        return '(null !== '.self::compileToPHPExpression($src, true).')';
     }
 
     /**
@@ -404,7 +404,7 @@ 
      */
     static public function json($src, $nothrow)
     {
-        return 'json_encode('.phptal_tale($src,$nothrow).')';
+        return 'json_encode('.phptal_tale($src, $nothrow).')';
     }
 
     /**
@@ -412,7 +412,7 @@ 
      */
     static public function urlencode($src, $nothrow)
     {
-        return 'rawurlencode('.phptal_tale($src,$nothrow).')';
+        return 'rawurlencode('.phptal_tale($src, $nothrow).')';
     }
 
     /**
@@ -422,7 +422,7 @@ 
      * @see PHPTAL_Php_TalesInternal::compileToPHPExpressions()
      * @return string
      */
-    public static function compileToPHPExpression($expression, $nothrow=false)
+    public static function compileToPHPExpression($expression, $nothrow = false)
     {
         $r = self::compileToPHPExpressions($expression, $nothrow);
         if (!is_array($r)) return $r;
@@ -437,8 +437,8 @@ 
      */
     private static function convertExpressionsToExpression(array $array, $nothrow)
     {
-        if (count($array)==1) return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
-            ($array[0]==self::NOTHING_KEYWORD?'null':$array[0]).
+        if (count($array) == 1) return '($ctx->noThrow('.($nothrow ? 'true' : 'false').')||1?('.
+            ($array[0] == self::NOTHING_KEYWORD ? 'null' : $array[0]).
             '):"")';
 
         $expr = array_shift($array);
@@ -457,7 +457,7 @@ 
      *
      * @return string or array
      */
-    public static function compileToPHPExpressions($expression, $nothrow=false)
+    public static function compileToPHPExpressions($expression, $nothrow = false)
     {
         $expression = trim($expression ?? '');
 
@@ -488,13 +488,13 @@ 
         throw new PHPTAL_UnknownModifierException("Unknown phptal modifier '$typePrefix'. Function '$func' does not exist", $typePrefix);
     }
 
-    private static function verifyPHPExpressions($typePrefix,$expressions)
+    private static function verifyPHPExpressions($typePrefix, $expressions)
     {
         if (!is_array($expressions)) {
             $expressions = array($expressions);
         }
 
-        foreach($expressions as $expr) {
+        foreach ($expressions as $expr) {
             if (preg_match('/;\s*$/', $expr)) {
                 throw new PHPTAL_ParserException("Modifier $typePrefix generated PHP statement rather than expression (don't add semicolons)");
             }

classes/PHPTAL/Tokenizer.php

Braces +3 added lines, -1 removed lines

@@ -42,7 +42,9 @@
 
     function skipSpace()
     {
-        while ($this->current_token === 'SPACE') $this->nextToken();
+        while ($this->current_token === 'SPACE') {
+            $this->nextToken();
+        }
     }
 
     function nextToken()

classes/PHPTAL/Dom/Element.php

Spacing +8 added lines, -8 removed lines

@@ -188,7 +188,7 @@ 
 
             $this->generateSurroundFoot($codewriter);
         }
-        catch(PHPTAL_TemplateException $e) {
+        catch (PHPTAL_TemplateException $e) {
             $e->hintSrcPosition($this->getSourceFile(), $this->getSourceLine());
             throw $e;
         }
@@ -217,7 +217,7 @@ 
     /** Returns true if the element contains specified PHPTAL attribute. */
     public function hasAttribute($qname)
     {
-        foreach($this->attribute_nodes as $attr) if ($attr->getQualifiedName() == $qname) return true;
+        foreach ($this->attribute_nodes as $attr) if ($attr->getQualifiedName() == $qname) return true;
         return false;
     }
 
@@ -246,7 +246,7 @@ 
 
     public function getAttributeNode($qname)
     {
-        foreach($this->attribute_nodes as $attr) if ($attr->getQualifiedName() === $qname) return $attr;
+        foreach ($this->attribute_nodes as $attr) if ($attr->getQualifiedName() === $qname) return $attr;
         return null;
     }
 
@@ -353,15 +353,15 @@ 
         }
     }
 
-    public function generateContent(?PHPTAL_Php_CodeWriter $codewriter = null, $realContent=false)
+    public function generateContent(?PHPTAL_Php_CodeWriter $codewriter = null, $realContent = false)
     {
         if (!$this->isEmptyNode($codewriter->getOutputMode())) {
             if ($realContent || !count($this->contentAttributes)) {
-                foreach($this->childNodes as $child) {
+                foreach ($this->childNodes as $child) {
                     $child->generateCode($codewriter);
                 }
             }
-            else foreach($this->contentAttributes as $att) {
+            else foreach ($this->contentAttributes as $att) {
                 $att->before($codewriter);
                 $att->after($codewriter);
             }
@@ -439,7 +439,7 @@ 
     private function isEmptyNode($mode)
     {
         return (($mode === PHPTAL::XHTML || $mode === PHPTAL::HTML5) && PHPTAL_Dom_Defs::getInstance()->isEmptyTagNS($this->getNamespaceURI(), $this->getLocalName())) ||
-               ( $mode === PHPTAL::XML   && !$this->hasContent());
+               ($mode === PHPTAL::XML && !$this->hasContent());
     }
 
     private function hasContent()
@@ -473,7 +473,7 @@ 
                 throw new PHPTAL_TemplateException(sprintf("Attribute conflict in < %s > '%s' cannot appear with '%s'",
                                $this->qualifiedName,
                                $key,
-                               $temp[$nsattr->getPriority()][0]->getNamespace()->getPrefix() . ':' . $temp[$nsattr->getPriority()][0]->getLocalName()
+                               $temp[$nsattr->getPriority()][0]->getNamespace()->getPrefix().':'.$temp[$nsattr->getPriority()][0]->getLocalName()
                                ), $this->getSourceFile(), $this->getSourceLine());
             }
             $temp[$nsattr->getPriority()] = array($nsattr, $domattr);

classes/PHPTAL/Dom/PHPTALDocumentBuilder.php

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/Dom/SaxXmlParser.php

Indentation +26 added lines, -26 removed lines

@@ -60,23 +60,23 @@ 
 
 
     static $state_names = array(
-      self::ST_ROOT => 'root node',
-      self::ST_TEXT => 'text',
-      self::ST_LT   => 'start of tag',
-      self::ST_TAG_NAME => 'tag name',
-      self::ST_TAG_CLOSE => 'closing tag',
-      self::ST_TAG_SINGLE => 'self-closing tag',
-      self::ST_TAG_ATTRIBUTES => 'tag',
-      self::ST_TAG_BETWEEN_ATTRIBUTE => 'tag attributes',
-      self::ST_CDATA => 'CDATA',
-      self::ST_COMMENT => 'comment',
-      self::ST_DOCTYPE => 'doctype',
-      self::ST_XMLDEC => 'XML declaration',
-      self::ST_PREPROC => 'preprocessor directive',
-      self::ST_ATTR_KEY => 'attribute name',
-      self::ST_ATTR_EQ => 'attribute value',
-      self::ST_ATTR_QUOTE => 'quoted attribute value',
-      self::ST_ATTR_VALUE => 'unquoted attribute value',
+        self::ST_ROOT => 'root node',
+        self::ST_TEXT => 'text',
+        self::ST_LT   => 'start of tag',
+        self::ST_TAG_NAME => 'tag name',
+        self::ST_TAG_CLOSE => 'closing tag',
+        self::ST_TAG_SINGLE => 'self-closing tag',
+        self::ST_TAG_ATTRIBUTES => 'tag',
+        self::ST_TAG_BETWEEN_ATTRIBUTE => 'tag attributes',
+        self::ST_CDATA => 'CDATA',
+        self::ST_COMMENT => 'comment',
+        self::ST_DOCTYPE => 'doctype',
+        self::ST_XMLDEC => 'XML declaration',
+        self::ST_PREPROC => 'preprocessor directive',
+        self::ST_ATTR_KEY => 'attribute name',
+        self::ST_ATTR_EQ => 'attribute value',
+        self::ST_ATTR_QUOTE => 'quoted attribute value',
+        self::ST_ATTR_VALUE => 'unquoted attribute value',
     );
 
     private $input_encoding;
@@ -381,15 +381,15 @@ 
 
             // http://www.w3.org/International/questions/qa-forms-utf-8
             $match = '[\x09\x0A\x0D\x20-\x7F]'        // ASCII
-               . '|[\xC2-\xDF][\x80-\xBF]'            // non-overlong 2-byte
-               . '|\xE0[\xA0-\xBF][\x80-\xBF]'        // excluding overlongs
-               . '|[\xE1-\xEC\xEE\xEE][\x80-\xBF]{2}' // straight 3-byte (exclude FFFE and FFFF)
-               . '|\xEF[\x80-\xBE][\x80-\xBF]'        // straight 3-byte
-               . '|\xEF\xBF[\x80-\xBD]'               // straight 3-byte
-               . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
-               . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
-               . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
-               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
+                . '|[\xC2-\xDF][\x80-\xBF]'            // non-overlong 2-byte
+                . '|\xE0[\xA0-\xBF][\x80-\xBF]'        // excluding overlongs
+                . '|[\xE1-\xEC\xEE\xEE][\x80-\xBF]{2}' // straight 3-byte (exclude FFFE and FFFF)
+                . '|\xEF[\x80-\xBE][\x80-\xBF]'        // straight 3-byte
+                . '|\xEF\xBF[\x80-\xBD]'               // straight 3-byte
+                . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
+                . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
+                . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
+                . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
 
             if (!preg_match('/^(?:(?>'.$match.'))+$/s',$str)) {
                 $res = preg_split('/((?>'.$match.')+)/s',$str,0,PREG_SPLIT_DELIM_CAPTURE);

Spacing +17 added lines, -17 removed lines

@@ -116,12 +116,12 @@ 
             $builder->setSource($this->_file, $this->_line);
             $builder->onDocumentStart();
 
-            $i=0;
+            $i = 0;
             // remove BOM (UTF-8 byte order mark)...
             if (substr($src, 0, 3) === self::BOM_STR) {
-                $i=3;
+                $i = 3;
             }
-            for (; $i<$len; $i++) {
+            for (; $i < $len; $i++) {
                 $c = $src[$i]; // Change to substr($src, $i, 1); if you want to use mb_string.func_overload
 
                 if ($c === "\n") $builder->setSource($this->_file, ++$this->_line);
@@ -201,7 +201,7 @@ 
                         if ($c !== '>') {
                             $this->raiseError("Expected '/>', but found '/$c' inside tag < $tagname >");
                         }
-                        $mark = $i+1;   // mark text start
+                        $mark = $i+1; // mark text start
                         $state = self::ST_TEXT;
                         $builder->onElementStart($tagname, $attributes);
                         $builder->onElementClose($tagname);
@@ -210,7 +210,7 @@ 
                     case self::ST_TAG_BETWEEN_ATTRIBUTE:
                     case self::ST_TAG_ATTRIBUTES:
                         if ($c === '>') {
-                            $mark = $i+1;   // mark text start
+                            $mark = $i+1; // mark text start
                             $state = self::ST_TEXT;
                             $builder->onElementStart($tagname, $attributes);
                         } elseif ($c === '/') {
@@ -226,7 +226,7 @@ 
                     case self::ST_COMMENT:
                         if ($c === '>' && $i > $mark+4 && substr($src, $i-2, 2) === '--') {
 
-                            if (preg_match('/^-|--|-$/', substr($src, $mark +4, $i-$mark+1 -7))) {
+                            if (preg_match('/^-|--|-$/', substr($src, $mark+4, $i-$mark+1-7))) {
                                 $this->raiseError("Ill-formed comment. XML comments are not allowed to contain '--' or start/end with '-': ".substr($src, $mark+4, $i-$mark+1-7));
                             }
 
@@ -289,7 +289,7 @@ 
 
                             if ($c === '=') $state = self::ST_ATTR_VALUE;
                             else /* white char */ $state = self::ST_ATTR_EQ;
-                        } elseif ($c === '/' || $c==='>') {
+                        } elseif ($c === '/' || $c === '>') {
                             $attribute = substr($src, $mark, $i-$mark);
                             if (!$this->isValidQName($attribute)) {
                                 $this->raiseError("Invalid attribute name '$attribute'");
@@ -323,7 +323,7 @@ 
 
                             // PHPTAL's code generator assumes input is escaped for double-quoted strings. Single-quoted attributes need to be converted.
                             // FIXME: it should be escaped at later stage.
-                            $attributes[$attribute] = str_replace('"',"&quot;", $attributes[$attribute]);
+                            $attributes[$attribute] = str_replace('"', "&quot;", $attributes[$attribute]);
                             $state = self::ST_TAG_BETWEEN_ATTRIBUTE;
                         }
                         break;
@@ -347,7 +347,7 @@ 
 
             $builder->onDocumentEnd();
         }
-        catch(PHPTAL_TemplateException $e)
+        catch (PHPTAL_TemplateException $e)
         {
             $e->hintSrcPosition($this->_file, $this->_line);
             throw $e;
@@ -370,7 +370,7 @@ 
             // $match expression below somehow triggers quite deep recurrency and stack overflow in preg
             // to avoid this, check string bit by bit, omitting ASCII fragments.
             if (strlen($str) > 200) {
-                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/',$str,0,PREG_SPLIT_NO_EMPTY);
+                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/', $str, 0, PREG_SPLIT_NO_EMPTY);
                 foreach ($chunks as $chunk) {
                     if (strlen($chunk) < 200) {
                         $this->checkEncoding($chunk);
@@ -389,11 +389,11 @@ 
                . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
                . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
                . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
-               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
+               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}'; // plane 16
 
-            if (!preg_match('/^(?:(?>'.$match.'))+$/s',$str)) {
-                $res = preg_split('/((?>'.$match.')+)/s',$str,0,PREG_SPLIT_DELIM_CAPTURE);
-                for($i=0; $i < count($res); $i+=2)
+            if (!preg_match('/^(?:(?>'.$match.'))+$/s', $str)) {
+                $res = preg_split('/((?>'.$match.')+)/s', $str, 0, PREG_SPLIT_DELIM_CAPTURE);
+                for ($i = 0; $i < count($res); $i += 2)
                 {
                     $res[$i] = self::convertBytesToEntities(array(1=>$res[$i]));
                 }
@@ -406,7 +406,7 @@ 
             $forbid = '/((?>[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x84\x86-\x9F]+))/s';
 
             if (preg_match($forbid, $str)) {
-                $str = preg_replace_callback($forbid, static function (array $m): string {
+                $str = preg_replace_callback($forbid, static function(array $m): string {
                     return self::convertBytesToEntities($m);
                 }, $str);
                 $this->raiseError("Invalid ISO-8859-1 characters: ".$str);
@@ -426,7 +426,7 @@ 
     {
         $m = $m[1];
         $out = "";
-        for($i=0; $i < strlen($m); $i++)
+        for ($i = 0; $i < strlen($m); $i++)
         {
             $out .= '&#X'.strtoupper(dechex(ord($m[$i]))).';';
         }
@@ -443,7 +443,7 @@ 
         /* <?php ?> blocks can't reliably work in attributes (due to escaping impossible in XML)
            so they have to be converted into special TALES expression
         */
-        $str = preg_replace_callback('/<\?(php|=)(.*?)\?>/', static function ($m) {
+        $str = preg_replace_callback('/<\?(php|=)(.*?)\?>/', static function($m) {
             list(, $type, $code) = $m;
             if ($type === '=') $code = 'echo '.$code;
             return '${structure phptal-internal-php-block:'.rawurlencode($code).'}';

Braces +27 added lines, -11 removed lines

@@ -124,7 +124,9 @@ 
             for (; $i<$len; $i++) {
                 $c = $src[$i]; // Change to substr($src, $i, 1); if you want to use mb_string.func_overload
 
-                if ($c === "\n") $builder->setSource($this->_file, ++$this->_line);
+                if ($c === "\n") {
+                    $builder->setSource($this->_file, ++$this->_line);
+                }
 
                 switch ($state) {
                     case self::ST_ROOT:
@@ -174,7 +176,9 @@ 
                     case self::ST_TAG_NAME:
                         if (self::isWhiteChar($c) || $c === '/' || $c === '>') {
                             $tagname = substr($src, $mark, $i-$mark);
-                            if (!$this->isValidQName($tagname)) $this->raiseError("Invalid tag name '$tagname'");
+                            if (!$this->isValidQName($tagname)) {
+                                $this->raiseError("Invalid tag name '$tagname'");
+                            }
 
                             if ($c === '/') {
                                 $state = self::ST_TAG_SINGLE;
@@ -220,7 +224,9 @@ 
                         } elseif ($state === self::ST_TAG_ATTRIBUTES && $this->isValidQName($c)) {
                             $mark = $i; // mark attribute key start
                             $state = self::ST_ATTR_KEY;
-                        } else $this->raiseError("Unexpected character '$c' between attributes of < $tagname >");
+                        } else {
+                            $this->raiseError("Unexpected character '$c' between attributes of < $tagname >");
+                        }
                         break;
 
                     case self::ST_COMMENT:
@@ -287,8 +293,11 @@ 
                                 $this->raiseError("Attribute $attribute in < $tagname > is defined more than once");
                             }
 
-                            if ($c === '=') $state = self::ST_ATTR_VALUE;
-                            else /* white char */ $state = self::ST_ATTR_EQ;
+                            if ($c === '=') {
+                                $state = self::ST_ATTR_VALUE;
+                            } else {
+                                /* white char */ $state = self::ST_ATTR_EQ;
+                            }
                         } elseif ($c === '/' || $c==='>') {
                             $attribute = substr($src, $mark, $i-$mark);
                             if (!$this->isValidQName($attribute)) {
@@ -330,11 +339,15 @@ 
                 }
             }
 
-            if ($state === self::ST_TEXT) // allows text past root node, which is in violation of XML spec
+            if ($state === self::ST_TEXT) {
+                // allows text past root node, which is in violation of XML spec
             {
                 if ($i > $mark) {
                     $text = substr($src, $mark, $i-$mark);
-                    if (!ctype_space($text)) $this->raiseError("Characters found after end of the root element (wrap document in < tal:block > to avoid this error)");
+            }
+                    if (!ctype_space($text)) {
+                        $this->raiseError("Characters found after end of the root element (wrap document in < tal:block > to avoid this error)");
+                    }
                 }
             } else {
                 if ($state === self::ST_ROOT) {
@@ -346,8 +359,7 @@ 
             }
 
             $builder->onDocumentEnd();
-        }
-        catch(PHPTAL_TemplateException $e)
+        } catch(PHPTAL_TemplateException $e)
         {
             $e->hintSrcPosition($this->_file, $this->_line);
             throw $e;
@@ -363,7 +375,9 @@ 
 
     private function checkEncoding($str)
     {
-        if ($str === '') return '';
+        if ($str === '') {
+            return '';
+        }
 
         if ($this->input_encoding === 'UTF-8') {
 
@@ -445,7 +459,9 @@ 
         */
         $str = preg_replace_callback('/<\?(php|=)(.*?)\?>/', static function ($m) {
             list(, $type, $code) = $m;
-            if ($type === '=') $code = 'echo '.$code;
+            if ($type === '=') {
+                $code = 'echo '.$code;
+            }
             return '${structure phptal-internal-php-block:'.rawurlencode($code).'}';
         }, $str);