cseufert / hamle

php/hamle/Tag/Snippet.php

Braces +29 added lines, -18 removed lines

@@ -32,25 +32,33 @@ 
 
   function __construct($params) {
     parent::__construct();
-    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m))
-      throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
+    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m)) {
+          throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
+    }
     $this->type = $m[1];
-    if (isset($m[2]))
-      $this->path = explode(" ", $m[2]);
-    else
-      $this->path = array();
-    foreach ($this->path as $k => $v)
-      $this->path[$k] = self::decodeClassId($v);
+    if (isset($m[2])) {
+          $this->path = explode(" ", $m[2]);
+    } else {
+          $this->path = array();
+    }
+    foreach ($this->path as $k => $v) {
+          $this->path[$k] = self::decodeClassId($v);
+    }
   }
 
   static function decodeClassId($s) {
     $out = $m = array();
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
-      $out['type'] = $m[0];
+    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m)) {
+          $out['type'] = $m[0];
+    }
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
-    if (isset($m[0])) foreach ($m[0] as $s) {
+    if (isset($m[0])) {
+      foreach ($m[0] as $s) {
       if ($s[0] == "#") $out['id'] = substr($s, 1);
-      if ($s[0] == ".") $out['class'][] = substr($s, 1);
+    }
+      if ($s[0] == ".") {
+        $out['class'][] = substr($s, 1);
+      }
     }
     return $out;
   }
@@ -62,21 +70,24 @@ 
   function addSnipContent($contentTag, &$tagArray = array(), $key = 0) {
     if ($this->type == "content") {
       $tagArray[$key] = $contentTag;
-    } else
-      parent::addSnipContent($contentTag, $tagArray, $key);
+    } else {
+          parent::addSnipContent($contentTag, $tagArray, $key);
+    }
   }
 
   function apply(Hamle\Tag $rootTag) {
     if ($this->type == "append" or $this->type == "prepend") {
       $matchTags = $rootTag->find($this->path);
-      foreach ($matchTags as $tag)
-        foreach ($this->tags as $t) {
+      foreach ($matchTags as $tag) {
+              foreach ($this->tags as $t) {
           $tag->addChild($t, $this->type);
+      }
         }
     } elseif ($this->type == "replace") {
       $rootTag->replace($this->path, $this);
-    } else
-      throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
+    } else {
+          throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
+    }
   }
 
 }
\ No newline at end of file

php/hamle/Tag/Filter.php

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
     parent::__construct();
     $this->type = ucfirst(strtolower($tag));
     $this->filter = "\\Seufert\\Hamle\\Filter\\{$this->type}";
-    if (!class_exists($this->filter))
-      Throw new ParseError("Unable to fild filter $tag");
+    if (!class_exists($this->filter)) {
+          Throw new ParseError("Unable to fild filter $tag");
+    }
   }
 
   function renderContent($pad = "", $oneliner = false) {

php/hamle/Tag/Html.php

Braces +23 added lines, -13 removed lines

@@ -42,17 +42,21 @@ 
   function __construct($tag, $class = array(), $attr = array(), $id = "") {
     parent::__construct();
     $this->opt = $attr;
-    if(isset($attr['class']) && !is_array($attr['class']))
-      $this->opt['class'] = $attr['class']?explode(" ",$attr['class']):array();
+    if(isset($attr['class']) && !is_array($attr['class'])) {
+          $this->opt['class'] = $attr['class']?explode(" ",$attr['class']):array();
+    }
     $this->source = array();
     $this->type = $tag ? $tag : "div";
     if($class) {
-      if (isset($this->opt['class']))
-        $this->opt['class'] = array_merge($this->opt['class'], $class);
-      else
-        $this->opt['class'] = $class;
+      if (isset($this->opt['class'])) {
+              $this->opt['class'] = array_merge($this->opt['class'], $class);
+      } else {
+              $this->opt['class'] = $class;
+      }
+    }
+    if($id) {
+      $this->opt['id'] = $id;
     }
-    if($id) $this->opt['id'] = $id;
   }
 
   function renderStTag() {
@@ -61,8 +65,9 @@ 
   }
 
   function renderEnTag() {
-    if (in_array($this->type, self::$selfCloseTags))
-      return "";
+    if (in_array($this->type, self::$selfCloseTags)) {
+          return "";
+    }
     return "</{$this->type}>";
   }
 
@@ -74,10 +79,15 @@ 
   function optToTags() {
     $out = array();
     foreach ($this->opt as $k => $v) {
-      if ($k == "class" && !$v) continue;
-      if (is_array($v)) $v = implode(" ", $v);
-      if (!$v instanceof H\Text)
-        $v = new H\Text($v);
+      if ($k == "class" && !$v) {
+        continue;
+      }
+      if (is_array($v)) {
+        $v = implode(" ", $v);
+      }
+      if (!$v instanceof H\Text) {
+              $v = new H\Text($v);
+      }
       $k = new H\Text($k);
       $out[] = " " . $k->toHTML() . "=\"" . $v->toHTMLAtt() . "\"";
     }

php/hamle/Form.php

Braces +17 added lines, -12 removed lines

@@ -64,15 +64,18 @@ 
   

   function process() {

     $clicked = "";

-    foreach($this->_fields as $f)

-      if($f instanceOf Field\Button)

+    foreach($this->_fields as $f) {
+          if($f instanceOf Field\Button)

         if($f->isClicked())

-          $clicked = $f;

-    foreach($this->_fields as $f)

-      $f->doProcess($clicked?true:false);

-    if($clicked)

-      try {

-        $this->onSubmit($clicked);

+          $clicked = $f;
+    }
+    foreach($this->_fields as $f) {
+          $f->doProcess($clicked?true:false);
+    }
+    if($clicked) {
+          try {

+        $this->onSubmit($clicked);
+    }
       } catch(Exception\FormInvalid $e) {

         $this->hint = $e->getMessage();

       }

@@ -80,8 +83,9 @@ 
   

   function isValid() {

     $valid = true;

-    foreach($this->_fields as $f)

-      $valid = $f->valid && $valid;

+    foreach($this->_fields as $f) {
+          $valid = $f->valid && $valid;
+    }
     return $valid;

   }

   /**

@@ -95,8 +99,9 @@ 
     return $this->_fields;

   }

   function getField($n) {

-    if(!isset($this->_fields[$n]))

-      throw new Exception\NoKey("unable to find form field ($n)");

+    if(!isset($this->_fields[$n])) {
+          throw new Exception\NoKey("unable to find form field ($n)");
+    }
     return $this->_fields[$n];

   }

   function __get($n) {

php/hamle/Text/Func.php

Braces +41 added lines, -25 removed lines

@@ -38,10 +38,12 @@ 
 
   function __construct($s) {
     $m = array();
-    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]);
+    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]);
+    }
     if (!trim($m[1])) {
       $this->scope = true;
       return;
@@ -58,17 +60,24 @@ 
     $m = array();
     $att = array('id' => array(), 'tag' => array());
     foreach (explode(",", $s) as $str) {
-      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) $type = $m[0];
-      else $type = "*";
-      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) $att['id'][$type][] = $m[1];
-      elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m))
-        foreach ($m[1] as $tag)
+      if (preg_match('/^[a-zA-Z0-9\\_]+/', $str, $m)) {
+        $type = $m[0];
+      } else {
+        $type = "*";
+      }
+      if (preg_match('/#([a-zA-Z0-9\_\\${}]+)/', $str, $m)) {
+        $att['id'][$type][] = $m[1];
+      } elseif (preg_match_all('/\\.([a-zA-Z0-9\_\-\\${}]+)/', $str, $m)) {
+              foreach ($m[1] as $tag)
           $att['tag'][$type][] = new Text($tag, Text::TOKEN_CODE);
-      else $att['tag'][$type] = array();
+      } else {
+        $att['tag'][$type] = array();
+      }
     }
     //var_dump($att);
-    if (!(count($att['id']) xor count($att['tag'])))
-      throw new ParseError("Only tag, type or id can be combined");
+    if (!(count($att['id']) xor count($att['tag']))) {
+          throw new ParseError("Only tag, type or id can be combined");
+    }
     return $att;
   }
 
@@ -81,14 +90,18 @@ 
     }
     $rand = false;
     if (preg_match_all('/\\^(-?)([a-zA-Z0-9\_]*)/', $s, $m)) {
-      foreach($m[0] as $k=>$mv)
-        if ($m[2][$k]) {
+      foreach($m[0] as $k=>$mv) {
+              if ($m[2][$k]) {
           $dir = $m[1][$k] == "-"?Hamle\Hamle::SORT_DESCENDING:Hamle\Hamle::SORT_ASCENDING;
+      }
           $att['sort'][$m[2][$k]] = $dir;
-        } else $rand = true;
+        } else {
+          $rand = true;
+        }
+    }
+    if($rand) {
+          $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     }
-    if($rand)
-      $att['sort'] = [""=>$att['dir'] = Hamle\Hamle::SORT_RANDOM];
     return $att;
   }
 
@@ -106,21 +119,24 @@ 
         $this->sortlimit['limit'] . "," . $this->sortlimit['offset'];
     $sub = $this->sub ? "->" . $this->sub->toPHP() : "";
     if ($this->scope) {
-      if($this->scope === true)
-        return "Hamle\\Scope::get(0)$sub";
+      if($this->scope === true) {
+              return "Hamle\\Scope::get(0)$sub";
+      }
       return $this->scope->toPHP().$sub;
     }
-    if (count($this->filt['tag']))
-      return "Hamle\\Run::modelTypeTags(" .
+    if (count($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)
+    }
+    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']['*'])) .
         ",$limit)$sub";
-      else
-        return "Hamle\\Run::modelTypeId(" .
+    } else {
+              return "Hamle\\Run::modelTypeId(" .
         Text::varToCode($this->filt['id']) . ",$limit)$sub";
+      }
     return "";
   }
 

php/hamle/Text/FuncSub.php

Braces +16 added lines, -8 removed lines

@@ -33,17 +33,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]);
+    }
   }
 
   function toPHP() {

php/hamle/Text/Complex.php

Braces +19 added lines, -13 removed lines

@@ -39,20 +39,24 @@ 
       $s = substr($s,0,$pos);
     }
     $s = explode("->", $s);
-    if (!$s[0]) throw new ParseError("Unable to parse Complex Expression");
-    if ($s[0][1] == "(")
-      $this->func = new Text\Func($s[0]);
-    elseif ($s[0][1] == "[")
-      $this->func = new Text\Scope($s[0]);
-    else
-      $this->func = new SimpleVar($s[0]);
+    if (!$s[0]) {
+      throw new ParseError("Unable to parse Complex Expression");
+    }
+    if ($s[0][1] == "(") {
+          $this->func = new Text\Func($s[0]);
+    } elseif ($s[0][1] == "[") {
+          $this->func = new Text\Scope($s[0]);
+    } else {
+          $this->func = new SimpleVar($s[0]);
+    }
     array_shift($s);
     $this->sel = $s;
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }
   function toPHP() {
@@ -61,11 +65,13 @@ 
   function toPHPVar() {
     if ($this->sel) {
       $sel = array();
-      foreach ($this->sel as $s)
-        $sel[] = "hamleGet('$s')";
+      foreach ($this->sel as $s) {
+              $sel[] = "hamleGet('$s')";
+      }
       return $this->func->toPHP() . "->" . implode('->', $sel);
-    } else
-      return $this->func->toPHP();
+    } else {
+          return $this->func->toPHP();
+    }
   }
 
 }
\ No newline at end of file

php/hamle/Text/Scope.php

Braces +8 added lines, -6 removed lines

@@ -34,16 +34,18 @@
   function __construct($s) {
     $m = array();
     //var_dump($s);
-    if (!preg_match('/\$\[(-?[0-9]+|[a-zA-Z][a-zA-Z0-9]+)\]/', $s, $m))
-      throw new ParseError("Unable to match scope ($s)");
+    if (!preg_match('/\$\[(-?[0-9]+|[a-zA-Z][a-zA-Z0-9]+)\]/', $s, $m)) {
+          throw new ParseError("Unable to match scope ($s)");
+    }
     $this->scope = $m[1];
   }
 
   function toPHP() {
-    if (is_numeric($this->scope))
-      return "Hamle\\Scope::get(" . Text::varToCode($this->scope) . ")";
-    else
-      return "Hamle\\Scope::getName(" . Text::varToCode($this->scope) . ")";
+    if (is_numeric($this->scope)) {
+          return "Hamle\\Scope::get(" . Text::varToCode($this->scope) . ")";
+    } else {
+          return "Hamle\\Scope::getName(" . Text::varToCode($this->scope) . ")";
+    }
   }
 
   function toHTML($escape = false) {

php/hamle/Text/SimpleVar.php

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
   }
 
   function toHTML($escape = false) {
-    if($escape)
-      return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    if($escape) {
+          return "<?=htmlspecialchars(" .$this->toPHP() . ")?>";
+    }
     return "<?=" . $this->toPHP() . "?>";
   }