phptal / PHPTAL

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