cseufert / hamle

php/hamle/Text/Func.php

Spacing +16 added lines, -16 removed lines

@@ -43,7 +43,7 @@ 
    */
   function __construct($s) {
     $m = array();
-    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]))
       $this->sub = new FuncSub($m[2]);
@@ -86,13 +86,13 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
+      foreach ($m[0] as $k=>$mv)
         if ($m[2][$k]) {
-          $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+          $dir = $m[1][$k] == "-" ? Hamle\Hamle::SORT_DESCENDING : Hamle\Hamle::SORT_ASCENDING;
           $att['sort'][$m[2][$k]] = $dir;
         } else $rand = true;
     }
-    if($rand)
+    if ($rand)
       $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
@@ -110,25 +110,25 @@ 
    * @return string PHP Code
    */
   function toPHP() {
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    if($this->scope instanceof Scope) {
-      return $this->scope->toPHP() . $sub;
-    } elseif($this->scope === true) {
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    if ($this->scope instanceof Scope) {
+      return $this->scope->toPHP().$sub;
+    } elseif ($this->scope === true) {
       return "Hamle\\Scope::get(0)$sub";
     }
-    $limit = Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
+    $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']) . ",$limit)$sub";
+      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']) . ",$limit)$sub";
+        return "Hamle\\Run::modelTypeId(".
+        Text::varToCode($this->filt['id']).",$limit)$sub";
     return "";
   }
 

php/hamle/Text/SimpleVar.php

Spacing +8 added lines, -8 removed lines

@@ -33,25 +33,25 @@
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->var = substr($s,1,$pos-1);
-      $this->filter = new Filter(substr($s, $pos+1), $this);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->var = substr($s, 1, $pos - 1);
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
     } else {
       $this->var = substr($s, 1);
     }
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
 
   function toPHPVar() {
-    return "Hamle\\Scope::get()->hamleGet(" . Text::varToCode($this->var) . ")";
+    return "Hamle\\Scope::get()->hamleGet(".Text::varToCode($this->var).")";
   }
 }
\ No newline at end of file

php/hamle/Text/Comparison.php

Spacing +6 added lines, -6 removed lines

@@ -35,12 +35,12 @@ 
 
   function __construct($s, $mode = self::TOKEN_CONTROL) {
     $m = array();
-    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);
+    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];
     } else
-      $this->param1 = new Text($s,Text::TOKEN_HTML);
+      $this->param1 = new Text($s, Text::TOKEN_HTML);
   }
 
 //  function __construct(String $p1, String $p2, $operator) {
@@ -49,10 +49,10 @@ 
 //    $this->operator = $operator;
 //  }
   function toPHP() {
-    if(!$this->param2) return $this->param1->toPHP();
+    if (!$this->param2) return $this->param1->toPHP();
     $p1 = $this->param1->toPHP();
     $p2 = $this->param2->toPHP();
-    switch($this->operator) {
+    switch ($this->operator) {
       case "equals":
       case "equal":
         return $p1." == ".$p2;

php/hamle/Text/FormField.php

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
   }
 
   function toPHP() {
-    return '$form->getField(' . Text::varToCode($this->var) . ')->getValue()';
+    return '$form->getField('.Text::varToCode($this->var).')->getValue()';
   }
 
   function toHTML($escape = false) {
-    return '<?=' . $this->toPHP() . '?>';
+    return '<?='.$this->toPHP().'?>';
   }
 }
\ No newline at end of file

php/hamle/Text/Complex.php

Spacing +9 added lines, -9 removed lines

@@ -34,12 +34,12 @@ 
   protected $filter;
 
   function __construct($s) {
-    if(FALSE !== $pos = strpos($s,'|')) {
-      $this->filter = new Filter(substr($s, $pos+1), $this);
-      $s = substr($s,0,$pos);
+    if (FALSE !== $pos = strpos($s, '|')) {
+      $this->filter = new Filter(substr($s, $pos + 1), $this);
+      $s = substr($s, 0, $pos);
     }
     $s = explode("->", $s);
-    if(count($s) == 1) $s = explode("-!",$s[0]);
+    if (count($s) == 1) $s = explode("-!", $s[0]);
     if (!$s[0]) throw new ParseError("Unable to parse Complex Expression");
     if ($s[0][1] == "(")
       $this->func = new Text\Func($s[0]);
@@ -52,19 +52,19 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
   function toPHP() {
-    return $this->filter?$this->filter->toPHP():$this->toPHPVar();
+    return $this->filter ? $this->filter->toPHP() : $this->toPHPVar();
   }
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
       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();
   }

php/hamle/Text/FuncSub.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
    */
   function __construct($s) {
     $m = array();
-    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL . '+)(.*)$/', $s, $m))
+    if (!preg_match('/^ +([><]) +('.self::REGEX_FUNCSEL.'+)(.*)$/', $s, $m))
       throw new ParseError("Unable to read \$ sub func in '$s'");
     if ($m[1] == "<") $this->dir = Hamle\Hamle::REL_PARENT;
     elseif ($m[1] == ">") $this->dir = Hamle\Hamle::REL_CHILD;
@@ -56,11 +56,11 @@ 
    * @return string
    */
   function toPHP() {
-    $limit = Hamle\Text::varToCode($this->sortlimit['sort']) . "," .
-        $this->sortlimit['limit'] . "," . $this->sortlimit['offset'] . "," .
+    $limit = Hamle\Text::varToCode($this->sortlimit['sort']).",".
+        $this->sortlimit['limit'].",".$this->sortlimit['offset'].",".
         $this->grouptype['grouptype'];
-    $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
-    return "hamleRel(" . $this->dir . "," .
-    Hamle\Text::varToCode($this->filt['tag']) . ",$limit)$sub";
+    $sub = $this->sub ? "->".$this->sub->toPHP() : "";
+    return "hamleRel(".$this->dir.",".
+    Hamle\Text::varToCode($this->filt['tag']).",$limit)$sub";
   }
 }
\ No newline at end of file

php/hamle/Text/Filter.php

Spacing +13 added lines, -13 removed lines

@@ -38,16 +38,16 @@ 
   protected $what;
 
   function __construct($s, Text $what) {
-    if(preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
+    if (preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m[3]) ? explode(',', $m[3]) : [];
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(!in_array($this->filter, ['itersplit', 'newlinebr', 'round', 'strtoupper', 'strtolower', 'ucfirst'])) {
+    if (!in_array($this->filter, ['itersplit', 'newlinebr', 'round', 'strtoupper', 'strtolower', 'ucfirst'])) {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
-    switch($this->filter) {
+    switch ($this->filter) {
       case "itersplit":
         $this->filter = "Seufert\\Hamle\\Text\\Filter::iterSplit";
         break;
@@ -59,29 +59,29 @@ 
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
-    return "<?=" . $this->toPHP() . "?>";
+    if ($escape)
+      return "<?=htmlspecialchars(".$this->toPHP().")?>";
+    return "<?=".$this->toPHP()."?>";
   }
 
   function toPHP() {
-    $o = [$this->what->toPHPVar()] ;
-    foreach($this->vars as $v)
+    $o = [$this->what->toPHPVar()];
+    foreach ($this->vars as $v)
       $o[] = $this->varToCode($v);
-    return "{$this->filter}(" . implode(',',$o) . ")";
+    return "{$this->filter}(".implode(',', $o).")";
   }
 
   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);
   }
 
 }
\ No newline at end of file

php/hamle/Text/Scope.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 
   function toPHP() {
     if (is_numeric($this->scope))
-      return "Hamle\\Scope::get(" . Text::varToCode($this->scope) . ")";
+      return "Hamle\\Scope::get(".Text::varToCode($this->scope).")";
     else
-      return "Hamle\\Scope::getName(" . Text::varToCode($this->scope) . ")";
+      return "Hamle\\Scope::getName(".Text::varToCode($this->scope).")";
   }
 
   function toHTML($escape = false) {