cseufert / hamle

php/hamle/Text.php

Braces +21 added lines, -13 removed lines

@@ -126,10 +126,13 @@ 
     $args = join(',', array_map(function($v) {
       if(is_array($v) && $v['type'] ?? false === 'expr') {
         return self::renderExpr($v);
-      } else
-        return self::varToCode($v);
+      } else {
+              return self::varToCode($v);
+      }
     } , $filter['args']));
-    if(strlen($args)) $args = ','.$args;
+    if(strlen($args)) {
+      $args = ','.$args;
+    }
     $o = "$func($o" . $args . ")";
     if($filter['chain'] ?? false) {
       $o = self::addFilter($o, $filter['chain']);
@@ -202,8 +205,9 @@ 
       self::varToCode($limit),
       self::varToCode($offset)
     ];
-    if ($addGroup)
-      $opt[] = self::varToCode($group);
+    if ($addGroup) {
+          $opt[] = self::varToCode($group);
+    }
     return join(',', $opt);
   }
 
@@ -239,10 +243,12 @@ 
     $id = null;
     $type = [];
     foreach ($n['query'] ?? [] as $q) {
-      if ($q['q'] === 'id')
-        $id = $q['id'] ?? null;
-      if ($q['q'] === 'type')
-        $type = $q['id'];
+      if ($q['q'] === 'id') {
+              $id = $q['id'] ?? null;
+      }
+      if ($q['q'] === 'type') {
+              $type = $q['id'];
+      }
     }
     if ($n['query'] === null) {
       $o = 'Hamle\Scope::get(0)';
@@ -291,8 +297,9 @@ 
     foreach ($this->tree as $node) {
       switch ($node['type']) {
         case 'string':
-          if ($node['body'] !== '')
-            $out .= $node['body'];
+          if ($node['body'] !== '') {
+                      $out .= $node['body'];
+          }
           break;
         case 'scopeName':
           $out .= '<?=' . self::renderScopeName($node) . '?>';
@@ -322,8 +329,9 @@ 
     foreach ($this->tree as $node) {
       switch ($node['type']) {
         case 'string':
-          if ($node['body'] !== '')
-            $out[] = self::varToCode($node['body']);
+          if ($node['body'] !== '') {
+                      $out[] = self::varToCode($node['body']);
+          }
           break;
         case 'scopeThis':
           $out[] = self::renderScopeThis($node);

php/hamle/Tag/Control.php

Braces +23 added lines, -15 removed lines

@@ -82,21 +82,23 @@ 
         $scopeName = $m[1];
         $lookup = substr($this->var, 0, strlen($this->var) - strlen($m[0]));
         $hsv = new H\Text(trim($lookup), H\Text::TOKEN_CONTROL);
-      } else
-        $hsv = new H\Text($this->var, H\Text::TOKEN_CONTROL);
+      } else {
+              $hsv = new H\Text($this->var, H\Text::TOKEN_CONTROL);
+      }
     }
     switch ($this->type) {
       case "each":
-        if ($this->var)
-          $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
-        else
-          $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
+        if ($this->var) {
+                  $out .= "foreach(" . $hsv->toPHP() . " as {$this->o}) { \n";
+        } else {
+                  $out .= "foreach(Hamle\\Scope::get() as {$this->o}) { \n";
+        }
         $out .= "Hamle\\Scope::add({$this->o}); ";
         break;
       case "with":
-        if ($scopeName)
-          $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
-        else {
+        if ($scopeName) {
+                  $out .= "Hamle\\Scope::add(" . $hsv->toPHP() . ", \"$scopeName\");\n;";
+        } else {
           $out .= "if(({$this->o} = " . $hsv->toPHP() . ") && " .
               "{$this->o}->valid()) {\n";
           $out .= "Hamle\\Scope::add({$this->o});\n;";
@@ -123,8 +125,9 @@ 
       case "each";
         $out .= 'Hamle\\Scope::done(); ';
         $out .= '}';
-        if (!$this->var)
-          $out .= "Hamle\\Scope::get()->rewind();\n";
+        if (!$this->var) {
+                  $out .= "Hamle\\Scope::get()->rewind();\n";
+        }
         break;
       case "if":
       case "else":
@@ -140,7 +143,9 @@ 
         return "";
         break;
     }
-    if ($this->else) $out .= "else{";
+    if ($this->else) {
+      $out .= "else{";
+    }
     return $out . "\n?>";
   }
 
@@ -148,9 +153,12 @@ 
     $ind = $minify ? '' : str_pad('', $indent);
     $oneliner = (!(count($this->content) > 1 || $this->tags));
     $out = $this->renderStTag();
-    if ($this->content) $out .= $this->renderContent($ind, $oneliner || $minify);
-    foreach ($this->tags as $tag)
-      $out .= $tag->render($indent, $minify);
+    if ($this->content) {
+      $out .= $this->renderContent($ind, $oneliner || $minify);
+    }
+    foreach ($this->tags as $tag) {
+          $out .= $tag->render($indent, $minify);
+    }
     $out .= $this->renderEnTag();
     return $out;
   }

php/hamle/Grammar/Parser.php

Indentation +3 added lines, -3 removed lines

@@ -301,14 +301,14 @@
     private function peg_f1($i) { $return = array();
                                                   array_walk_recursive($i, function($a) use (&$return) { $return[] = $a; });
                                                   return $return;
-                                         }
+                                          }
     private function peg_f2($text) { return new \Seufert\Hamle\TextNode\StringLit(join('',$text)); }
     private function peg_f3($body) { return $body; }
     private function peg_f4($name) {
             return new \Seufert\Hamle\TextNode\ScopeId(null, null, new \Seufert\Hamle\TextNode\ModelParam($name)); }
     private function peg_f5($expr, $chain) { if(!$chain) return $expr;
-                           $top = array_pop($chain);
-                           while($chain) { $top = array_pop($chain)->withChain($top); } return $expr->withChain($top); }
+                            $top = array_pop($chain);
+                            while($chain) { $top = array_pop($chain)->withChain($top); } return $expr->withChain($top); }
     private function peg_f6($sub) { return $sub; }
     private function peg_f7($filter) { return $filter; }
     private function peg_f8($name) { return new \Seufert\Hamle\TextNode\ModelParam($name, null); }

Braces +3 added lines, -1 removed lines

@@ -306,7 +306,9 @@
     private function peg_f3($body) { return $body; }
     private function peg_f4($name) {
             return new \Seufert\Hamle\TextNode\ScopeId(null, null, new \Seufert\Hamle\TextNode\ModelParam($name)); }
-    private function peg_f5($expr, $chain) { if(!$chain) return $expr;
+    private function peg_f5($expr, $chain) { if(!$chain) {
+      return $expr;
+    }
                            $top = array_pop($chain);
                            while($chain) { $top = array_pop($chain)->withChain($top); } return $expr->withChain($top); }
     private function peg_f6($sub) { return $sub; }