phptal / PHPTAL

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

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