cseufert / hamle

php/hamle/Field.php

Doc Comments +6 added lines

@@ -110,6 +110,9 @@ 
     }

   }

 

+  /**
+   * @return string
+   */
   function getValue() {

     if (!is_null($this->setValue)) return $this->setValue;

     if (isset($_REQUEST[$this->form . "_" . $this->name])) {

@@ -173,6 +176,9 @@ 
     }

   }

 

+  /**
+   * @param boolean $submit
+   */
   function doProcess($submit) {

     if ($submit) {

       $value = $this->getValue();

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
   function getInputAttStatic(&$atts, &$type, &$content) {

     $atts['id'] = $atts['name'] = $this->form . "_" . $this->name;

     $atts['type'] = "text";

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

   }

 

   function getInputAttDynamic(&$atts, &$type, &$content) {

@@ -142,7 +142,7 @@ 
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts["for"] = $this->form . "_" . $this->name;

     $content = array($this->opt['label']);

   }

@@ -151,7 +151,7 @@ 
   }

 

   function getHintAttStatic(&$atts, &$type, &$content) {

-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));

+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));

     $atts['class'][] = "hamleFormHint";

   }

 

Braces +26 added lines, -16 removed lines

@@ -66,7 +66,9 @@ 
   }

 

   function __call($name, $valarray) {

-    if (count($valarray) < 1) return $this->__get($name);

+    if (count($valarray) < 1) {
+      return $this->__get($name);
+    }
     $val = count($valarray) == 1 ? current($valarray) : $valarray;

     switch ($name) {

       case "name":

@@ -111,12 +113,15 @@ 
   }

 

   function getValue() {

-    if (!is_null($this->setValue)) return $this->setValue;

+    if (!is_null($this->setValue)) {
+      return $this->setValue;
+    }
     if (isset($_REQUEST[$this->form . "_" . $this->name])) {

-      if (get_magic_quotes_runtime())

-        return stripslashes($_REQUEST[$this->form . "_" . $this->name]);

-      else

-        return $_REQUEST[$this->form . "_" . $this->name];

+      if (get_magic_quotes_runtime()) {
+              return stripslashes($_REQUEST[$this->form . "_" . $this->name]);
+      } else {
+              return $_REQUEST[$this->form . "_" . $this->name];
+      }
     }

     return $this->opt['default'];

   }

@@ -133,12 +138,15 @@ 
     if (!$this->valid) {

       $atts['class'][] = "hamleFormError";

     }

-    if ($this->opt["disabled"])

-      $atts['disabled'] = "disabled";

-    if ($this->opt['required'])

-      $atts['required'] = "required";

-    if ($this->opt['help'])

-      $atts['title'] = $this->opt['help'];

+    if ($this->opt["disabled"]) {
+          $atts['disabled'] = "disabled";
+    }
+    if ($this->opt['required']) {
+          $atts['required'] = "required";
+    }
+    if ($this->opt['help']) {
+          $atts['title'] = $this->opt['help'];
+    }
   }

 

   function getLabelAttStatic(&$atts, &$type, &$content) {

@@ -176,10 +184,12 @@ 
   function doProcess($submit) {

     if ($submit) {

       $value = $this->getValue();

-      if ($this->opt['required'])

-        $this->valid = $this->valid && strlen($value);

-      if ($this->opt['regex'])

-        $this->valid = $this->valid && preg_match($this->opt['regex'], $value);

+      if ($this->opt['required']) {
+              $this->valid = $this->valid && strlen($value);
+      }
+      if ($this->opt['regex']) {
+              $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
+      }
     }

   }

 

php/hamle/Parse.php

Doc Comments +9 added lines

@@ -92,6 +92,9 @@ 
     }

   }

 

+  /**
+   * @param string $s
+   */
   function parseSnip($s) {

     //save root tags

     $roots = $this->root;

@@ -229,6 +232,9 @@ 
 

   }

 

+  /**
+   * @param integer $indent
+   */
   function consumeBlock($indent) {

     $out = array();

     $m = array();

@@ -243,6 +249,9 @@ 
     return $out;

   }

 

+  /**
+   * @param integer $indent
+   */
   function indentLevel($indent) {

     if (!isset($this->indents)) $this->indents = array();

     if (!count($this->indents)) {

Unused Use Statements +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 

  */

 namespace Seufert\Hamle;

-use Seufert\Hamle\Exception\ParseError;

-use Seufert\Hamle\Parse\Filter;

+use Seufert\Hamle\Exception\ParseError;
+use Seufert\Hamle\Parse\Filter;
 use Seufert\Hamle\Text;

 

 /**

Spacing +4 added lines, -4 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")

@@ -191,9 +191,9 @@ 
             break;

           default:

             $attr = array();

-            if(isset($params[0]) && $params[0] == "[") {

+            if (isset($params[0]) && $params[0] == "[") {

               $param = substr($params, 1, strlen($params) - 2);

-              $param = str_replace('+','%2B', $param);

+              $param = str_replace('+', '%2B', $param);

               parse_str($param, $attr);

             }

             $class = array(); $id = ""; $ref = "";

@@ -203,7 +203,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);

Braces +61 added lines, -41 removed lines

@@ -108,22 +108,25 @@ 
     $revSnip = array();

     /** @var Tag $roots */

     $roots = array();

-    foreach ($this->root as $snip)

-      if ($snip instanceOf Tag\Snippet) {

+    foreach ($this->root as $snip) {
+          if ($snip instanceOf Tag\Snippet) {

         if ($snip->getType() == "append") {

-          array_unshift($revSnip, $snip);

+          array_unshift($revSnip, $snip);
+    }
         } else {

           $fwdSnip[] = $snip;

         }

       } else {

         $roots[] = $snip;

       }

-    foreach ($fwdSnip as $snip)

-      foreach ($roots as $root)

-        $snip->apply($root);

-    foreach ($revSnip as $snip)

-      foreach ($roots as $root)

-        $snip->apply($root);

+    foreach ($fwdSnip as $snip) {
+          foreach ($roots as $root)

+        $snip->apply($root);
+    }
+    foreach ($revSnip as $snip) {
+          foreach ($roots as $root)

+        $snip->apply($root);
+    }
     $this->root = $roots;

   }

 

@@ -143,9 +146,11 @@ 
     $heir = array();

     while ($this->lineNo < $this->lineCount) {

       $line = $this->lines[$this->lineNo];

-      if (trim($line)) if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {

+      if (trim($line)) {
+        if (preg_match(self::REGEX_PARSE_LINE, $line, $m)) {

         if (FALSE !== strpos($m[1], "\t"))

-          throw new ParseError("Tabs are not supported in templates at this time");

+          throw new ParseError("Tabs are not supported in templates at this time");
+      }
         $indent = strlen($m[1]);

         $tag = isset($m[2]) ? $tag = $m[2] : "";

         $classid = isset($m[3]) ? $m[3] : "";

@@ -157,13 +162,13 @@ 
         unset($m[0]);

         switch (strlen($code) ? $code[0] : ($textcode ? $textcode : "")) {

           case "|": //Control Tag

-            if ($code == "|snippet")

-              $hTag = new Tag\Snippet($text);

-            elseif ($code == "|form")

-              $hTag = new Tag\Form($text);

-            elseif ($code == "|formhint")

-              $hTag = new Tag\FormHint($text);

-            elseif ($code == "|else") {

+            if ($code == "|snippet") {
+                          $hTag = new Tag\Snippet($text);
+            } elseif ($code == "|form") {
+                          $hTag = new Tag\Form($text);
+            } elseif ($code == "|formhint") {
+                          $hTag = new Tag\FormHint($text);
+            } elseif ($code == "|else") {

               $hTag = new Tag\Control(substr($code, 1), $heir[$i - 1]);

               $hTag->setVar($text);

             } else {

@@ -174,8 +179,9 @@ 
           case ":": //Filter Tag

             $hTag = new Tag\Filter(substr($code, 1));

             $hTag->addContent($text, Text::TOKEN_CODE);

-            foreach ($this->consumeBlock($indent) as $l)

-              $hTag->addContent($l, Text::TOKEN_CODE);

+            foreach ($this->consumeBlock($indent) as $l) {
+                          $hTag->addContent($l, Text::TOKEN_CODE);
+            }
             break;

           case "_": //String Tag

           case "__": //Unescape String Tag

@@ -186,8 +192,9 @@ 
           case "//": // Non Printed Comment

             $hTag = new Tag\Comment($textcode);

             $hTag->addContent($text);

-            foreach ($this->consumeBlock($indent) as $l)

-              $hTag->addContent($l, Text::TOKEN_CODE);

+            foreach ($this->consumeBlock($indent) as $l) {
+                          $hTag->addContent($l, Text::TOKEN_CODE);
+            }
             break;

           default:

             $attr = array();

@@ -198,33 +205,43 @@ 
             }

             $class = array(); $id = ""; $ref = "";

             preg_match_all('/[#\.!][a-zA-Z0-9\-\_]+/m', $classid, $cid);

-            if (isset($cid[0])) foreach ($cid[0] as $s) {

-              if ($s[0] == "#") $id = substr($s, 1);

-              if ($s[0] == ".") $class[] = substr($s, 1);

-              if ($s[0] == "!") $ref = substr($s, 1);

+            if (isset($cid[0])) {
+              foreach ($cid[0] as $s) {

+              if ($s[0] == "#") $id = substr($s, 1);
+            }
+              if ($s[0] == ".") {
+                $class[] = substr($s, 1);
+              }
+              if ($s[0] == "!") {
+                $ref = substr($s, 1);
+              }
             }

-            if($ref)

-              $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);

-            else

-              $hTag = new Tag\Html($tag, $class, $attr, $id);

+            if($ref) {
+                          $hTag = new Tag\DynHtml($tag, $class, $attr, $id, $ref);
+            } else {
+                          $hTag = new Tag\Html($tag, $class, $attr, $id);
+            }
             $hTag->addContent($text);

             break;

         }

         $heir[$i] = $hTag;

-        if ($i > 0)

-          $heir[$i - 1]->addChild($hTag);

-        else

-          $this->root[] = $hTag;

-      } else

-        throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());

+        if ($i > 0) {
+                  $heir[$i - 1]->addChild($hTag);
+        } else {
+                  $this->root[] = $hTag;
+        }
+      } else {
+              throw new ParseError("Unable to parse line {$this->lineNo}\n\"$line\"/" . preg_last_error());
+      }
       $this->lineNo++;

     }

   }

 

   function output() {

     $out = "<?php\nuse Seufert\\Hamle;\n?>";

-    foreach ($this->root as $tag)

-      $out .= $tag->render();

+    foreach ($this->root as $tag) {
+          $out .= $tag->render();
+    }
     return $out;

 

   }

@@ -236,15 +253,18 @@ 
         (!trim($this->lines[$this->lineNo + 1]) ||

             preg_match('/^(\s){' . $indent . '}((\s)+[^\s].*)$/',

                 $this->lines[$this->lineNo + 1], $m))) {

-      if (trim($this->lines[$this->lineNo + 1]))

-        $out[] = $m[2];

+      if (trim($this->lines[$this->lineNo + 1])) {
+              $out[] = $m[2];
+      }
       $this->lineNo++;

     }

     return $out;

   }

 

   function indentLevel($indent) {

-    if (!isset($this->indents)) $this->indents = array();

+    if (!isset($this->indents)) {
+      $this->indents = array();
+    }
     if (!count($this->indents)) {

       $this->indents = array(0 => $indent);

       // Key = indent level, Value = Depth in spaces

php/hamle/Run.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
  */

 namespace Seufert\Hamle;

 

-use Seufert\Hamle\Exception\RunTime;

+use Seufert\Hamle\Exception\RunTime;
 use Seufert\Hamle\Model;

 

 /**

Braces +8 added lines, -5 removed lines

@@ -54,10 +54,11 @@ 
    */

   static function popInstance() {

     array_pop(self::$hamleList);

-    if (self::$hamleList)

-      self::$hamle = self::$hamleList[count(self::$hamleList) - 1];

-    else

-      self::$hamle = NULL;

+    if (self::$hamleList) {
+          self::$hamle = self::$hamleList[count(self::$hamleList) - 1];
+    } else {
+          self::$hamle = NULL;
+    }
   }

 

   /**

@@ -116,7 +117,9 @@ 
   static function modelId($id, $sortDir = 0, $sortField = "", $limit = 0, $offset = 0) {

     $o = self::$hamle->setup->getModelDefault($id,

         $sortDir, $sortField, $limit, $offset);

-    if (!$o instanceOf Model) throw new RunTime("Application must return instance of hamleModel");

+    if (!$o instanceOf Model) {
+      throw new RunTime("Application must return instance of hamleModel");
+    }
     return $o;

   }

 

php/hamle/Scope.php

Doc Comments +3 added lines

@@ -17,6 +17,9 @@
   /** @var Model[] Assoc array of Models by Scope Name */

   static $namedScopes = array();

 

+  /**
+   * @param Model $model
+   */
   static function add($model, $name = null) {

     if (!$model instanceOf Model)

       throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php

 namespace Seufert\Hamle;

 

-use Seufert\Hamle\Exception\OutOfScope;

-use Seufert\Hamle\Exception\Unsupported;

-use Seufert\Hamle\Exception\RunTime;

+use Seufert\Hamle\Exception\OutOfScope;
+use Seufert\Hamle\Exception\Unsupported;
+use Seufert\Hamle\Exception\RunTime;
 use Seufert\Hamle\Model;

 

 /**

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 

   static function add($model, $name = null) {

     if (!$model instanceOf Model)

-      throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");

+      throw new Unsupported("Unsupported Model (" . get_class($model) . "), Needs to implement hamleModel Interface");

     if ($name)

       self::$namedScopes[$name] = $model;

     else

Braces +23 added lines, -14 removed lines

@@ -18,12 +18,14 @@ 
   static $namedScopes = array();

 

   static function add($model, $name = null) {

-    if (!$model instanceOf Model)

-      throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");

-    if ($name)

-      self::$namedScopes[$name] = $model;

-    else

-      self::$scopes[] = $model;

+    if (!$model instanceOf Model) {
+          throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");
+    }
+    if ($name) {
+          self::$namedScopes[$name] = $model;
+    } else {
+          self::$scopes[] = $model;
+    }
   }

 

   static function done() {

@@ -41,15 +43,21 @@ 
    */

   static function get($id = 0) {

     if (0 == $id) {

-      if ($scope = end(self::$scopes))

-        return $scope;

+      if ($scope = end(self::$scopes)) {
+              return $scope;
+      }
       throw new OutOfScope("Unable to find Scope ($id)");

     }

     $key = $id - 1;

-    if ($id < 0) $key = count(self::$scopes) + $id - 1;

-    if ($id == 0) $key = count(self::$scopes) - 1;

-    if (!isset(self::$scopes[$key]))

-      throw new OutOfScope("Unable to find Scope ($id) or $key");

+    if ($id < 0) {
+      $key = count(self::$scopes) + $id - 1;
+    }
+    if ($id == 0) {
+      $key = count(self::$scopes) - 1;
+    }
+    if (!isset(self::$scopes[$key])) {
+          throw new OutOfScope("Unable to find Scope ($id) or $key");
+    }
     return self::$scopes[$key];

   }

 

@@ -64,8 +72,9 @@ 
     if ($name && isset(self::$namedScopes[$name])) {

       self::$namedScopes[$name]->rewind();

       return self::$namedScopes[$name];

-    } else

-      throw new RunTime("Unable to find scope ($name)");

+    } else {
+          throw new RunTime("Unable to find scope ($name)");
+    }
   }

 

 }

php/hamle/Setup.php

Doc Comments +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
   /**

    * Open the default model when only an ID is specified in the template

    *

-   * @param mixed $id Identifier when no type is passed

-   * @param array $sort

+   * @param string $id Identifier when no type is passed

+   * @param integer $sort

    * @param int $limit Results Limit

    * @param int $offset Results Offset

    * @return Model Instance of model class that implements hamleModel

@@ -60,7 +60,7 @@ 
    * Open a specific model type with id

    *

    * @param array[] $typeId Type ID array [type=>[id]] or [page=>[3]]

-   * @param array $sort

+   * @param integer $sort

    * @param int $limit Results Limit

    * @param int $offset Results Offset

    * @return Model

@@ -76,7 +76,7 @@ 
    * Return Iterator containing results from search of tags

    *

    * @param array[] $typeTags Type Tag Array [type=>[tag1,tag2],type2=>[]]

-   * @param array $sort

+   * @param integer $sort

    * @param int $limit Results Limit

    * @param int $offset Results Limit

    * @return Model Instance of Iterable model class

Spacing +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
    */

   public function cachePath($f) {

     $s = DIRECTORY_SEPARATOR;

-    $dir = implode($s,[__DIR__,"..","..","cache",""]);

-    if(!is_dir($dir)) mkdir($dir);

-    return $dir.$f;

+    $dir = implode($s, [__DIR__, "..", "..", "cache", ""]);

+    if (!is_dir($dir)) mkdir($dir);

+    return $dir . $f;

   }

 

   /**

@@ -67,7 +67,7 @@ 
    * @throws Exception\RunTime

    */

   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {

-    if(count($typeId) > 1)

+    if (count($typeId) > 1)

       throw new Exception\RunTime("Unable to open more than one ID at a time");

     return new Model\Zero();

   }

Braces +6 added lines, -3 removed lines

@@ -41,7 +41,9 @@ 
   public function cachePath($f) {

     $s = DIRECTORY_SEPARATOR;

     $dir = implode($s,[__DIR__,"..","..","cache",""]);

-    if(!is_dir($dir)) mkdir($dir);

+    if(!is_dir($dir)) {
+      mkdir($dir);
+    }
     return $dir.$f;

   }

 

@@ -67,8 +69,9 @@ 
    * @throws Exception\RunTime

    */

   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {

-    if(count($typeId) > 1)

-      throw new Exception\RunTime("Unable to open more than one ID at a time");

+    if(count($typeId) > 1) {
+          throw new Exception\RunTime("Unable to open more than one ID at a time");
+    }
     return new Model\Zero();

   }

 

php/hamle/Tag/Comment.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 class Comment extends Tag {
   protected $commentstyle;
 
+  /**
+   * @param string $type
+   */
   function __construct($type) {
     if ($type == "/")
       $this->commentstyle = "HTML";

Braces +8 added lines, -6 removed lines

@@ -31,8 +31,9 @@ 
   protected $commentstyle;
 
   function __construct($type) {
-    if ($type == "/")
-      $this->commentstyle = "HTML";
+    if ($type == "/") {
+          $this->commentstyle = "HTML";
+    }
   }
 
   function renderStTag() {
@@ -40,11 +41,12 @@ 
   }
 
   function renderContent($pad = "", $oneliner = false) {
-    if ($this->commentstyle == "HTML")
-      if (count($this->content) > 1)
+    if ($this->commentstyle == "HTML") {
+          if (count($this->content) > 1)
         return $pad . "  " . implode("\n$pad", $this->content) . "\n";
-      else
-        return current($this->content);
+    } else {
+              return current($this->content);
+      }
     return "";
   }
 

php/hamle/Tag/DynHtml.php

Doc Comments +4 added lines

@@ -33,6 +33,10 @@
   protected $varname;
   protected $baseType;
 
+  /**
+   * @param string $tag
+   * @param string $id
+   */
   function __construct($tag, $class, $param, $id, $ref) {
     parent::__construct($tag, $class, $param, $id);
     $this->source[] = $ref;

Braces +6 added lines, -3 removed lines

@@ -60,11 +60,14 @@
     $out = "<" . $d['type'] . " ";
     foreach ($d['opt'] as $k => $v) {
       if (is_array($v)) {
-        foreach ($v as $k2 => $v2)
-          if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
+        foreach ($v as $k2 => $v2) {
+                  if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
+        }
         $v = implode(" ", $v);
       }
-      if ($v instanceOf H\Text) $v = eval('return ' . $v->toPHP() . ';');
+      if ($v instanceOf H\Text) {
+        $v = eval('return ' . $v->toPHP() . ';');
+      }
       $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
     }
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";

php/hamle/Tag/Filter.php

Doc Comments +3 added lines

@@ -38,6 +38,9 @@
    */
   protected $filter;
 
+  /**
+   * @param string $tag
+   */
   function __construct($tag) {
     parent::__construct();
     $this->type = ucfirst(strtolower($tag));

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/Form.php

Doc Comments +3 added lines

@@ -38,6 +38,9 @@
    */
   protected $form;
 
+  /**
+   * @param string $param
+   */
   function __construct($param) {
     parent::__construct();
     $param = explode(' ', $param);

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
     foreach ($labelTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source]))
+          if (isset($fields[$source]))
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
           else
             $tag->opt['style'] = "display:none;";
@@ -70,7 +70,7 @@ 
     foreach ($inputTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source]))
+          if (isset($fields[$source]))
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
           else
             $tag->opt['style'] = "display:none;";
@@ -79,7 +79,7 @@ 
     foreach ($inputTags as $tag)
       if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
-          if(isset($fields[$source])) {
+          if (isset($fields[$source])) {
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
             unset($fields[$source]);
           } else
@@ -87,10 +87,10 @@ 
         }
     foreach ($fields as $n => $f) {
       if (!$f instanceOf Button) {
-        $this->addChild($label = new DynHtml("label", [],[],"",$n));
+        $this->addChild($label = new DynHtml("label", [], [], "", $n));
         $f->getLabelAttStatic($label->opt, $label->type, $label->content);
       }
-      $this->addChild($input = new DynHtml("input", [],[],"",$n));
+      $this->addChild($input = new DynHtml("input", [], [], "", $n));
       $f->getInputAttStatic($input->opt, $input->type, $input->content);
     }
     return "<form " . implode(" ", $out) . "><?php \$form = " . $this->var->toPHP() . "; \$form->process(); ?>";

Braces +26 added lines, -17 removed lines

@@ -41,12 +41,15 @@ 
   function __construct($param) {
     parent::__construct();
     $param = explode(' ', $param);
-    if (count($param) < 2) throw new ParseError("|form requires 2 arguments, form type, and instance");
+    if (count($param) < 2) {
+      throw new ParseError("|form requires 2 arguments, form type, and instance");
+    }
     $this->var = new H\Text($param[1]);
-    if (preg_match('/^(.*)\((.*)\)/', $param[0], $m))
-      $this->form = new $m[1]($m[2]);
-    else
-      $this->form = new $param[0];
+    if (preg_match('/^(.*)\((.*)\)/', $param[0], $m)) {
+          $this->form = new $m[1]($m[2]);
+    } else {
+          $this->form = new $param[0];
+    }
   }
 
   function renderStTag() {
@@ -58,32 +61,38 @@ 
     }
     $fields = $this->form->getFields();
     $labelTags = $this->find(array(array("type" => "label")));
-    foreach ($labelTags as $tag)
-      if ($tag instanceOf Html)
+    foreach ($labelTags as $tag) {
+          if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
           if(isset($fields[$source]))
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
-          else
-            $tag->opt['style'] = "display:none;";
+    }
+          else {
+                      $tag->opt['style'] = "display:none;";
+          }
         }
     $inputTags = $this->find(array(array("type" => "hint")));
-    foreach ($inputTags as $tag)
-      if ($tag instanceOf Html)
+    foreach ($inputTags as $tag) {
+          if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
           if(isset($fields[$source]))
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
-          else
-            $tag->opt['style'] = "display:none;";
+    }
+          else {
+                      $tag->opt['style'] = "display:none;";
+          }
         }
     $inputTags = $this->find(array(array("type" => "input")));
-    foreach ($inputTags as $tag)
-      if ($tag instanceOf Html)
+    foreach ($inputTags as $tag) {
+          if ($tag instanceOf Html)
         foreach ($tag->source as $source) {
           if(isset($fields[$source])) {
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
+    }
             unset($fields[$source]);
-          } else
-            $tag->opt['style'] = "display:none;";
+          } else {
+                      $tag->opt['style'] = "display:none;";
+          }
         }
     foreach ($fields as $n => $f) {
       if (!$f instanceOf Button) {