cseufert / hamle

php/hamle/Text.php

Spacing +14 added lines, -14 removed lines

@@ -70,7 +70,7 @@ 
       ]);
     } catch (SyntaxError $e) {
       throw new ParseError(
-        'Unable to parse:' . $s . "\n\n" . $e->getMessage(),
+        'Unable to parse:'.$s."\n\n".$e->getMessage(),
         0,
         $e,
       );
@@ -141,7 +141,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset),
     ];
-    return 'Hamle\Run::modelTypeId(' . join(',', $opt) . ')';
+    return 'Hamle\Run::modelTypeId('.join(',', $opt).')';
   }
 
   function toHTML(bool $escape = false): string
@@ -156,16 +156,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;
@@ -194,7 +194,7 @@ 
           $out[] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -202,7 +202,7 @@ 
 
   function doEval(): mixed
   {
-    return eval('use Seufert\Hamle; return ' . $this->toPHP() . ';');
+    return eval('use Seufert\Hamle; return '.$this->toPHP().';');
   }
 
   static function varToCode(mixed $var): mixed
@@ -210,9 +210,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';
@@ -224,16 +224,16 @@ 
       return $var->toPHP();
     }
     if (strpos($var, "\n") !== false) {
-      return '"' .
+      return '"'.
         str_replace(
           ['\\', '$', '"', "\n"],
           ['\\\\', '\$', '\\"', '\\n'],
           $var,
-        ) .
+        ).
         '"';
     }
-    return "'" .
-      str_replace(['\\', '$', "'"], ['\\\\', '$', "\\'"], $var) .
+    return "'".
+      str_replace(['\\', '$', "'"], ['\\\\', '$', "\\'"], $var).
       "'";
   }
 

php/hamle/Hamle.php

Spacing +4 added lines, -4 removed lines

@@ -92,8 +92,8 @@ 
     }
     if (!$baseModel instanceof Model) {
       throw new Exception\Unsupported(
-        'Unsupported Model(' .
-          get_class($baseModel) .
+        'Unsupported Model('.
+          get_class($baseModel).
           ') Type was passed, it must implement hamleModel',
       );
     }
@@ -128,7 +128,7 @@ 
       throw new Exception\NotFound("Unable to find HAMLE Template ($template)");
     }
     $this->cacheFile = $this->setup->cachePath(
-      str_replace('/', '-', $hamleFile) . '.php',
+      str_replace('/', '-', $hamleFile).'.php',
     );
     $this->setup->debugLog("Set cache file path to ({$this->cacheFile})");
     $cacheFileAge = is_file($this->cacheFile) ? filemtime($this->cacheFile) : 0;
@@ -193,7 +193,7 @@ 
   function string(string $hamleString): void
   {
     $md5 = md5($hamleString);
-    $stringId = substr($md5, 0, 12) . substr($md5, 24, 8);
+    $stringId = substr($md5, 0, 12).substr($md5, 24, 8);
     $this->cacheFile = $this->setup->cachePath("string.$stringId.hamle.php");
     if (!is_file($this->cacheFile)) {
       $this->parse($hamleString);

php/hamle/TextNode/StringConcat.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
   static function fromParser(
     array $chars,
     ?Evaluated $expr = null,
-    string|StringLit|StringConcat $rhs = null
+    string | StringLit | StringConcat $rhs = null
   ): self {
     $o = [];
     if ($chars) {

php/hamle/TextNode/RelQuery.php

Spacing +4 added lines, -4 removed lines

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

php/hamle/Text/Scope.php

Spacing +2 added lines, -2 removed lines

@@ -50,9 +50,9 @@
   function toPHP(): string
   {
     if (is_numeric($this->scope)) {
-      return 'Hamle\\Scope::get(' . Text::varToCode($this->scope) . ')';
+      return 'Hamle\\Scope::get('.Text::varToCode($this->scope).')';
     } else {
-      return 'Hamle\\Scope::getName(' . Text::varToCode($this->scope) . ')';
+      return 'Hamle\\Scope::getName('.Text::varToCode($this->scope).')';
     }
   }
 

php/hamle/Text/Func.php

Spacing +13 added lines, -13 removed lines

@@ -50,7 +50,7 @@ 
   public function __construct($s)
   {
     $m = [];
-    if (!preg_match('/^\$\((' . self::REGEX_FUNCSEL . '*)(.*)\)$/', $s, $m)) {
+    if (!preg_match('/^\$\(('.self::REGEX_FUNCSEL.'*)(.*)\)$/', $s, $m)) {
       throw new ParseError("Unable to read \$ func in '$s'");
     }
     if (trim($m[2])) {
@@ -137,31 +137,31 @@ 
    */
   public function toPHP(): string
   {
-    $sub = $this->sub ? '->' . $this->sub->toPHP() : '';
+    $sub = $this->sub ? '->'.$this->sub->toPHP() : '';
     if ($this->scope instanceof Scope) {
-      return $this->scope->toPHP() . $sub;
+      return $this->scope->toPHP().$sub;
     } elseif ($this->scope === true) {
       return "Hamle\\Scope::get(0)$sub";
     }
     $limit =
-      Text::varToCode($this->sortlimit['sort']) .
-      ',' .
-      $this->sortlimit['limit'] .
-      ',' .
+      Text::varToCode($this->sortlimit['sort']).
+      ','.
+      $this->sortlimit['limit'].
+      ','.
       $this->sortlimit['offset'];
     if (count($this->filt['tag'])) {
-      return 'Hamle\\Run::modelTypeTags(' .
-        Text::varToCode($this->filt['tag']) .
+      return 'Hamle\\Run::modelTypeTags('.
+        Text::varToCode($this->filt['tag']).
         ",$limit)$sub";
     }
     if (count($this->filt['id'])) {
       if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1) {
-        return 'Hamle\\Run::modelId(' .
-          Text::varToCode(current($this->filt['id']['*'])) .
+        return 'Hamle\\Run::modelId('.
+          Text::varToCode(current($this->filt['id']['*'])).
           ",$limit)$sub";
       } else {
-        return 'Hamle\\Run::modelTypeId(' .
-          Text::varToCode($this->filt['id']) .
+        return 'Hamle\\Run::modelTypeId('.
+          Text::varToCode($this->filt['id']).
           ",$limit)$sub";
       }
     }

php/hamle/Text/SimpleVar.php

Spacing +3 added lines, -3 removed lines

@@ -48,9 +48,9 @@ 
   function toHTML(bool $escape = false): string
   {
     if ($escape) {
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
     }
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
 
   function toPHP(): string
@@ -60,7 +60,7 @@ 
 
   function toPHPVar(): string
   {
-    return 'Hamle\\Scope::get()->hamleGet(' . Text::varToCode($this->var) . ')';
+    return 'Hamle\\Scope::get()->hamleGet('.Text::varToCode($this->var).')';
   }
 
   function getOrCreateModel(Model $parent = null): Model

php/hamle/Text/Complex.php

Spacing +5 added lines, -5 removed lines

@@ -64,9 +64,9 @@ 
   function toHTML(bool $escape = false): string
   {
     if ($escape) {
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
     }
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
   function toPHP(): string
   {
@@ -80,7 +80,7 @@ 
       foreach ($this->sel as $s) {
         $sel[] = "hamleGet('$s')";
       }
-      return $this->func->toPHP() . '->' . implode('->', $sel);
+      return $this->func->toPHP().'->'.implode('->', $sel);
     } else {
       return $this->func->toPHP();
     }
@@ -95,7 +95,7 @@ 
       return $this->func->getOrCreateModel($parent);
     }
     throw new RuntimeException(
-      'Unsupported func type encountered:' .
+      'Unsupported func type encountered:'.
         ($this->func ? get_class($this->func) : 'Unknown'),
     );
   }
@@ -114,7 +114,7 @@ 
     $model = $this->getOrCreateModel();
     if (!$model instanceof WriteModel) {
       throw new RuntimeException(
-        'Can only set values on WriteModel, got ' . get_class($model),
+        'Can only set values on WriteModel, got '.get_class($model),
       );
     }
     $model->hamleSet($this->sel[0], $value);

php/hamle/Text/FuncSub.php

Spacing +14 added lines, -14 removed lines

@@ -42,7 +42,7 @@ 
   {
     $m = [];
     if (
-      !preg_match('/^ +([><]) +(' . self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m)
+      !preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL.'+)(.*)$/', $s, $m)
     ) {
       throw new ParseError("Unable to read \$ sub func in '$s'");
     }
@@ -71,18 +71,18 @@ 
   public function toPHP(): string
   {
     $limit =
-      Hamle\Text::varToCode($this->sortlimit['sort']) .
-      ',' .
-      $this->sortlimit['limit'] .
-      ',' .
-      $this->sortlimit['offset'] .
-      ',' .
+      Hamle\Text::varToCode($this->sortlimit['sort']).
+      ','.
+      $this->sortlimit['limit'].
+      ','.
+      $this->sortlimit['offset'].
+      ','.
       $this->grouptype['grouptype'];
-    $sub = $this->sub ? '->' . $this->sub->toPHP() : '';
-    return 'hamleRel(' .
-      $this->dir .
-      ',' .
-      Hamle\Text::varToCode($this->filt['tag']) .
+    $sub = $this->sub ? '->'.$this->sub->toPHP() : '';
+    return 'hamleRel('.
+      $this->dir.
+      ','.
+      Hamle\Text::varToCode($this->filt['tag']).
       ",$limit)$sub";
   }
 
@@ -101,8 +101,8 @@ 
     if (!$model->valid()) {
       if (!$parent instanceof Hamle\WriteModel) {
         throw new \RuntimeException(
-          'Cant create model, ' .
-            get_class($parent) .
+          'Cant create model, '.
+            get_class($parent).
             ' must implement Hamle\\WriteModel.',
         );
       }