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();

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/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");

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

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);

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) {

php/hamle/Tag/Snippet.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 class Snippet extends Hamle\Tag {
   protected $path;
 
+  /**
+   * @param string $params
+   */
   function __construct($params) {
     parent::__construct();
     if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m))

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

Doc Comments +6 added lines

@@ -33,11 +33,17 @@
 class Text extends Tag {
   protected $escape = true;
 
+  /**
+   * @param string $tag
+   */
   function __construct($tag) {
     parent::__construct();
     $this->escape = ($tag == "_");
   }
 
+  /**
+   * @param string $s
+   */
   function addContent($s, $strtype = H\Text::TOKEN_HTML) {
     if (trim($s)) {
       if ($this->escape) {

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
       if ($this->escape) {
         $parse = new H\Text($s, $strtype);
         $this->content[] = $parse->toHTML();
-      } else
-        $this->content[] = $s;
+      } else {
+              $this->content[] = $s;
+      }
     }
   }