Completed
Push — master ( 3da96d...37f4cc )
by Chris
01:33
created
php/hamle/Field.php 3 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -110,6 +110,9 @@  discard block
 block discarded – undo
110 110
     }
111 111
   }
112 112
 
113
+  /**
114
+   * @return string
115
+   */
113 116
   function getValue() {
114 117
     if (!is_null($this->setValue)) return $this->setValue;
115 118
     if (isset($_REQUEST[$this->form . "_" . $this->name])) {
@@ -173,6 +176,9 @@  discard block
 block discarded – undo
173 176
     }
174 177
   }
175 178
 
179
+  /**
180
+   * @param boolean $submit
181
+   */
176 182
   function doProcess($submit) {
177 183
     if ($submit) {
178 184
       $value = $this->getValue();
Please login to merge, or discard this patch.
Braces   +26 added lines, -16 removed lines patch added patch discarded remove patch
@@ -66,7 +66,9 @@  discard block
 block discarded – undo
66 66
   }
67 67
 
68 68
   function __call($name, $valarray) {
69
-    if (count($valarray) < 1) return $this->__get($name);
69
+    if (count($valarray) < 1) {
70
+      return $this->__get($name);
71
+    }
70 72
     $val = count($valarray) == 1 ? current($valarray) : $valarray;
71 73
     switch ($name) {
72 74
       case "name":
@@ -111,12 +113,15 @@  discard block
 block discarded – undo
111 113
   }
112 114
 
113 115
   function getValue() {
114
-    if (!is_null($this->setValue)) return $this->setValue;
116
+    if (!is_null($this->setValue)) {
117
+      return $this->setValue;
118
+    }
115 119
     if (isset($_REQUEST[$this->form . "_" . $this->name])) {
116
-      if (get_magic_quotes_runtime())
117
-        return stripslashes($_REQUEST[$this->form . "_" . $this->name]);
118
-      else
119
-        return $_REQUEST[$this->form . "_" . $this->name];
120
+      if (get_magic_quotes_runtime()) {
121
+              return stripslashes($_REQUEST[$this->form . "_" . $this->name]);
122
+      } else {
123
+              return $_REQUEST[$this->form . "_" . $this->name];
124
+      }
120 125
     }
121 126
     return $this->opt['default'];
122 127
   }
@@ -133,12 +138,15 @@  discard block
 block discarded – undo
133 138
     if (!$this->valid) {
134 139
       $atts['class'][] = "hamleFormError";
135 140
     }
136
-    if ($this->opt["disabled"])
137
-      $atts['disabled'] = "disabled";
138
-    if ($this->opt['required'])
139
-      $atts['required'] = "required";
140
-    if ($this->opt['help'])
141
-      $atts['title'] = $this->opt['help'];
141
+    if ($this->opt["disabled"]) {
142
+          $atts['disabled'] = "disabled";
143
+    }
144
+    if ($this->opt['required']) {
145
+          $atts['required'] = "required";
146
+    }
147
+    if ($this->opt['help']) {
148
+          $atts['title'] = $this->opt['help'];
149
+    }
142 150
   }
143 151
 
144 152
   function getLabelAttStatic(&$atts, &$type, &$content) {
@@ -176,10 +184,12 @@  discard block
 block discarded – undo
176 184
   function doProcess($submit) {
177 185
     if ($submit) {
178 186
       $value = $this->getValue();
179
-      if ($this->opt['required'])
180
-        $this->valid = $this->valid && strlen($value);
181
-      if ($this->opt['regex'])
182
-        $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
187
+      if ($this->opt['required']) {
188
+              $this->valid = $this->valid && strlen($value);
189
+      }
190
+      if ($this->opt['regex']) {
191
+              $this->valid = $this->valid && preg_match($this->opt['regex'], $value);
192
+      }
183 193
     }
184 194
   }
185 195
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -112,19 +112,19 @@  discard block
 block discarded – undo
112 112
 
113 113
   function getValue() {
114 114
     if (!is_null($this->setValue)) return $this->setValue;
115
-    if (isset($_REQUEST[$this->form . "_" . $this->name])) {
115
+    if (isset($_REQUEST[$this->form."_".$this->name])) {
116 116
       if (get_magic_quotes_runtime())
117
-        return stripslashes($_REQUEST[$this->form . "_" . $this->name]);
117
+        return stripslashes($_REQUEST[$this->form."_".$this->name]);
118 118
       else
119
-        return $_REQUEST[$this->form . "_" . $this->name];
119
+        return $_REQUEST[$this->form."_".$this->name];
120 120
     }
121 121
     return $this->opt['default'];
122 122
   }
123 123
 
124 124
   function getInputAttStatic(&$atts, &$type, &$content) {
125
-    $atts['id'] = $atts['name'] = $this->form . "_" . $this->name;
125
+    $atts['id'] = $atts['name'] = $this->form."_".$this->name;
126 126
     $atts['type'] = "text";
127
-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));
127
+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));
128 128
   }
129 129
 
130 130
   function getInputAttDynamic(&$atts, &$type, &$content) {
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
   }
143 143
 
144 144
   function getLabelAttStatic(&$atts, &$type, &$content) {
145
-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));
146
-    $atts["for"] = $this->form . "_" . $this->name;
145
+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));
146
+    $atts["for"] = $this->form."_".$this->name;
147 147
     $content = array($this->opt['label']);
148 148
   }
149 149
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
   }
152 152
 
153 153
   function getHintAttStatic(&$atts, &$type, &$content) {
154
-    $atts['class'][] = str_replace(['Seufert\\','\\'],['','_'],get_class($this));
154
+    $atts['class'][] = str_replace(['Seufert\\', '\\'], ['', '_'], get_class($this));
155 155
     $atts['class'][] = "hamleFormHint";
156 156
   }
157 157
 
Please login to merge, or discard this patch.
php/hamle/Run.php 2 patches
Unused Use Statements   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
  */
26 26
 namespace Seufert\Hamle;
27 27
 
28
-use Seufert\Hamle\Exception\RunTime;
28
+use Seufert\Hamle\Exception\RunTime;
29 29
 use Seufert\Hamle\Model;
30 30
 
31 31
 /**
Please login to merge, or discard this patch.
Braces   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -54,10 +54,11 @@  discard block
 block discarded – undo
54 54
    */
55 55
   static function popInstance() {
56 56
     array_pop(self::$hamleList);
57
-    if (self::$hamleList)
58
-      self::$hamle = self::$hamleList[count(self::$hamleList) - 1];
59
-    else
60
-      self::$hamle = NULL;
57
+    if (self::$hamleList) {
58
+          self::$hamle = self::$hamleList[count(self::$hamleList) - 1];
59
+    } else {
60
+          self::$hamle = NULL;
61
+    }
61 62
   }
62 63
 
63 64
   /**
@@ -116,7 +117,9 @@  discard block
 block discarded – undo
116 117
   static function modelId($id, $sortDir = 0, $sortField = "", $limit = 0, $offset = 0) {
117 118
     $o = self::$hamle->setup->getModelDefault($id,
118 119
         $sortDir, $sortField, $limit, $offset);
119
-    if (!$o instanceOf Model) throw new RunTime("Application must return instance of hamleModel");
120
+    if (!$o instanceOf Model) {
121
+      throw new RunTime("Application must return instance of hamleModel");
122
+    }
120 123
     return $o;
121 124
   }
122 125
 
Please login to merge, or discard this patch.
php/hamle/Scope.php 4 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -17,6 +17,9 @@
 block discarded – undo
17 17
   /** @var Model[] Assoc array of Models by Scope Name */
18 18
   static $namedScopes = array();
19 19
 
20
+  /**
21
+   * @param Model $model
22
+   */
20 23
   static function add($model, $name = null) {
21 24
     if (!$model instanceOf Model)
22 25
       throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");
Please login to merge, or discard this patch.
Unused Use Statements   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Seufert\Hamle;
3 3
 
4
-use Seufert\Hamle\Exception\OutOfScope;
5
-use Seufert\Hamle\Exception\Unsupported;
6
-use Seufert\Hamle\Exception\RunTime;
4
+use Seufert\Hamle\Exception\OutOfScope;
5
+use Seufert\Hamle\Exception\Unsupported;
6
+use Seufert\Hamle\Exception\RunTime;
7 7
 use Seufert\Hamle\Model;
8 8
 
9 9
 /**
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
       self::$namedScopes[$name]->rewind();
68 68
       return self::$namedScopes[$name];
69 69
     } else
70
-      if(self::$returnZeroOnNoScope)
70
+      if (self::$returnZeroOnNoScope)
71 71
         return new Model\Zero();
72 72
       throw new RunTime("Unable to find scope ($name)");
73 73
   }
Please login to merge, or discard this patch.
Braces   +23 added lines, -14 removed lines patch added patch discarded remove patch
@@ -18,12 +18,14 @@  discard block
 block discarded – undo
18 18
   static $namedScopes = array();
19 19
 
20 20
   static function add($model, $name = null) {
21
-    if (!$model instanceOf Model)
22
-      throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");
23
-    if ($name)
24
-      self::$namedScopes[$name] = $model;
25
-    else
26
-      self::$scopes[] = $model;
21
+    if (!$model instanceOf Model) {
22
+          throw new Unsupported("Unsupported Model (".get_class($model)."), Needs to implement hamleModel Interface");
23
+    }
24
+    if ($name) {
25
+          self::$namedScopes[$name] = $model;
26
+    } else {
27
+          self::$scopes[] = $model;
28
+    }
27 29
   }
28 30
 
29 31
   static function done() {
@@ -41,15 +43,21 @@  discard block
 block discarded – undo
41 43
    */
42 44
   static function get($id = 0) {
43 45
     if (0 == $id) {
44
-      if ($scope = end(self::$scopes))
45
-        return $scope;
46
+      if ($scope = end(self::$scopes)) {
47
+              return $scope;
48
+      }
46 49
       throw new OutOfScope("Unable to find Scope ($id)");
47 50
     }
48 51
     $key = $id - 1;
49
-    if ($id < 0) $key = count(self::$scopes) + $id - 1;
50
-    if ($id == 0) $key = count(self::$scopes) - 1;
51
-    if (!isset(self::$scopes[$key]))
52
-      throw new OutOfScope("Unable to find Scope ($id) or $key");
52
+    if ($id < 0) {
53
+      $key = count(self::$scopes) + $id - 1;
54
+    }
55
+    if ($id == 0) {
56
+      $key = count(self::$scopes) - 1;
57
+    }
58
+    if (!isset(self::$scopes[$key])) {
59
+          throw new OutOfScope("Unable to find Scope ($id) or $key");
60
+    }
53 61
     return self::$scopes[$key];
54 62
   }
55 63
 
@@ -67,8 +75,9 @@  discard block
 block discarded – undo
67 75
       self::$namedScopes[$name]->rewind();
68 76
       return self::$namedScopes[$name];
69 77
     } else
70
-      if(self::$returnZeroOnNoScope)
71
-        return new Model\Zero();
78
+      if(self::$returnZeroOnNoScope) {
79
+              return new Model\Zero();
80
+      }
72 81
       throw new RunTime("Unable to find scope ($name)");
73 82
   }
74 83
 
Please login to merge, or discard this patch.
php/hamle/Setup.php 3 patches
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
   /**
49 49
    * Open the default model when only an ID is specified in the template
50 50
    *
51
-   * @param mixed $id Identifier when no type is passed
52
-   * @param array $sort
51
+   * @param string $id Identifier when no type is passed
52
+   * @param integer $sort
53 53
    * @param int $limit Results Limit
54 54
    * @param int $offset Results Offset
55 55
    * @return Model Instance of model class that implements hamleModel
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
    * Open a specific model type with id
61 61
    *
62 62
    * @param array[] $typeId Type ID array [type=>[id]] or [page=>[3]]
63
-   * @param array $sort
63
+   * @param integer $sort
64 64
    * @param int $limit Results Limit
65 65
    * @param int $offset Results Offset
66 66
    * @return Model
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
    * Return Iterator containing results from search of tags
77 77
    *
78 78
    * @param array[] $typeTags Type Tag Array [type=>[tag1,tag2],type2=>[]]
79
-   * @param array $sort
79
+   * @param integer $sort
80 80
    * @param int $limit Results Limit
81 81
    * @param int $offset Results Limit
82 82
    * @return Model Instance of Iterable model class
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,7 +41,9 @@  discard block
 block discarded – undo
41 41
   public function cachePath($f) {
42 42
     $s = DIRECTORY_SEPARATOR;
43 43
     $dir = implode($s,[__DIR__,"..","..","cache",""]);
44
-    if(!is_dir($dir)) mkdir($dir);
44
+    if(!is_dir($dir)) {
45
+      mkdir($dir);
46
+    }
45 47
     return $dir.$f;
46 48
   }
47 49
 
@@ -67,8 +69,9 @@  discard block
 block discarded – undo
67 69
    * @throws Exception\RunTime
68 70
    */
69 71
   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {
70
-    if(count($typeId) > 1)
71
-      throw new Exception\RunTime("Unable to open more than one ID at a time");
72
+    if(count($typeId) > 1) {
73
+          throw new Exception\RunTime("Unable to open more than one ID at a time");
74
+    }
72 75
     return new Model\Zero();
73 76
   }
74 77
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
    */
41 41
   public function cachePath($f) {
42 42
     $s = DIRECTORY_SEPARATOR;
43
-    $dir = implode($s,[__DIR__,"..","..","cache",""]);
44
-    if(!is_dir($dir)) mkdir($dir);
43
+    $dir = implode($s, [__DIR__, "..", "..", "cache", ""]);
44
+    if (!is_dir($dir)) mkdir($dir);
45 45
     return $dir.$f;
46 46
   }
47 47
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
    * @throws Exception\RunTime
68 68
    */
69 69
   public function getModelTypeID($typeId, $sort = [], $limit = 0, $offset = 0) {
70
-    if(count($typeId) > 1)
70
+    if (count($typeId) > 1)
71 71
       throw new Exception\RunTime("Unable to open more than one ID at a time");
72 72
     return new Model\Zero();
73 73
   }
Please login to merge, or discard this patch.
php/hamle/Tag/Comment.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -30,6 +30,9 @@
 block discarded – undo
30 30
 class Comment extends Tag {
31 31
   protected $commentstyle;
32 32
 
33
+  /**
34
+   * @param string $type
35
+   */
33 36
   function __construct($type) {
34 37
     if ($type == "/")
35 38
       $this->commentstyle = "HTML";
Please login to merge, or discard this patch.
Braces   +8 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,8 +31,9 @@  discard block
 block discarded – undo
31 31
   protected $commentstyle;
32 32
 
33 33
   function __construct($type) {
34
-    if ($type == "/")
35
-      $this->commentstyle = "HTML";
34
+    if ($type == "/") {
35
+          $this->commentstyle = "HTML";
36
+    }
36 37
   }
37 38
 
38 39
   function renderStTag() {
@@ -40,11 +41,12 @@  discard block
 block discarded – undo
40 41
   }
41 42
 
42 43
   function renderContent($pad = "", $oneliner = false) {
43
-    if ($this->commentstyle == "HTML")
44
-      if (count($this->content) > 1)
44
+    if ($this->commentstyle == "HTML") {
45
+          if (count($this->content) > 1)
45 46
         return $pad . "  " . implode("\n$pad", $this->content) . "\n";
46
-      else
47
-        return current($this->content);
47
+    } else {
48
+              return current($this->content);
49
+      }
48 50
     return "";
49 51
   }
50 52
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
   function renderContent($pad = "", $oneliner = false) {
43 43
     if ($this->commentstyle == "HTML")
44 44
       if (count($this->content) > 1)
45
-        return $pad . "  " . implode("\n$pad", $this->content) . "\n";
45
+        return $pad."  ".implode("\n$pad", $this->content)."\n";
46 46
       else
47 47
         return current($this->content);
48 48
     return "";
Please login to merge, or discard this patch.
php/hamle/Tag/DynHtml.php 3 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -33,6 +33,10 @@
 block discarded – undo
33 33
   protected $varname;
34 34
   protected $baseType;
35 35
 
36
+  /**
37
+   * @param string $tag
38
+   * @param string $id
39
+   */
36 40
   function __construct($tag, $class, $param, $id, $ref) {
37 41
     parent::__construct($tag, $class, $param, $id);
38 42
     $this->source[] = $ref;
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -60,11 +60,14 @@
 block discarded – undo
60 60
     $out = "<" . $d['type'] . " ";
61 61
     foreach ($d['opt'] as $k => $v) {
62 62
       if (is_array($v)) {
63
-        foreach ($v as $k2 => $v2)
64
-          if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
63
+        foreach ($v as $k2 => $v2) {
64
+                  if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
65
+        }
65 66
         $v = implode(" ", $v);
66 67
       }
67
-      if ($v instanceOf H\Text) $v = eval('return ' . $v->toPHP() . ';');
68
+      if ($v instanceOf H\Text) {
69
+        $v = eval('return ' . $v->toPHP() . ';');
70
+      }
68 71
       $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
69 72
     }
70 73
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,14 +38,14 @@  discard block
 block discarded – undo
38 38
     $this->source[] = $ref;
39 39
     $this->baseType = $tag;
40 40
     self::$var++;
41
-    $this->varname = "\$dynhtml" . self::$var;
41
+    $this->varname = "\$dynhtml".self::$var;
42 42
   }
43 43
 
44 44
   function render($indent = 0, $doIndent = true) {
45 45
     $data = H\Text::varToCode(array("base" => $this->baseType, "type" => $this->type, "opt" => $this->opt, "source" => $this->source, "content" => $this->content));
46
-    $out = "<?php " . $this->varname . "=$data; echo Hamle\\Tag\\DynHtml::toStTag(" . $this->varname . ",\$form).";
47
-    $out .= "implode(\"\\n\"," . $this->varname . "['content']).";
48
-    $out .= "Hamle\\Tag\\DynHtml::toEnTag(" . $this->varname . ",\$form)?>\n";
46
+    $out = "<?php ".$this->varname."=$data; echo Hamle\\Tag\\DynHtml::toStTag(".$this->varname.",\$form).";
47
+    $out .= "implode(\"\\n\",".$this->varname."['content']).";
48
+    $out .= "Hamle\\Tag\\DynHtml::toEnTag(".$this->varname.",\$form)?>\n";
49 49
     return $out;
50 50
   }
51 51
 
@@ -57,21 +57,21 @@  discard block
 block discarded – undo
57 57
     foreach ($d["source"] as $source) {
58 58
       $form->getField($source)->getDynamicAtt($d['base'], $d['opt'], $d['type'], $d['content']);
59 59
     }
60
-    $out = "<" . $d['type'] . " ";
60
+    $out = "<".$d['type']." ";
61 61
     foreach ($d['opt'] as $k => $v) {
62 62
       if (is_array($v)) {
63 63
         foreach ($v as $k2 => $v2)
64
-          if ($v[$k2] instanceof Text) $v[$k2] = eval('return ' . $v[$k2]->toPHP() . ';');
64
+          if ($v[$k2] instanceof Text) $v[$k2] = eval('return '.$v[$k2]->toPHP().';');
65 65
         $v = implode(" ", $v);
66 66
       }
67
-      if ($v instanceOf H\Text) $v = eval('return ' . $v->toPHP() . ';');
68
-      $out .= $k . "=\"" . htmlspecialchars($v) . "\" ";
67
+      if ($v instanceOf H\Text) $v = eval('return '.$v->toPHP().';');
68
+      $out .= $k."=\"".htmlspecialchars($v)."\" ";
69 69
     }
70 70
     $out .= in_array($d['type'], self::$selfCloseTags) ? "/>" : ">";
71 71
     return $out;
72 72
   }
73 73
 
74 74
   static function toEnTag($d, $form) {
75
-    return in_array($d['type'], self::$selfCloseTags) ? "" : "</" . $d['type'] . ">";
75
+    return in_array($d['type'], self::$selfCloseTags) ? "" : "</".$d['type'].">";
76 76
   }
77 77
 }
78 78
\ No newline at end of file
Please login to merge, or discard this patch.
php/hamle/Tag/Filter.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@
 block discarded – undo
38 38
    */
39 39
   protected $filter;
40 40
 
41
+  /**
42
+   * @param string $tag
43
+   */
41 44
   function __construct($tag) {
42 45
     parent::__construct();
43 46
     $this->type = ucfirst(strtolower($tag));
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,9 @@
 block discarded – undo
42 42
     parent::__construct();
43 43
     $this->type = ucfirst(strtolower($tag));
44 44
     $this->filter = "\\Seufert\\Hamle\\Filter\\{$this->type}";
45
-    if (!class_exists($this->filter))
46
-      Throw new ParseError("Unable to fild filter $tag");
45
+    if (!class_exists($this->filter)) {
46
+          Throw new ParseError("Unable to fild filter $tag");
47
+    }
47 48
   }
48 49
 
49 50
   function renderContent($pad = "", $oneliner = false) {
Please login to merge, or discard this patch.
php/hamle/Tag/Form.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -38,6 +38,9 @@
 block discarded – undo
38 38
    */
39 39
   protected $form;
40 40
 
41
+  /**
42
+   * @param string $param
43
+   */
41 44
   function __construct($param) {
42 45
     parent::__construct();
43 46
     $param = explode(' ', $param);
Please login to merge, or discard this patch.
Braces   +26 added lines, -17 removed lines patch added patch discarded remove patch
@@ -41,12 +41,15 @@  discard block
 block discarded – undo
41 41
   function __construct($param) {
42 42
     parent::__construct();
43 43
     $param = explode(' ', $param);
44
-    if (count($param) < 2) throw new ParseError("|form requires 2 arguments, form type, and instance");
44
+    if (count($param) < 2) {
45
+      throw new ParseError("|form requires 2 arguments, form type, and instance");
46
+    }
45 47
     $this->var = new H\Text($param[1]);
46
-    if (preg_match('/^(.*)\((.*)\)/', $param[0], $m))
47
-      $this->form = new $m[1]($m[2]);
48
-    else
49
-      $this->form = new $param[0];
48
+    if (preg_match('/^(.*)\((.*)\)/', $param[0], $m)) {
49
+          $this->form = new $m[1]($m[2]);
50
+    } else {
51
+          $this->form = new $param[0];
52
+    }
50 53
   }
51 54
 
52 55
   function renderStTag() {
@@ -58,32 +61,38 @@  discard block
 block discarded – undo
58 61
     }
59 62
     $fields = $this->form->getFields();
60 63
     $labelTags = $this->find(array(array("type" => "label")));
61
-    foreach ($labelTags as $tag)
62
-      if ($tag instanceOf Html)
64
+    foreach ($labelTags as $tag) {
65
+          if ($tag instanceOf Html)
63 66
         foreach ($tag->source as $source) {
64 67
           if(isset($fields[$source]))
65 68
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
66
-          else
67
-            $tag->opt['style'] = "display:none;";
69
+    }
70
+          else {
71
+                      $tag->opt['style'] = "display:none;";
72
+          }
68 73
         }
69 74
     $inputTags = $this->find(array(array("type" => "hint")));
70
-    foreach ($inputTags as $tag)
71
-      if ($tag instanceOf Html)
75
+    foreach ($inputTags as $tag) {
76
+          if ($tag instanceOf Html)
72 77
         foreach ($tag->source as $source) {
73 78
           if(isset($fields[$source]))
74 79
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
75
-          else
76
-            $tag->opt['style'] = "display:none;";
80
+    }
81
+          else {
82
+                      $tag->opt['style'] = "display:none;";
83
+          }
77 84
         }
78 85
     $inputTags = $this->find(array(array("type" => "input")));
79
-    foreach ($inputTags as $tag)
80
-      if ($tag instanceOf Html)
86
+    foreach ($inputTags as $tag) {
87
+          if ($tag instanceOf Html)
81 88
         foreach ($tag->source as $source) {
82 89
           if(isset($fields[$source])) {
83 90
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
91
+    }
84 92
             unset($fields[$source]);
85
-          } else
86
-            $tag->opt['style'] = "display:none;";
93
+          } else {
94
+                      $tag->opt['style'] = "display:none;";
95
+          }
87 96
         }
88 97
     foreach ($fields as $n => $f) {
89 98
       if (!$f instanceOf Button) {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     foreach ($labelTags as $tag)
62 62
       if ($tag instanceOf Html)
63 63
         foreach ($tag->source as $source) {
64
-          if(isset($fields[$source]))
64
+          if (isset($fields[$source]))
65 65
             $fields[$source]->getLabelAttStatic($tag->opt, $tag->type, $tag->content);
66 66
           else
67 67
             $tag->opt['style'] = "display:none;";
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     foreach ($inputTags as $tag)
71 71
       if ($tag instanceOf Html)
72 72
         foreach ($tag->source as $source) {
73
-          if(isset($fields[$source]))
73
+          if (isset($fields[$source]))
74 74
             $fields[$source]->getHintAttStatic($tag->opt, $tag->type, $tag->content);
75 75
           else
76 76
             $tag->opt['style'] = "display:none;";
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     foreach ($inputTags as $tag)
80 80
       if ($tag instanceOf Html)
81 81
         foreach ($tag->source as $source) {
82
-          if(isset($fields[$source])) {
82
+          if (isset($fields[$source])) {
83 83
             $fields[$source]->getInputAttStatic($tag->opt, $tag->type, $tag->content);
84 84
             unset($fields[$source]);
85 85
           } else
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
         }
88 88
     foreach ($fields as $n => $f) {
89 89
       if (!$f instanceOf Button) {
90
-        $this->addChild($label = new DynHtml("label", [],[],"",$n));
90
+        $this->addChild($label = new DynHtml("label", [], [], "", $n));
91 91
         $f->getLabelAttStatic($label->opt, $label->type, $label->content);
92 92
       }
93
-      $this->addChild($input = new DynHtml("input", [],[],"",$n));
93
+      $this->addChild($input = new DynHtml("input", [], [], "", $n));
94 94
       $f->getInputAttStatic($input->opt, $input->type, $input->content);
95 95
     }
96
-    return "<form " . implode(" ", $out) . "><?php \$form = " . $this->var->toPHP() . "; \$form->process(); ?>";
96
+    return "<form ".implode(" ", $out)."><?php \$form = ".$this->var->toPHP()."; \$form->process(); ?>";
97 97
   }
98 98
 
99 99
   function renderEnTag() {
Please login to merge, or discard this patch.
php/hamle/Tag/Snippet.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -30,6 +30,9 @@
 block discarded – undo
30 30
 class Snippet extends Hamle\Tag {
31 31
   protected $path;
32 32
 
33
+  /**
34
+   * @param string $params
35
+   */
33 36
   function __construct($params) {
34 37
     parent::__construct();
35 38
     if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m))
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 
46 46
   static function decodeClassId($s) {
47 47
     $out = $m = array();
48
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
48
+    if (preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
49 49
       $out['type'] = $m[0];
50 50
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
51 51
     if (isset($m[0])) foreach ($m[0] as $s) {
Please login to merge, or discard this patch.
Braces   +29 added lines, -18 removed lines patch added patch discarded remove patch
@@ -32,25 +32,33 @@  discard block
 block discarded – undo
32 32
 
33 33
   function __construct($params) {
34 34
     parent::__construct();
35
-    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m))
36
-      throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
35
+    if (!preg_match('/^(append|content|prepend|replace)(?: (.*))?$/', $params, $m)) {
36
+          throw new Hamle\Exception\ParseError("Unable to parse Snippet($params)");
37
+    }
37 38
     $this->type = $m[1];
38
-    if (isset($m[2]))
39
-      $this->path = explode(" ", $m[2]);
40
-    else
41
-      $this->path = array();
42
-    foreach ($this->path as $k => $v)
43
-      $this->path[$k] = self::decodeClassId($v);
39
+    if (isset($m[2])) {
40
+          $this->path = explode(" ", $m[2]);
41
+    } else {
42
+          $this->path = array();
43
+    }
44
+    foreach ($this->path as $k => $v) {
45
+          $this->path[$k] = self::decodeClassId($v);
46
+    }
44 47
   }
45 48
 
46 49
   static function decodeClassId($s) {
47 50
     $out = $m = array();
48
-    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m))
49
-      $out['type'] = $m[0];
51
+    if(preg_match('/^[a-zA-Z0-9\_]+/', $s, $m)) {
52
+          $out['type'] = $m[0];
53
+    }
50 54
     preg_match_all('/[#\.][a-zA-Z0-9\-\_]+/m', $s, $m);
51
-    if (isset($m[0])) foreach ($m[0] as $s) {
55
+    if (isset($m[0])) {
56
+      foreach ($m[0] as $s) {
52 57
       if ($s[0] == "#") $out['id'] = substr($s, 1);
53
-      if ($s[0] == ".") $out['class'][] = substr($s, 1);
58
+    }
59
+      if ($s[0] == ".") {
60
+        $out['class'][] = substr($s, 1);
61
+      }
54 62
     }
55 63
     return $out;
56 64
   }
@@ -62,21 +70,24 @@  discard block
 block discarded – undo
62 70
   function addSnipContent($contentTag, &$tagArray = array(), $key = 0) {
63 71
     if ($this->type == "content") {
64 72
       $tagArray[$key] = $contentTag;
65
-    } else
66
-      parent::addSnipContent($contentTag, $tagArray, $key);
73
+    } else {
74
+          parent::addSnipContent($contentTag, $tagArray, $key);
75
+    }
67 76
   }
68 77
 
69 78
   function apply(Hamle\Tag $rootTag) {
70 79
     if ($this->type == "append" or $this->type == "prepend") {
71 80
       $matchTags = $rootTag->find($this->path);
72
-      foreach ($matchTags as $tag)
73
-        foreach ($this->tags as $t) {
81
+      foreach ($matchTags as $tag) {
82
+              foreach ($this->tags as $t) {
74 83
           $tag->addChild($t, $this->type);
84
+      }
75 85
         }
76 86
     } elseif ($this->type == "replace") {
77 87
       $rootTag->replace($this->path, $this);
78
-    } else
79
-      throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
88
+    } else {
89
+          throw new Hamle\Exception\ParseError("Cant Apply snippet to document '{$this->type}'");
90
+    }
80 91
   }
81 92
 
82 93
 }
83 94
\ No newline at end of file
Please login to merge, or discard this patch.