cseufert / hamle

php/hamle/Text.php

Spacing +14 added lines, -14 removed lines

@@ -71,7 +71,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,
       );
@@ -142,7 +142,7 @@ 
       self::varToCode($limit),
       self::varToCode($offset),
     ];
-    return '$ctx->hamleFindTypeId($scope,' . join(',', $opt) . ')';
+    return '$ctx->hamleFindTypeId($scope,'.join(',', $opt).')';
   }
 
   function toHTML(bool $escape = false): string
@@ -157,16 +157,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;
@@ -195,7 +195,7 @@ 
           $out[] = self::renderExpr($node);
           break;
         default:
-          throw new \RuntimeException('Invalid Node:' . $node['type']);
+          throw new \RuntimeException('Invalid Node:'.$node['type']);
       }
     }
     return join('.', $out);
@@ -203,7 +203,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
@@ -211,9 +211,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';
@@ -226,16 +226,16 @@ 
     }
     $var = (string) $var;
     if (strpos($var, "\n") !== false) {
-      return '"' .
+      return '"'.
         str_replace(
           ['\\', '$', '"', "\n"],
           ['\\\\', '\$', '\\"', '\\n'],
           $var,
-        ) .
+        ).
         '"';
     }
-    return "'" .
-      str_replace(['\\', '$', "'"], ['\\\\', '$', "\\'"], $var) .
+    return "'".
+      str_replace(['\\', '$', "'"], ['\\\\', '$', "\\'"], $var).
       "'";
   }
 

php/hamle/Text/SimpleVar.php

Spacing +3 added lines, -3 removed lines

@@ -49,9 +49,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
@@ -61,7 +61,7 @@ 
 
   function toPHPVar(): string
   {
-    return '$scope->model()->hamleGet(' . Text::varToCode($this->var) . ')';
+    return '$scope->model()->hamleGet('.Text::varToCode($this->var).')';
   }
 
   function getOrCreateModel(

php/hamle/Text/Complex.php

Spacing +5 added lines, -5 removed lines

@@ -65,9 +65,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
   {
@@ -81,7 +81,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();
     }
@@ -96,7 +96,7 @@ 
       return $this->func->getOrCreateModel($scope, $ctx, $parent);
     }
     throw new RuntimeException(
-      'Unsupported func type encountered:' .
+      'Unsupported func type encountered:'.
         ($this->func ? get_class($this->func) : 'Unknown'),
     );
   }
@@ -118,7 +118,7 @@ 
     $model = $this->getOrCreateModel($scope, $ctx);
     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/Func.php

Spacing +13 added lines, -13 removed lines

@@ -51,7 +51,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])) {
@@ -138,31 +138,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 '$ctx->hamleFindTypeTags($scope,' .
-        Text::varToCode($this->filt['tag']) .
+      return '$ctx->hamleFindTypeTags($scope,'.
+        Text::varToCode($this->filt['tag']).
         ",$limit)$sub";
     }
     if (count($this->filt['id'])) {
       if (isset($this->filt['id']['*']) && count($this->filt['id']['*']) == 1) {
-        return '$ctx->hamleFindId($scope,' .
-          Text::varToCode(current($this->filt['id']['*'])) .
+        return '$ctx->hamleFindId($scope,'.
+          Text::varToCode(current($this->filt['id']['*'])).
           ",$limit)$sub";
       } else {
-        return '$ctx->hamleFindTypeId($scope,' .
-          Text::varToCode($this->filt['id']) .
+        return '$ctx->hamleFindTypeId($scope,'.
+          Text::varToCode($this->filt['id']).
           ",$limit)$sub";
       }
     }

php/hamle/Text/Scope.php

Spacing +2 added lines, -2 removed lines

@@ -51,9 +51,9 @@
   function toPHP(): string
   {
     if (is_numeric($this->scope)) {
-      return '$scope->modelNum(' . Text::varToCode($this->scope) . ')';
+      return '$scope->modelNum('.Text::varToCode($this->scope).')';
     } else {
-      return '$scope->namedModel(' . Text::varToCode($this->scope) . ')';
+      return '$scope->namedModel('.Text::varToCode($this->scope).')';
     }
   }