cseufert / hamle

php/hamle/Setup.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     if (!is_dir($dir)) {
       mkdir($dir);
     }
-    return $dir . $f;
+    return $dir.$f;
   }
 
   /**

php/hamle/Text.php

Spacing +25 added lines, -25 removed lines

@@ -122,7 +122,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'])
     ) {
@@ -138,7 +138,7 @@ 
     }
     $args = join(
       ',',
-      array_map(function ($v) {
+      array_map(function($v) {
         if (is_array($v) && $v['type'] ?? false === 'expr') {
           return self::renderExpr($v);
         } else {
@@ -147,9 +147,9 @@ 
       }, $filter['args']),
     );
     if (strlen($args)) {
-      $args = ',' . $args;
+      $args = ','.$args;
     }
-    $o = "$func($o" . $args . ')';
+    $o = "$func($o".$args.')';
     if ($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
     }
@@ -158,21 +158,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;
   }
@@ -180,7 +180,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;
@@ -190,11 +190,11 @@ 
   {
     $r = $rel === 'child' ? Hamle::REL_CHILD : Hamle::REL_PARENT;
     $o =
-      $o .
-      '->hamleRel(' .
-      self::varToCode($r) .
-      ',' .
-      self::queryParams($query, true) .
+      $o.
+      '->hamleRel('.
+      self::varToCode($r).
+      ','.
+      self::queryParams($query, true).
       ')';
     return $o;
   }
@@ -256,7 +256,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset),
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   static function renderQuery($n)
@@ -277,7 +277,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']);
@@ -304,7 +304,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']);
@@ -324,16 +324,16 @@ 
           }
           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;
@@ -362,7 +362,7 @@ 
           $out[] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -370,7 +370,7 @@ 
 
   function doEval()
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode($var)
@@ -378,9 +378,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';
@@ -391,7 +391,7 @@ 
     if ($var instanceof Text) {
       return $var->toPHP();
     }
-    return "'" . str_replace(['$', "'"], ['$', "\\'"], $var) . "'";
+    return "'".str_replace(['$', "'"], ['$', "\\'"], $var)."'";
   }
 
   /**

php/hamle/Field/Button.php

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 
   function isClicked()
   {
-    return isset($_REQUEST[$this->form . '_' . $this->name]);
+    return isset($_REQUEST[$this->form.'_'.$this->name]);
   }
 }

php/hamle/Field/Checkbox.php

Spacing +2 added lines, -2 removed lines

@@ -49,8 +49,8 @@
     if (!is_null($this->setValue)) {
       return $this->setValue;
     }
-    if (isset($_REQUEST[$this->form . '__submit'])) {
-      return isset($_REQUEST[$this->form . '_' . $this->name]);
+    if (isset($_REQUEST[$this->form.'__submit'])) {
+      return isset($_REQUEST[$this->form.'_'.$this->name]);
     }
     return $this->opt['default'];
   }

php/hamle/TextNode/ScopeName.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
   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);
     }

php/hamle/TextNode/ModelParam.php

Spacing +1 added lines, -1 removed lines

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

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'])
     ) {
@@ -48,7 +48,7 @@ 
       $this->args,
     );
     array_unshift($args, $out);
-    $o = "{$this->func}(" . join(',', $args) . ')';
+    $o = "{$this->func}(".join(',', $args).')';
     if ($this->chain) {
       $o = $this->chain->apply($o);
     }

php/hamle/TextNode/RelQuery.php

Spacing +4 added lines, -4 removed lines

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

php/hamle/TextNode/Query.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
       $o = self::queryId($this->filters);
     } else {
       $o =
-        'Hamle\Run::modelTypeTags(' . self::queryParams($this->filters) . ')';
+        'Hamle\Run::modelTypeTags('.self::queryParams($this->filters).')';
     }
     if ($this->immediate) {
       $o = $this->immediate->apply($o);
@@ -127,8 +127,8 @@ 
     ];
     if (!$type || $type === '*') {
       $opt[0] = Text::varToCode($id);
-      return 'Hamle\Run::modelId(' . join(',', $opt) . ')';
+      return 'Hamle\Run::modelId('.join(',', $opt).')';
     }
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 }