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

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

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