cseufert / hamle

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

php/hamle/Tag/Control.php

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
   function __construct(string $tag, H\Tag $parentTag = null)
   {
     parent::__construct();
-    $this->o = "\$o" . self::$instCount++;
+    $this->o = "\$o".self::$instCount++;
     $this->type = strtolower($tag);
     $this->var = '';
     if ($parentTag && $this->type == 'else') {
@@ -70,15 +70,15 @@ 
 
   function renderStTag(): string
   {
-    $out = '<' . '?php ';
+    $out = '<'.'?php ';
     $scopeName = '';
     if ($this->type === 'if') {
       $hsvcomp = new H\Text\Comparison($this->var);
-      $out .= 'if(' . $hsvcomp->toPHP() . ') {';
-      return $out . "\n?>";
+      $out .= 'if('.$hsvcomp->toPHP().') {';
+      return $out."\n?>";
     } elseif ($this->type === 'else') {
       $out .= '/* else */';
-      return $out . "\n?>";
+      return $out."\n?>";
     }
     /** @var H\Text|null $hsv */
     $hsv = null;
@@ -94,7 +94,7 @@ 
     switch ($this->type) {
       case 'each':
         if ($hsv) {
-          $out .= 'foreach(' . $hsv->toPHP() . " as {$this->o}) { \n";
+          $out .= 'foreach('.$hsv->toPHP()." as {$this->o}) { \n";
         } else {
           $out .= "foreach(\$scope->model() as {$this->o}) { \n";
         }
@@ -120,7 +120,7 @@ 
         }
         $out .= "echo \$ctx->hamleInclude(\$scope, {$hsv->toPHP()});";
     }
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   /**
@@ -133,7 +133,7 @@ 
 
   function renderEnTag(): string
   {
-    $out = '<' . '?php ';
+    $out = '<'.'?php ';
     switch ($this->type) {
       case 'each':
         $out .= '$scope = $scope->lastScope(); ';
@@ -156,7 +156,7 @@ 
     if ($this->else) {
       $out .= 'else{';
     }
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   function render(int $indent = 0, bool $minify = false): string