cseufert / hamle

php/hamle/Parse.php

Spacing +8 added lines, -8 removed lines

@@ -156,7 +156,7 @@ 
         $i = self::indentLevel($indent);
         unset($m[0]);
         switch (strlen($code) ? $code[0] : ($textcode ? $textcode : "")) {
-          case "|": //Control Tag
+          case "|" : //Control Tag
             if ($code == "|snippet")
               $hTag = new Tag\Snippet($text);
             elseif ($code == "|form")
@@ -196,7 +196,7 @@ 
             break;
           default:
             $attr = array();
-            if(isset($params[0]) && $params[0] == "[") {
+            if (isset($params[0]) && $params[0] == "[") {
               $param = substr($params, 1, -1);
               $param = str_replace(['+', '\\&'], ['%2B', '%26'], $param);
 //              parse_str($param, $attr);
@@ -209,7 +209,7 @@ 
               if ($s[0] == ".") $class[] = substr($s, 1);
               if ($s[0] == "!") $ref = substr($s, 1);
             }
-            if($ref)
+            if ($ref)
               $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
             else
               $hTag = new Tag\Html($tag, $class, $attr, $id);
@@ -222,16 +222,16 @@ 
         else
           $this->root[] = $hTag;
       } else
-        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/".preg_last_error());
       $this->lineNo++;
     }
   }
 
   function parseQueryString($qs) {
     $out = [];
-    foreach(explode('&',$qs) as $s) {
-      $kv = explode('=',$s,2);
-      $out[urldecode($kv[0])] = isset($kv[1])?urldecode($kv[1]):null;
+    foreach (explode('&', $qs) as $s) {
+      $kv = explode('=', $s, 2);
+      $out[urldecode($kv[0])] = isset($kv[1]) ?urldecode($kv[1]) : null;
     }
     return $out;
   }
@@ -249,7 +249,7 @@ 
     $m = array();
     while ($this->lineNo + 1 < $this->lineCount &&
         (!trim($this->lines[$this->lineNo + 1]) ||
-            preg_match('/^(\s){' . $indent . '}((\s)+[^\s].*)$/',
+            preg_match('/^(\s){'.$indent.'}((\s)+[^\s].*)$/',
                 $this->lines[$this->lineNo + 1], $m))) {
       if (trim($this->lines[$this->lineNo + 1]))
         $out[] = $m[2];

php/hamle/Text/Filter.php

Spacing +22 added lines, -22 removed lines

@@ -46,23 +46,23 @@ 
   static $filterResolver = null;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
+    if (preg_match("/^([a-z_]+)(?:\\((?P<vars>.*)\\))?(?:\\|(?P<chained>.+?))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m['vars']) && strlen($m['vars']) ? explode(',', $m['vars']) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace("&comma;",',',$v);
-      if(isset($m['chained']) && strlen($m['chained'])) {
-        $this->chained = new Filter($m['chained'],$what);
+      foreach ($this->vars as $k=>$v)
+        $this->vars[$k] = str_replace("&comma;", ',', $v);
+      if (isset($m['chained']) && strlen($m['chained'])) {
+        $this->chained = new Filter($m['chained'], $what);
       }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(method_exists(Filter::class, $this->filter)) {
+    if (method_exists(Filter::class, $this->filter)) {
       $this->filter = Filter::class.'::'.$this->filter;
-    } elseif(in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
-    } elseif($this->filter === 'json') {
+    } elseif (in_array($this->filter, ['round', 'strtoupper', 'strtolower', 'ucfirst'])) {
+    } elseif ($this->filter === 'json') {
       $this->filter = 'json_encode';
-    } elseif(self::$filterResolver && $filter = (self::$filterResolver)($this->filter)) {
+    } elseif (self::$filterResolver && $filter = (self::$filterResolver)($this->filter)) {
       $this->filter = $filter;
     } else {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
@@ -71,24 +71,24 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHPpre() {
     $pre = '';
-    if($this->chained)
+    if ($this->chained)
       $pre = $this->chained->toPHPpre();
     return "$pre{$this->filter}(";
   }
 
   function toPHPpost() {
     $post = '';
-    if($this->chained)
+    if ($this->chained)
       $post = $this->chained->toPHPpost();
     $o = '';
-    foreach($this->vars as $v)
+    foreach ($this->vars as $v)
       $o .= ','.$this->varToCode($v);
     return "$o)$post";
   }
@@ -103,24 +103,24 @@ 
 
   static function itersplit($v, $sep = ",") {
     $o = [];
-    foreach(explode($sep, $v) as $k=>$i) {
-      if($i)
-        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+    foreach (explode($sep, $v) as $k=>$i) {
+      if ($i)
+        $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k, 'key'=>$k];
     }
     return new WrapArray($o);
   }
 
   static function newlinebr($v) {
-    return str_replace("\n","<br />\n",$v);
+    return str_replace("\n", "<br />\n", $v);
   }
 
   static function replace($v, $src, $dst) {
-    return str_replace($src,$dst,$v);
+    return str_replace($src, $dst, $v);
   }
 
   static function ascents($v) {
-    $v = str_replace(['$',' ',','],'', $v);
-    return (int) round($v * 100,0);
+    $v = str_replace(['$', ' ', ','], '', $v);
+    return (int) round($v * 100, 0);
   }
 
 }