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

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

Spacing +22 added lines, -22 removed lines

@@ -47,23 +47,23 @@ 
 
   function __construct($s, Text $what) {
     var_dump($s, $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}\"");
@@ -72,24 +72,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";
   }
@@ -104,24 +104,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);
   }
 
 }

php/hamle/Field.php

Spacing +7 added lines, -7 removed lines

@@ -112,16 +112,16 @@ 
 
   function getValue() {
     if (!is_null($this->setValue)) return $this->setValue;
-    if (isset($_REQUEST[$this->form . "_" . $this->name])) {
-      return $_REQUEST[$this->form . "_" . $this->name];
+    if (isset($_REQUEST[$this->form."_".$this->name])) {
+      return $_REQUEST[$this->form."_".$this->name];
     }
     return $this->opt['default'];
   }
 
   function getInputAttStatic(&$atts, &$type, &$content) {
-    $atts['id'] = $atts['name'] = $this->form . "_" . $this->name;
+    $atts['id'] = $atts['name'] = $this->form."_".$this->name;
     $atts['type'] = "text";
-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));
+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));
   }
 
   function getInputAttDynamic(&$atts, &$type, &$content) {
@@ -139,8 +139,8 @@ 
   }
 
   function getLabelAttStatic(&$atts, &$type, &$content) {
-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));
-    $atts["for"] = $this->form . "_" . $this->name;
+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));
+    $atts["for"] = $this->form."_".$this->name;
     $content = array($this->opt['label']);
   }
 
@@ -148,7 +148,7 @@ 
   }
 
   function getHintAttStatic(&$atts, &$type, &$content) {
-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));
+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));
     $atts['class'][] = "hamleFormHint";
   }
 

Braces +21 added lines, -12 removed lines

@@ -66,7 +66,9 @@ 
   }
 
   function __call($name, $valarray) {
-    if (count($valarray) < 1) return $this->__get($name);
+    if (count($valarray) < 1) {
+      return $this->__get($name);
+    }
     $val = count($valarray) == 1 ? current($valarray) : $valarray;
     switch ($name) {
       case "name":
@@ -111,7 +113,9 @@ 
   }
 
   function getValue() {
-    if (!is_null($this->setValue)) return $this->setValue;
+    if (!is_null($this->setValue)) {
+      return $this->setValue;
+    }
     if (isset($_REQUEST[$this->form . "_" . $this->name])) {
       return $_REQUEST[$this->form . "_" . $this->name];
     }
@@ -130,12 +134,15 @@ 
     if (!$this->valid) {
       $atts['class'][] = "hamleFormError";
     }
-    if ($this->opt["disabled"])
-      $atts['disabled'] = "disabled";
-    if ($this->opt['required'])
-      $atts['required'] = "required";
-    if ($this->opt['help'])
-      $atts['title'] = $this->opt['help'];
+    if ($this->opt["disabled"]) {
+          $atts['disabled'] = "disabled";
+    }
+    if ($this->opt['required']) {
+          $atts['required'] = "required";
+    }
+    if ($this->opt['help']) {
+          $atts['title'] = $this->opt['help'];
+    }
   }
 
   function getLabelAttStatic(&$atts, &$type, &$content) {
@@ -173,10 +180,12 @@ 
   function doProcess($submit) {
     if ($submit) {
       $value = $this->getValue();
-      if ($this->opt['required'])
-        $this->valid = $this->valid && strlen($value);
-      if ($this->opt['regex'])
-        $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
+      if ($this->opt['required']) {
+              $this->valid = $this->valid && strlen($value);
+      }
+      if ($this->opt['regex']) {
+              $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
+      }
     }
   }
 

php/hamle/Text.php

Spacing +25 added lines, -25 removed lines

@@ -51,7 +51,7 @@ 
   const FIND_DOLLARVAR = 0x02;
   const FIND_BARDOLLAR = 0x04;
 
-  const START_RULE_MAP = [self::TOKEN_HTML => 'HtmlInput', self::TOKEN_CODE => 'CodeInput',self::TOKEN_CONTROL => 'ControlInput'];
+  const START_RULE_MAP = [self::TOKEN_HTML => 'HtmlInput', self::TOKEN_CODE => 'CodeInput', self::TOKEN_CONTROL => 'ControlInput'];
 
   protected $mode;
 
@@ -61,9 +61,9 @@ 
   {
 //    var_dump($s);
     $this->mode = $mode;
-    $this->tree = (new Parser())->parse($s,['startRule' => self::START_RULE_MAP[$mode]]);
+    $this->tree = (new Parser())->parse($s, ['startRule' => self::START_RULE_MAP[$mode]]);
 //    var_dump($this->tree);
-    if(!$this->tree instanceof Doc) {
+    if (!$this->tree instanceof Doc) {
       $this->tree = new Doc(is_array($this->tree) ? $this->tree : [$this->tree]);
     }
 //    $m = [];
@@ -114,7 +114,7 @@ 
   {
     $func = $filter['func'];
     if (method_exists(Filter::class, $func)) {
-      $func = Filter::class . '::' . $func;
+      $func = Filter::class.'::'.$func;
     } elseif (in_array($func, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
     } elseif ($func === 'json') {
       $func = 'json_encode';
@@ -124,14 +124,14 @@ 
       throw new ParseError("Unknown Filter Type \"{$func}\"");
     }
     $args = join(',', array_map(function($v) {
-      if(is_array($v) && $v['type'] ?? false === 'expr') {
+      if (is_array($v) && $v['type'] ?? false === 'expr') {
         return self::renderExpr($v);
       } else
         return self::varToCode($v);
     } , $filter['args']));
-    if(strlen($args)) $args = ','.$args;
-    $o = "$func($o" . $args . ")";
-    if($filter['chain'] ?? false) {
+    if (strlen($args)) $args = ','.$args;
+    $o = "$func($o".$args.")";
+    if ($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
     }
     return $o;
@@ -139,21 +139,21 @@ 
 
   static function renderScopeThis($n)
   {
-    $o = 'Hamle\Scope::get()->hamleGet(' . self::varToCode($n['name']) . ')';
+    $o = 'Hamle\Scope::get()->hamleGet('.self::varToCode($n['name']).')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
 
   static function renderScopeId($n)
   {
-    $o = 'Hamle\Scope::get(' . $n['id'] . ')';
+    $o = 'Hamle\Scope::get('.$n['id'].')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
 
   static function renderScopeName($n)
   {
-    $o = 'Hamle\Scope::getName(' . self::varToCode($n['name']) . ')';
+    $o = 'Hamle\Scope::getName('.self::varToCode($n['name']).')';
     $o = self::addParams($o, $n['param'] ?? []);
     return $o;
   }
@@ -161,7 +161,7 @@ 
   static function addParams(string $o, array $params)
   {
     while ($params['type'] ?? null === 'sub') {
-      $o .= '->hamleGet(' . self::varToCode($params['name']) . ')';
+      $o .= '->hamleGet('.self::varToCode($params['name']).')';
       $params = $params['params'] ?? [];
     }
     return $o;
@@ -170,7 +170,7 @@ 
   static function addRel(string $o, array $query, string $rel): string
   {
     $r = $rel === 'child' ? Hamle::REL_CHILD : Hamle::REL_PARENT;
-    $o = $o . "->hamleRel(" . self::varToCode($r) . ',' . self::queryParams($query, true) . ')';
+    $o = $o."->hamleRel(".self::varToCode($r).','.self::queryParams($query, true).')';
     return $o;
   }
 
@@ -230,7 +230,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset)
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   static function renderQuery($n)
@@ -249,7 +249,7 @@ 
     } elseif ($id !== null) {
       $o = self::queryId($n['query']);
     } else {
-      $o = 'Hamle\Run::modelTypeTags(' . self::queryParams($n['query']) . ')';
+      $o = 'Hamle\Run::modelTypeTags('.self::queryParams($n['query']).')';
     }
     if ($n['sub'] ?? []) {
       $o = self::addRel($o, $n['sub'], $n['rel']);
@@ -276,7 +276,7 @@ 
         $o = self::renderQuery($expr['body']);
         break;
       default:
-        throw new \RuntimeException('Invalid Node: ' . $expr['body']['type']);
+        throw new \RuntimeException('Invalid Node: '.$expr['body']['type']);
     }
     if ($expr['body']['filter'] ?? false) {
       $o = self::addFilter($o, $expr['body']['filter']);
@@ -295,16 +295,16 @@ 
             $out .= $node['body'];
           break;
         case 'scopeName':
-          $out .= '<?=' . self::renderScopeName($node) . '?>';
+          $out .= '<?='.self::renderScopeName($node).'?>';
           break;
         case 'scopeThis':
-          $out .= '<?=' . self::renderScopeThis($node) . '?>';
+          $out .= '<?='.self::renderScopeThis($node).'?>';
           break;
         case 'expr':
-          $out .= '<?=' . self::renderExpr($node) . "?>";
+          $out .= '<?='.self::renderExpr($node)."?>";
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return $out;
@@ -332,7 +332,7 @@ 
           $out [] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -340,7 +340,7 @@ 
 
   function doEval()
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var)
@@ -348,9 +348,9 @@ 
     if (is_array($var)) {
       $code = [];
       foreach ($var as $key => $value) {
-        $code[] = self::varToCode($key) . '=>' . self::varToCode($value);
+        $code[] = self::varToCode($key).'=>'.self::varToCode($value);
       }
-      return 'array(' . implode(',', $code) . ')'; //remove unnecessary coma
+      return 'array('.implode(',', $code).')'; //remove unnecessary coma
     }
     if (is_bool($var)) {
       return ($var ? 'TRUE' : 'FALSE');
@@ -361,7 +361,7 @@ 
     if ($var instanceof Text) {
       return $var->toPHP();
     }
-    return "'" . str_replace(['$', "'"], ['$', "\\'"], $var) . "'";
+    return "'".str_replace(['$', "'"], ['$', "\\'"], $var)."'";
   }
 
   /**

Braces +21 added lines, -13 removed lines

@@ -126,10 +126,13 @@ 
     $args = join(',', array_map(function($v) {
       if(is_array($v) && $v['type'] ?? false === 'expr') {
         return self::renderExpr($v);
-      } else
-        return self::varToCode($v);
+      } else {
+              return self::varToCode($v);
+      }
     } , $filter['args']));
-    if(strlen($args)) $args = ','.$args;
+    if(strlen($args)) {
+      $args = ','.$args;
+    }
     $o = "$func($o" . $args . ")";
     if($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
@@ -202,8 +205,9 @@ 
       self::varToCode($limit),
       self::varToCode($offset)
     ];
-    if ($addGroup)
-      $opt[] = self::varToCode($group);
+    if ($addGroup) {
+          $opt[] = self::varToCode($group);
+    }
     return join(',', $opt);
   }
 
@@ -239,10 +243,12 @@ 
     $id = null;
     $type = [];
     foreach ($n['query'] ?? [] as $q) {
-      if ($q['q'] === 'id')
-        $id = $q['id'] ?? null;
-      if ($q['q'] === 'type')
-        $type = $q['id'];
+      if ($q['q'] === 'id') {
+              $id = $q['id'] ?? null;
+      }
+      if ($q['q'] === 'type') {
+              $type = $q['id'];
+      }
     }
     if ($n['query'] === null) {
       $o = 'Hamle\Scope::get(0)';
@@ -291,8 +297,9 @@ 
     foreach ($this->tree as $node) {
       switch ($node['type']) {
         case 'string':
-          if ($node['body'] !== '')
-            $out .= $node['body'];
+          if ($node['body'] !== '') {
+                      $out .= $node['body'];
+          }
           break;
         case 'scopeName':
           $out .= '<?=' . self::renderScopeName($node) . '?>';
@@ -322,8 +329,9 @@ 
     foreach ($this->tree as $node) {
       switch ($node['type']) {
         case 'string':
-          if ($node['body'] !== '')
-            $out[] = self::varToCode($node['body']);
+          if ($node['body'] !== '') {
+                      $out[] = self::varToCode($node['body']);
+          }
           break;
         case 'scopeThis':
           $out[] = self::renderScopeThis($node);

php/hamle/TextNode/ScopeName.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 
 
   public function toPHP():string {
-    $o = "Hamle\\Scope::getName(" . Text::varToCode($this->name) . ")";
+    $o = "Hamle\\Scope::getName(".Text::varToCode($this->name).")";
     if ($this->immediate) $o = $this->immediate->apply($o);
-    if($this->chain) $o = $this->chain->apply($o);
+    if ($this->chain) $o = $this->chain->apply($o);
     return $o;
   }
 

Braces +6 added lines, -2 removed lines

@@ -31,8 +31,12 @@
 
   public function toPHP():string {
     $o = "Hamle\\Scope::getName(" . Text::varToCode($this->name) . ")";
-    if ($this->immediate) $o = $this->immediate->apply($o);
-    if($this->chain) $o = $this->chain->apply($o);
+    if ($this->immediate) {
+      $o = $this->immediate->apply($o);
+    }
+    if($this->chain) {
+      $o = $this->chain->apply($o);
+    }
     return $o;
   }
 

php/hamle/TextNode/ModelParam.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 
   public function apply(string $out): string
   {
-    $o = "{$out}->hamleGet(" . Text::varToCode($this->name) . ")";
-    if($this->chain)
+    $o = "{$out}->hamleGet(".Text::varToCode($this->name).")";
+    if ($this->chain)
       $o = $this->chain->apply($o);
     return $o;
   }

Braces +3 added lines, -2 removed lines

@@ -24,8 +24,9 @@
   public function apply(string $out): string
   {
     $o = "{$out}->hamleGet(" . Text::varToCode($this->name) . ")";
-    if($this->chain)
-      $o = $this->chain->apply($o);
+    if($this->chain) {
+          $o = $this->chain->apply($o);
+    }
     return $o;
   }
 }

php/hamle/TextNode/IntLit.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 
   public function string(): string
   {
-    return (string)$this->int;
+    return (string) $this->int;
   }
 }

php/hamle/TextNode/FilterFunc.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     $this->chain = $chain;
     $this->args = $args;
     if (method_exists(Filter::class, $func)) {
-      $this->func = Filter::class . '::' . $func;
+      $this->func = Filter::class.'::'.$func;
     } elseif (in_array($func, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
       $this->func = $func;
     } elseif ($func === 'json') {
@@ -38,7 +38,7 @@ 
   {
     $args = array_map(fn($v) => $v instanceof Literal ? Text::varToCode($v->string()) : $v->toPHP(), $this->args);
     array_unshift($args, $out);
-    $o = "{$this->func}(" . join(',', $args) . ")";
+    $o = "{$this->func}(".join(',', $args).")";
     if ($this->chain) $o = $this->chain->apply($o);
     return $o;
   }

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
     $args = array_map(fn($v) => $v instanceof Literal ? Text::varToCode($v->string()) : $v->toPHP(), $this->args);
     array_unshift($args, $out);
     $o = "{$this->func}(" . join(',', $args) . ")";
-    if ($this->chain) $o = $this->chain->apply($o);
+    if ($this->chain) {
+      $o = $this->chain->apply($o);
+    }
     return $o;
   }
 }

php/hamle/TextNode/Doc.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
     return join('.', $out);
   }
 
-  public function toHtml(bool $escVar = false,bool $escFixed = true): string
+  public function toHtml(bool $escVar = false, bool $escFixed = true): string
   {
     $out = [];
     if ($escVar) {
@@ -53,7 +53,7 @@ 
           $code = false;
         }
         $s = $n->string();
-        if($escFixed) $s = htmlspecialchars($s);
+        if ($escFixed) $s = htmlspecialchars($s);
         $out[] = $s;
       } else {
         if (!$code) {

Braces +6 added lines, -2 removed lines

@@ -53,7 +53,9 @@ 
           $code = false;
         }
         $s = $n->string();
-        if($escFixed) $s = htmlspecialchars($s);
+        if($escFixed) {
+          $s = htmlspecialchars($s);
+        }
         $out[] = $s;
       } else {
         if (!$code) {
@@ -63,7 +65,9 @@ 
         $out[] = $n->toPHP();
       }
     }
-    if ($code) $out[] = $closeTag;
+    if ($code) {
+      $out[] = $closeTag;
+    }
     return join('', $out);
   }
 }