cseufert / hamle

php/hamle/Parse.php

Spacing +8 added lines, -8 removed lines

@@ -156,7 +156,7 @@ 
         $i = self::indentLevel($indent);
         unset($m[0]);
         switch (strlen($code) ? $code[0] : ($textcode ? $textcode : "")) {
-          case "|": //Control Tag
+          case "|" : //Control Tag
             if ($code == "|snippet")
               $hTag = new Tag\Snippet($text);
             elseif ($code == "|form")
@@ -196,7 +196,7 @@ 
             break;
           default:
             $attr = array();
-            if(isset($params[0]) && $params[0] == "[") {
+            if (isset($params[0]) && $params[0] == "[") {
               $param = substr($params, 1, -1);
               $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
 //              parse_str($param, $attr);
@@ -209,7 +209,7 @@ 
               if ($s[0] == ".") $class[] = substr($s, 1);
               if ($s[0] == "!") $ref = substr($s, 1);
             }
-            if($ref)
+            if ($ref)
               $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
             else
               $hTag = new Tag\Html($tag, $class, $attr, $id);
@@ -222,16 +222,16 @@ 
         else
           $this->root[] = $hTag;
       } else
-        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/".preg_last_error());
       $this->lineNo++;
     }
   }
 
   function parseQueryString($qs) {
     $out = [];
-    foreach(explode('&',$qs) as $s) {
-      $kv = explode('=',$s,2);
-      $out[urldecode($kv[0])] = isset($kv[1])?urldecode($kv[1]):null;
+    foreach (explode('&', $qs) as $s) {
+      $kv = explode('=', $s, 2);
+      $out[urldecode($kv[0])] = isset($kv[1]) ?urldecode($kv[1]) : null;
     }
     return $out;
   }
@@ -249,7 +249,7 @@ 
     $m = array();
     while ($this->lineNo + 1 < $this->lineCount &&
         (!trim($this->lines[$this->lineNo + 1]) ||
-            preg_match('/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
+            preg_match('/^(\s){'.$indent.'}((\s)+[^\s].*)$/',
                 $this->lines[$this->lineNo + 1], $m))) {
       if (trim($this->lines[$this->lineNo + 1]))
         $out[] = $m[2];

Braces +56 added lines, -36 removed lines

@@ -109,22 +109,25 @@ 
     $revSnip = array();
     /** @var Tag[] $roots */
     $roots = array();
-    foreach ($this->root as $snip)
-      if ($snip instanceOf Tag\Snippet) {
+    foreach ($this->root as $snip) {
+          if ($snip instanceOf Tag\Snippet) {
         if ($snip->getType() == "append") {
           array_unshift($revSnip, $snip);
+    }
         } else {
           $fwdSnip[] = $snip;
         }
       } else {
         $roots[] = $snip;
       }
-    foreach ($fwdSnip as $snip)
-      foreach ($roots as $root)
+    foreach ($fwdSnip as $snip) {
+          foreach ($roots as $root)
         $snip->apply($root);
-    foreach ($revSnip as $snip)
-      foreach ($roots as $root)
+    }
+    foreach ($revSnip as $snip) {
+          foreach ($roots as $root)
         $snip->apply($root);
+    }
     $this->root = $roots;
   }
 
@@ -143,9 +146,11 @@ 
     $heir = array();
     while ($this->lineNo < $this->lineCount) {
       $line = $this->lines[$this->lineNo];
-      if (trim($line)) if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
+      if (trim($line)) {
+        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {
         if (FALSE !== strpos($m[1], "\t"))
           throw new ParseError("Tabs are not supported in templates at this time");
+      }
         $indent = strlen($m[1]);
         $tag = isset($m[2]) ? $tag = $m[2] : "";
         $classid = isset($m[3]) ? $m[3] : "";
@@ -157,13 +162,13 @@ 
         unset($m[0]);
         switch (strlen($code) ? $code[0] : ($textcode ? $textcode : "")) {
           case "|": //Control Tag
-            if ($code == "|snippet")
-              $hTag = new Tag\Snippet($text);
-            elseif ($code == "|form")
-              $hTag = new Tag\Form($text);
-            elseif ($code == "|formhint")
-              $hTag = new Tag\FormHint();
-            elseif ($code == "|else") {
+            if ($code == "|snippet") {
+                          $hTag = new Tag\Snippet($text);
+            } elseif ($code == "|form") {
+                          $hTag = new Tag\Form($text);
+            } elseif ($code == "|formhint") {
+                          $hTag = new Tag\FormHint();
+            } elseif ($code == "|else") {
               $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);
               $hTag->setVar($text);
             } else {
@@ -174,8 +179,9 @@ 
           case ":": //Filter Tag
             $hTag = new Tag\Filter(substr($code, 1));
             $hTag->addContent($text, Text::TOKEN_CODE);
-            foreach ($this->consumeBlock($indent) as $l)
-              $hTag->addContent($l, Text::TOKEN_CODE);
+            foreach ($this->consumeBlock($indent) as $l) {
+                          $hTag->addContent($l, Text::TOKEN_CODE);
+            }
             break;
           case "_": //String Tag
           case "__": //Unescape String Tag
@@ -191,8 +197,9 @@ 
           case "//": // Non Printed Comment
             $hTag = new Tag\Comment($textcode);
             $hTag->addContent($text);
-            foreach ($this->consumeBlock($indent) as $l)
-              $hTag->addContent($l, Text::TOKEN_CODE);
+            foreach ($this->consumeBlock($indent) as $l) {
+                          $hTag->addContent($l, Text::TOKEN_CODE);
+            }
             break;
           default:
             $attr = array();
@@ -204,25 +211,34 @@ 
             }
             $class = array(); $id = ""; $ref = "";
             preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);
-            if (isset($cid[0])) foreach ($cid[0] as $s) {
+            if (isset($cid[0])) {
+              foreach ($cid[0] as $s) {
               if ($s[0] == "#") $id = substr($s, 1);
-              if ($s[0] == ".") $class[] = substr($s, 1);
-              if ($s[0] == "!") $ref = substr($s, 1);
             }
-            if($ref)
-              $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
-            else
-              $hTag = new Tag\Html($tag, $class, $attr, $id);
+              if ($s[0] == ".") {
+                $class[] = substr($s, 1);
+              }
+              if ($s[0] == "!") {
+                $ref = substr($s, 1);
+              }
+            }
+            if($ref) {
+                          $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
+            } else {
+                          $hTag = new Tag\Html($tag, $class, $attr, $id);
+            }
             $hTag->addContent($text);
             break;
         }
         $heir[$i] = $hTag;
-        if ($i > 0)
-          $heir[$i - 1]->addChild($hTag);
-        else
-          $this->root[] = $hTag;
-      } else
-        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+        if ($i > 0) {
+                  $heir[$i - 1]->addChild($hTag);
+        } else {
+                  $this->root[] = $hTag;
+        }
+      } else {
+              throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+      }
       $this->lineNo++;
     }
   }
@@ -238,8 +254,9 @@ 
 
   function output($minify = false) {
     $out = "<?php\nuse Seufert\\Hamle;\n?>";
-    foreach ($this->root as $tag)
-      $out .= $tag->render(0, $minify);
+    foreach ($this->root as $tag) {
+          $out .= $tag->render(0, $minify);
+    }
     return $out;
 
   }
@@ -251,15 +268,18 @@ 
         (!trim($this->lines[$this->lineNo + 1]) ||
             preg_match('/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
                 $this->lines[$this->lineNo + 1], $m))) {
-      if (trim($this->lines[$this->lineNo + 1]))
-        $out[] = $m[2];
+      if (trim($this->lines[$this->lineNo + 1])) {
+              $out[] = $m[2];
+      }
       $this->lineNo++;
     }
     return $out;
   }
 
   function indentLevel($indent) {
-    if (!isset($this->indents)) $this->indents = array();
+    if (!isset($this->indents)) {
+      $this->indents = array();
+    }
     if (!count($this->indents)) {
       $this->indents = array(0 => $indent);
       // Key = indent level, Value = Depth in spaces

php/hamle/Text/Filter.php

Spacing +22 added lines, -22 removed lines

@@ -46,23 +46,23 @@ 
   static $filterResolver = null;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
+    if (preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
-      if(isset($m['chained']) && strlen($m['chained'])) {
-        $this->chained = new Filter($m['chained'],$what);
+      foreach ($this->vars as $k=>$v)
+        $this->vars[$k] = str_replace("&comma;", ',', $v);
+      if (isset($m['chained']) && strlen($m['chained'])) {
+        $this->chained = new Filter($m['chained'], $what);
       }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(method_exists(Filter::class, $this->filter)) {
+    if (method_exists(Filter::class, $this->filter)) {
       $this->filter = Filter::class.'::'.$this->filter;
-    } elseif(in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
-    } elseif($this->filter === 'json') {
+    } elseif (in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
+    } elseif ($this->filter === 'json') {
       $this->filter = 'json_encode';
-    } elseif(self::$filterResolver && $filter = (self::$filterResolver)($this->filter)) {
+    } elseif (self::$filterResolver && $filter = (self::$filterResolver)($this->filter)) {
       $this->filter = $filter;
     } else {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
@@ -71,24 +71,24 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
+    if ($this->chained)
       $pre = $this->chained->toPHPpre();
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
+    if ($this->chained)
       $post = $this->chained->toPHPpost();
     $o = '';
-    foreach($this->vars as $v)
+    foreach ($this->vars as $v)
       $o .= ','.$this->varToCode($v);
     return "$o)$post";
   }
@@ -103,24 +103,24 @@ 
 
   static function itersplit($v, $sep = ",") {
     $o = [];
-    foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+    foreach (explode($sep, $v) as $k=>$i) {
+      if ($i)
+        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k, 'key'=>$k];
     }
     return new WrapArray($o);
   }
 
   static function newlinebr($v) {
-    return str_replace("\n","<br />\n",$v);
+    return str_replace("\n", "<br />\n", $v);
   }
 
   static function replace($v, $src, $dst) {
-    return str_replace($src,$dst,$v);
+    return str_replace($src, $dst, $v);
   }
 
   static function ascents($v) {
-    $v = str_replace(['$',' ',','],'', $v);
-    return (int) round($v * 100,0);
+    $v = str_replace(['$', ' ', ','], '', $v);
+    return (int) round($v * 100, 0);
   }
 
 }

Braces +18 added lines, -12 removed lines

@@ -49,8 +49,9 @@ 
     if(preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
+      foreach($this->vars as $k=>$v) {
+              $this->vars[$k] = str_replace("&comma;",',',$v);
+      }
       if(isset($m['chained']) && strlen($m['chained'])) {
         $this->chained = new Filter($m['chained'],$what);
       }
@@ -71,25 +72,29 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
-      $pre = $this->chained->toPHPpre();
+    if($this->chained) {
+          $pre = $this->chained->toPHPpre();
+    }
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
-      $post = $this->chained->toPHPpost();
+    if($this->chained) {
+          $post = $this->chained->toPHPpost();
+    }
     $o = '';
-    foreach($this->vars as $v)
-      $o .= ','.$this->varToCode($v);
+    foreach($this->vars as $v) {
+          $o .= ','.$this->varToCode($v);
+    }
     return "$o)$post";
   }
 
@@ -104,8 +109,9 @@ 
   static function itersplit($v, $sep = ",") {
     $o = [];
     foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+      if($i) {
+              $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+      }
     }
     return new WrapArray($o);
   }