cseufert / hamle

php/hamle/Filter/Javascript.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
   }
 
   static function filterText($s) {
-    return "/*<![CDATA[*/\n" .
+    return "/*<![CDATA[*/\n".
     /*preg_replace(HamlParser::MATCH_INTERPOLATION, '<?php echo \1; ?>', $text)*/
-    $s . "/*]]>*/";
+    $s."/*]]>*/";
   }
 }
\ No newline at end of file

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/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

Braces +16 added lines, -8 removed lines

@@ -38,17 +38,25 @@
    */
   function __construct($s) {
     $m = array();
-    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;
-    else $this->dir = Hamle\Hamle::REL_ANY;
+    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;
+    } else {
+      $this->dir = Hamle\Hamle::REL_ANY;
+    }
     $this->sortlimit = $this->attSortLimit($m[2]);
     $this->filt = $this->attIdTag($m[2]);
     $this->grouptype = $this->attGroupType($m[2]);
-    if ($this->filt['id']) throw new ParseError("Unable to select by id");
-    if (trim($m[3]))
-      $this->sub = new FuncSub($m[3]);
+    if ($this->filt['id']) {
+      throw new ParseError("Unable to select by id");
+    }
+    if (trim($m[3])) {
+          $this->sub = new FuncSub($m[3]);
+    }
   }
 
   /**

php/hamle/Text/Filter.php

Spacing +18 added lines, -18 removed lines

@@ -38,55 +38,55 @@
   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]) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace(",",',',$v);
+      foreach ($this->vars as $k=>$v)
+        $this->vars[$k] = str_replace(",", ',', $v);
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
-    if(!in_array($this->filter, ['itersplit', 'newlinebr', 'round',
-        'strtoupper', 'strtolower', 'ucfirst','replace', 'json'])) {
+    if (!in_array($this->filter, ['itersplit', 'newlinebr', 'round',
+        'strtoupper', 'strtolower', 'ucfirst', 'replace', 'json'])) {
       throw new ParseError("Unknown Filter Type \"{$this->filter}\"");
     }
-    if(in_array($this->filter,['itersplit','newlinebr', 'replace'])) {
+    if (in_array($this->filter, ['itersplit', 'newlinebr', 'replace'])) {
         $this->filter = "Seufert\\Hamle\\Text\\Filter::{$this->filter}";
     }
     $mapFilter = ['json'=>'json_encode'];
-    if(isset($mapFilter[$this->filter]))
+    if (isset($mapFilter[$this->filter]))
       $this->filter = $mapFilter[$this->filter];
     $this->what = $what;
   }
 
   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);
   }
 
   static function replace($v, $src, $dst) {
-    return str_replace($src,$dst,$v);
+    return str_replace($src, $dst, $v);
   }
 
 }
\ No newline at end of file

Braces +15 added lines, -10 removed lines

@@ -41,8 +41,9 @@ 
     if(preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
       $this->filter = $m[1];
       $this->vars = isset($m[3]) ? explode(',', $m[3]) : [];
-      foreach($this->vars as $k=>$v)
-        $this->vars[$k] = str_replace(",",',',$v);
+      foreach($this->vars as $k=>$v) {
+              $this->vars[$k] = str_replace(",",',',$v);
+      }
     } else {
       throw new ParseError("Unable to parse filter expression \"$s\"");
     }
@@ -54,29 +55,33 @@ 
         $this->filter = "Seufert\\Hamle\\Text\\Filter::{$this->filter}";
     }
     $mapFilter = ['json'=>'json_encode'];
-    if(isset($mapFilter[$this->filter]))
-      $this->filter = $mapFilter[$this->filter];
+    if(isset($mapFilter[$this->filter])) {
+          $this->filter = $mapFilter[$this->filter];
+    }
     $this->what = $what;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
 
   function toPHP() {
     $o = [$this->what->toPHPVar()] ;
-    foreach($this->vars as $v)
-      $o[] = $this->varToCode($v);
+    foreach($this->vars as $v) {
+          $o[] = $this->varToCode($v);
+    }
     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];
+      if($i) {
+              $o[] = ['v'=>trim($i), 'value'=>trim($i), 'k'=>$k,'key'=>$k];
+      }
     }
     return new WrapArray($o);
   }

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
   /** @var SimpleVar */
   protected $what;
 
+  /**
+   * @param string $s
+   */
   function __construct($s, Text $what) {
     if(preg_match("/^([a-z]+)(\\((.*)\\))?$/", $s, $m)) {
       $this->filter = $m[1];

php/hamle/Field/Button.php

Spacing +1 added lines, -1 removed lines

@@ -42,6 +42,6 @@
   }
 
   function isClicked() {
-    return isset($_REQUEST[$this->form . "_" . $this->name]);
+    return isset($_REQUEST[$this->form."_".$this->name]);
   }
 }
\ No newline at end of file