cseufert / hamle

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

php/hamle/TextNode/ScopeId.php

Braces +6 added lines, -2 removed lines

@@ -36,8 +36,12 @@
     } else {
       $o = "Hamle\\Scope::get({$this->id})";
     }
-    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/FloatLit.php

Spacing +1 added lines, -1 removed lines

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

php/hamle/TextNode/RelQuery.php

Spacing +4 added lines, -4 removed lines

@@ -23,14 +23,14 @@
   }
 
 
-  static function for(string $rel, array $filters) {
-    return new self($rel === '>'?Hamle::REL_CHILD:Hamle::REL_PARENT, $filters);
+  static function for (string $rel, array $filters) {
+    return new self($rel === '>' ?Hamle::REL_CHILD : Hamle::REL_PARENT, $filters);
   }
 
   public function apply(string $s):string {
 
-    $s=  $s."->hamleRel({$this->rel}," . Query::queryParams($this->filters, true) . ')';
-    if($this->chain) $s = $this->chain->apply($s);
+    $s = $s."->hamleRel({$this->rel},".Query::queryParams($this->filters, true).')';
+    if ($this->chain) $s = $this->chain->apply($s);
     return $s;
   }
 

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
   public function apply(string $s):string {
 
     $s=  $s."->hamleRel({$this->rel}," . Query::queryParams($this->filters, true) . ')';
-    if($this->chain) $s = $this->chain->apply($s);
+    if($this->chain) {
+      $s = $this->chain->apply($s);
+    }
     return $s;
   }