cseufert / hamle

php/hamle/Tag/Html.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
   function renderStTag()
   {
     $close = in_array($this->type, self::$selfCloseTags) ? ' />' : '>';
-    return "<{$this->type}" . $this->optToTags() . $close;
+    return "<{$this->type}".$this->optToTags().$close;
   }
 
   function renderEnTag()
@@ -110,7 +110,7 @@ 
         $v = new H\Text($v);
       }
       $k = new H\Text($k);
-      $out[] = ' ' . $k->toHTML() . "=\"" . $v->toHTMLAtt() . "\"";
+      $out[] = ' '.$k->toHTML()."=\"".$v->toHTMLAtt()."\"";
     }
     return implode('', $out);
   }

php/hamle/Tag/Form.php

Spacing +4 added lines, -4 removed lines

@@ -122,10 +122,10 @@
       $this->addChild($input = new DynHtml('input', [], [], '', $n));
       $f->getInputAttStatic($input->opt, $input->type, $input->content);
     }
-    return '<form ' .
-      implode(' ', $out) .
-      "><?php \$form = " .
-      $this->var->toPHP() .
+    return '<form '.
+      implode(' ', $out).
+      "><?php \$form = ".
+      $this->var->toPHP().
       "; \$form->process(); ?>";
   }
 

php/hamle/Tag/Comment.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
   {
     if ($this->commentstyle == 'HTML') {
       if (count($this->content) > 1) {
-        return $pad . '  ' . implode("\n$pad", $this->content) . "\n";
+        return $pad.'  '.implode("\n$pad", $this->content)."\n";
       } else {
         return current($this->content);
       }

php/hamle/Tag/Control.php

Spacing +13 added lines, -13 removed lines

@@ -50,7 +50,7 @@ 
   function __construct($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') {
@@ -74,15 +74,15 @@ 
 
   function renderStTag()
   {
-    $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?>";
     }
     if ($this->var) {
       if (preg_match('/ as ([a-zA-Z]+)$/', $this->var, $m)) {
@@ -96,7 +96,7 @@ 
     switch ($this->type) {
       case 'each':
         if ($this->var) {
-          $out .= 'foreach(' . $hsv->toPHP() . " as {$this->o}) { \n";
+          $out .= 'foreach('.$hsv->toPHP()." as {$this->o}) { \n";
         } else {
           $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
         }
@@ -105,12 +105,12 @@ 
       case 'with':
         if ($scopeName) {
           $out .=
-            'Hamle\\Scope::add(' . $hsv->toPHP() . ", \"$scopeName\");\n;";
+            'Hamle\\Scope::add('.$hsv->toPHP().", \"$scopeName\");\n;";
         } else {
           $out .=
-            "if(({$this->o} = " .
-            $hsv->toPHP() .
-            ') && ' .
+            "if(({$this->o} = ".
+            $hsv->toPHP().
+            ') && '.
             "{$this->o}->valid()) {\n";
           $out .= "Hamle\\Scope::add({$this->o});\n;";
         }
@@ -120,7 +120,7 @@ 
         $fn = $file[0] === '#' ? 'includeFragment' : 'includeFile';
         $out .= "echo Hamle\\Run::$fn({$hsv->toPHP()});";
     }
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   /**
@@ -133,7 +133,7 @@ 
 
   function renderEnTag()
   {
-    $out = '<' . '?php ';
+    $out = '<'.'?php ';
     switch ($this->type) {
       case 'each':
         $out .= 'Hamle\\Scope::done(); ';
@@ -159,7 +159,7 @@ 
     if ($this->else) {
       $out .= 'else{';
     }
-    return $out . "\n?>";
+    return $out."\n?>";
   }
 
   function render($indent = 0, $minify = false)

php/hamle/Grammar/Parser.php

Spacing +9 added lines, -9 removed lines

@@ -254,14 +254,14 @@ 
 
       $expectedDesc =
         count($expected) > 1
-          ? join(', ', array_slice($expectedDescs, 0, -1)) .
-            ' or ' .
+          ? join(', ', array_slice($expectedDescs, 0, -1)).
+            ' or '.
             $expectedDescs[count($expected) - 1]
           : $expectedDescs[0];
 
       $foundDesc = $found ? json_encode($found) : 'end of input';
 
-      $message = 'Expected ' . $expectedDesc . ' but ' . $foundDesc . ' found.';
+      $message = 'Expected '.$expectedDesc.' but '.$foundDesc.' found.';
     }
 
     return new SyntaxError(
@@ -345,7 +345,7 @@ 
   private function peg_f0($i)
   {
     $return = [];
-    array_walk_recursive($i, function ($a) use (&$return) {
+    array_walk_recursive($i, function($a) use (&$return) {
       $return[] = $a;
     });
     return $return;
@@ -353,7 +353,7 @@ 
   private function peg_f1($i)
   {
     $return = [];
-    array_walk_recursive($i, function ($a) use (&$return) {
+    array_walk_recursive($i, function($a) use (&$return) {
       $return[] = $a;
     });
     return $return;
@@ -435,7 +435,7 @@ 
   }
   private function peg_f18($rel, $sub)
   {
-    return \Seufert\Hamle\TextNode\RelQuery::for($rel, $sub);
+    return \Seufert\Hamle\TextNode\RelQuery::for ($rel, $sub);
   }
   private function peg_f19($id)
   {
@@ -519,7 +519,7 @@ 
   }
   private function peg_f39($sign, $n)
   {
-    return new \Seufert\Hamle\TextNode\IntLit((int) ($sign . join('', $n)));
+    return new \Seufert\Hamle\TextNode\IntLit((int) ($sign.join('', $n)));
   }
   private function peg_f40($name)
   {
@@ -527,7 +527,7 @@ 
   }
   private function peg_f41($p, $s)
   {
-    return $p . join('', $s);
+    return $p.join('', $s);
   }
   private function peg_f42($s)
   {
@@ -3212,7 +3212,7 @@ 
     if (isset($options['startRule'])) {
       if (!isset($peg_startRuleFunctions[$options['startRule']])) {
         throw new \Exception(
-          "Can't start parsing from rule \"" + $options['startRule'] + "\".",
+          "Can't start parsing from rule \"" +$options['startRule'] + "\".",
         );
       }
 

php/hamle/Text/Complex.php

Spacing +5 added lines, -5 removed lines

@@ -62,9 +62,9 @@ 
   function toHTML($escape = false)
   {
     if ($escape) {
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
     }
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
   function toPHP()
   {
@@ -77,7 +77,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();
     }
@@ -92,7 +92,7 @@ 
       return $this->func->getOrCreateModel($parent);
     }
     throw new RuntimeException(
-      'Unsupported func type encountered:' . get_class($this->func),
+      'Unsupported func type encountered:'.get_class($this->func),
     );
   }
 
@@ -110,7 +110,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/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()
   {
-    $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($escape = false)
   {
     if ($escape) {
-      return '<?=htmlspecialchars(' . $this->toPHP() . ')?>';
+      return '<?=htmlspecialchars('.$this->toPHP().')?>';
     }
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
 
   function toPHP()
@@ -60,7 +60,7 @@ 
 
   function toPHPVar()
   {
-    return 'Hamle\\Scope::get()->hamleGet(' . Text::varToCode($this->var) . ')';
+    return 'Hamle\\Scope::get()->hamleGet('.Text::varToCode($this->var).')';
   }
 
   function getOrCreateModel(Model $parent = null)

php/hamle/Text/Comparison.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
   function __construct($s, $mode = self::TOKEN_CONTROL)
   {
     $m = [];
-    if (preg_match('/^(.*) ' . self::REGEX_COMP_OPER . ' (.*)$/', $s, $m)) {
+    if (preg_match('/^(.*) '.self::REGEX_COMP_OPER.' (.*)$/', $s, $m)) {
       $this->param1 = new Text($m[1], Text::TOKEN_HTML);
       $this->param2 = new Text($m[3], Text::TOKEN_HTML);
       $this->operator = $m[2];
@@ -59,14 +59,14 @@ 
     switch ($this->operator) {
       case 'equals':
       case 'equal':
-        return $p1 . ' == ' . $p2;
+        return $p1.' == '.$p2;
       case 'notequals':
       case 'notequal':
-        return $p1 . ' != ' . $p2;
+        return $p1.' != '.$p2;
       case 'less':
-        return $p1 . ' < ' . $p2;
+        return $p1.' < '.$p2;
       case 'greater':
-        return $p1 . ' > ' . $p2;
+        return $p1.' > '.$p2;
       case 'has':
         return "in_array($p2, $p1)";
       case 'starts':