@@ -252,7 +252,7 @@ |
||
252 | 252 | { |
253 | 253 | parent::__construct($data); |
254 | 254 | $this->setTableName("USER"); |
255 | - } |
|
255 | + } |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | class UserGateway extends TableGateway |
@@ -78,11 +78,11 @@ discard block |
||
78 | 78 | { |
79 | 79 | $k++; |
80 | 80 | |
81 | - if (is_null($value)) |
|
82 | - $parsed_where[] = "$key IS NULL"; |
|
83 | - elseif ($value instanceof SQLFunction) |
|
84 | - $parsed_where[] = "$key = " . $value->getStatement(); |
|
85 | - elseif (is_array($value)) |
|
81 | + if (is_null($value)) { |
|
82 | + $parsed_where[] = "$key IS NULL"; |
|
83 | + } elseif ($value instanceof SQLFunction) { |
|
84 | + $parsed_where[] = "$key = " . $value->getStatement(); |
|
85 | + } elseif (is_array($value)) |
|
86 | 86 | { |
87 | 87 | $parsed_in = []; |
88 | 88 | |
@@ -105,8 +105,7 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")"; |
108 | - } |
|
109 | - else |
|
108 | + } else |
|
110 | 109 | { |
111 | 110 | switch ($driver) |
112 | 111 | { |
@@ -124,9 +123,9 @@ discard block |
||
124 | 123 | } |
125 | 124 | |
126 | 125 | $where = "WHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where); |
126 | + } else { |
|
127 | + $where = ""; |
|
127 | 128 | } |
128 | - else |
|
129 | - $where = ""; |
|
130 | 129 | |
131 | 130 | $table = $this->entity->getTableName(); |
132 | 131 | |
@@ -135,10 +134,11 @@ discard block |
||
135 | 134 | $this->lastQuery = $sql; |
136 | 135 | $this->lastValues = $bind_values; |
137 | 136 | |
138 | - if (count($bind_values)) |
|
139 | - $this->getDb()->execute($sql, $bind_values); |
|
140 | - else |
|
141 | - $this->getDb()->execute($sql); |
|
137 | + if (count($bind_values)) { |
|
138 | + $this->getDb()->execute($sql, $bind_values); |
|
139 | + } else { |
|
140 | + $this->getDb()->execute($sql); |
|
141 | + } |
|
142 | 142 | |
143 | 143 | return $this->getDb()->getArrayResult(); |
144 | 144 | } |
@@ -155,8 +155,9 @@ discard block |
||
155 | 155 | */ |
156 | 156 | public function insert(Array $data) |
157 | 157 | { |
158 | - if (!count($data)) |
|
159 | - throw new \LogicException("Missing values for INSERT statement!"); |
|
158 | + if (!count($data)) { |
|
159 | + throw new \LogicException("Missing values for INSERT statement!"); |
|
160 | + } |
|
160 | 161 | |
161 | 162 | $bind_values = []; |
162 | 163 | |
@@ -179,11 +180,11 @@ discard block |
||
179 | 180 | continue; |
180 | 181 | } |
181 | 182 | |
182 | - if (is_null($value)) |
|
183 | - $value = "NULL"; |
|
184 | - elseif ($value instanceof SQLFunction) |
|
185 | - $value = $value->getStatement(); |
|
186 | - else { |
|
183 | + if (is_null($value)) { |
|
184 | + $value = "NULL"; |
|
185 | + } elseif ($value instanceof SQLFunction) { |
|
186 | + $value = $value->getStatement(); |
|
187 | + } else { |
|
187 | 188 | |
188 | 189 | switch ($driver) |
189 | 190 | { |
@@ -236,11 +237,13 @@ discard block |
||
236 | 237 | { |
237 | 238 | $parsed_set = []; |
238 | 239 | |
239 | - if (!count($set)) |
|
240 | - throw new \LogicException("You cannot update rows without SET clause"); |
|
240 | + if (!count($set)) { |
|
241 | + throw new \LogicException("You cannot update rows without SET clause"); |
|
242 | + } |
|
241 | 243 | |
242 | - if (!count($where)) |
|
243 | - throw new SecurityException("You cannot update rows without WHERE clause!"); |
|
244 | + if (!count($where)) { |
|
245 | + throw new SecurityException("You cannot update rows without WHERE clause!"); |
|
246 | + } |
|
244 | 247 | |
245 | 248 | $bind_values = []; |
246 | 249 | |
@@ -252,11 +255,11 @@ discard block |
||
252 | 255 | { |
253 | 256 | $k++; |
254 | 257 | |
255 | - if (is_null($value)) |
|
256 | - $parsed_set[] = "$key = NULL"; |
|
257 | - elseif ($value instanceof SQLFunction) |
|
258 | - $parsed_set[] = "$key = " . $value->getStatement(); |
|
259 | - elseif (is_array($value)) |
|
258 | + if (is_null($value)) { |
|
259 | + $parsed_set[] = "$key = NULL"; |
|
260 | + } elseif ($value instanceof SQLFunction) { |
|
261 | + $parsed_set[] = "$key = " . $value->getStatement(); |
|
262 | + } elseif (is_array($value)) |
|
260 | 263 | { |
261 | 264 | $parsed_in = []; |
262 | 265 | |
@@ -267,8 +270,9 @@ discard block |
||
267 | 270 | case 'Oci8': |
268 | 271 | |
269 | 272 | # [POSSIBLE BUG] - To Future revision (What about non-string values ?) |
270 | - if (is_string($in_value)) |
|
271 | - $parsed_in[] = ":$k"; |
|
273 | + if (is_string($in_value)) { |
|
274 | + $parsed_in[] = ":$k"; |
|
275 | + } |
|
272 | 276 | |
273 | 277 | $bind_values[":$k"] = $in_value; |
274 | 278 | break; |
@@ -283,8 +287,7 @@ discard block |
||
283 | 287 | } |
284 | 288 | |
285 | 289 | $parsed_set[] = "$key IN (" . implode(", ", $parsed_in) . ")"; |
286 | - } |
|
287 | - else |
|
290 | + } else |
|
288 | 291 | { |
289 | 292 | switch ($driver) |
290 | 293 | { |
@@ -309,11 +312,11 @@ discard block |
||
309 | 312 | { |
310 | 313 | $k++; |
311 | 314 | |
312 | - if (is_null($value)) |
|
313 | - $parsed_where[] = "$key IS NULL"; |
|
314 | - elseif ($value instanceof SQLFunction) |
|
315 | - $parsed_where[] = "$key = " . $value->getStatement(); |
|
316 | - elseif (is_array($value)) |
|
315 | + if (is_null($value)) { |
|
316 | + $parsed_where[] = "$key IS NULL"; |
|
317 | + } elseif ($value instanceof SQLFunction) { |
|
318 | + $parsed_where[] = "$key = " . $value->getStatement(); |
|
319 | + } elseif (is_array($value)) |
|
317 | 320 | { |
318 | 321 | $parsed_in = []; |
319 | 322 | |
@@ -336,8 +339,7 @@ discard block |
||
336 | 339 | } |
337 | 340 | |
338 | 341 | $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")"; |
339 | - } |
|
340 | - else |
|
342 | + } else |
|
341 | 343 | { |
342 | 344 | switch ($driver) |
343 | 345 | { |
@@ -392,11 +394,11 @@ discard block |
||
392 | 394 | { |
393 | 395 | $k++; |
394 | 396 | |
395 | - if (is_null($value)) |
|
396 | - $parsed_where[] = "$key IS NULL"; |
|
397 | - elseif ($value instanceof SQLFunction) |
|
398 | - $parsed_where[] = "$key = " . $value->getStatement(); |
|
399 | - elseif (is_array($value)) |
|
397 | + if (is_null($value)) { |
|
398 | + $parsed_where[] = "$key IS NULL"; |
|
399 | + } elseif ($value instanceof SQLFunction) { |
|
400 | + $parsed_where[] = "$key = " . $value->getStatement(); |
|
401 | + } elseif (is_array($value)) |
|
400 | 402 | { |
401 | 403 | $parsed_in = []; |
402 | 404 | |
@@ -419,8 +421,7 @@ discard block |
||
419 | 421 | } |
420 | 422 | |
421 | 423 | $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")"; |
422 | - } |
|
423 | - else |
|
424 | + } else |
|
424 | 425 | { |
425 | 426 | switch ($driver) |
426 | 427 | { |
@@ -438,9 +439,9 @@ discard block |
||
438 | 439 | } |
439 | 440 | |
440 | 441 | $where = "\r\nWHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where); |
442 | + } else { |
|
443 | + throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead."); |
|
441 | 444 | } |
442 | - else |
|
443 | - throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead."); |
|
444 | 445 | |
445 | 446 | $table = $this->entity->getTableName(); |
446 | 447 |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | { |
121 | 121 | if (is_string($param_values[$i])) |
122 | 122 | $bind_types .= 's'; |
123 | - else if(is_float($param_values[$i])) |
|
123 | + else if (is_float($param_values[$i])) |
|
124 | 124 | $bind_types .= 'd'; |
125 | 125 | # [POSSIBLE BUG] - To Future revision (What about non-string and non-decimal types ?) |
126 | 126 | else |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | $this->numFields = $this->dbconn->field_count; |
185 | 185 | |
186 | 186 | if ($this->transac_mode) |
187 | - $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result; |
|
187 | + $this->transac_result = is_null($this->transac_result) ? $this->result : $this->transac_result && $this->result; |
|
188 | 188 | /* |
189 | 189 | * Because mysqli_query() returns FALSE on failure, a mysqli_result object for SELECT, SHOW, DESCRIBE or EXPLAIN queries, |
190 | 190 | * and TRUE for other successful queries, it should be handled to return only objects or resources. |
@@ -33,15 +33,17 @@ discard block |
||
33 | 33 | { |
34 | 34 | $this->driverName = 'Mysqli'; |
35 | 35 | |
36 | - if (!array_key_exists("dbchar", $options)) |
|
37 | - $options["dbchar"] = "utf8"; |
|
36 | + if (!array_key_exists("dbchar", $options)) { |
|
37 | + $options["dbchar"] = "utf8"; |
|
38 | + } |
|
38 | 39 | |
39 | 40 | parent::__construct($options); |
40 | 41 | |
41 | 42 | $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true; |
42 | 43 | |
43 | - if ($auto_connect) |
|
44 | - $this->connect(); |
|
44 | + if ($auto_connect) { |
|
45 | + $this->connect(); |
|
46 | + } |
|
45 | 47 | } |
46 | 48 | |
47 | 49 | /** |
@@ -54,13 +56,15 @@ discard block |
||
54 | 56 | */ |
55 | 57 | public function connect() |
56 | 58 | { |
57 | - if (!extension_loaded('mysqli')) |
|
58 | - throw new \RuntimeException("The Mysqli extension is not loaded"); |
|
59 | + if (!extension_loaded('mysqli')) { |
|
60 | + throw new \RuntimeException("The Mysqli extension is not loaded"); |
|
61 | + } |
|
59 | 62 | |
60 | - if (!is_null($this->dbport) && !empty($this->dbport)) |
|
61 | - $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport); |
|
62 | - else |
|
63 | - $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname); |
|
63 | + if (!is_null($this->dbport) && !empty($this->dbport)) { |
|
64 | + $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport); |
|
65 | + } else { |
|
66 | + $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname); |
|
67 | + } |
|
64 | 68 | |
65 | 69 | if ($conn->connect_errno) |
66 | 70 | { |
@@ -70,8 +74,7 @@ discard block |
||
70 | 74 | * the warning message "Property access is not allowed yet". |
71 | 75 | */ |
72 | 76 | throw new Exception\ConnectionException(mysqli_connect_error(), mysqli_connect_errno()); |
73 | - } |
|
74 | - else |
|
77 | + } else |
|
75 | 78 | { |
76 | 79 | $this->dbconn = $conn; |
77 | 80 | $this->dbconn->set_charset($this->dbchar); |
@@ -118,13 +121,15 @@ discard block |
||
118 | 121 | |
119 | 122 | for ($i = 0; $i < $n_params; $i++) |
120 | 123 | { |
121 | - if (is_string($param_values[$i])) |
|
122 | - $bind_types .= 's'; |
|
123 | - else if(is_float($param_values[$i])) |
|
124 | - $bind_types .= 'd'; |
|
124 | + if (is_string($param_values[$i])) { |
|
125 | + $bind_types .= 's'; |
|
126 | + } else if(is_float($param_values[$i])) { |
|
127 | + $bind_types .= 'd'; |
|
128 | + } |
|
125 | 129 | # [POSSIBLE BUG] - To Future revision (What about non-string and non-decimal types ?) |
126 | - else |
|
127 | - $bind_types .= 's'; |
|
130 | + else { |
|
131 | + $bind_types .= 's'; |
|
132 | + } |
|
128 | 133 | |
129 | 134 | $bind_values[] = '$param_values[' . $i . ']'; |
130 | 135 | } |
@@ -133,8 +138,7 @@ discard block |
||
133 | 138 | eval('$stmt->bind_param(\'' . $bind_types . '\', ' . $values . ');'); |
134 | 139 | |
135 | 140 | $r = $stmt->execute(); |
136 | - } |
|
137 | - else |
|
141 | + } else |
|
138 | 142 | { |
139 | 143 | $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL); |
140 | 144 | |
@@ -163,28 +167,33 @@ discard block |
||
163 | 167 | * It is useful to prevent rollback transactions on insert statements because |
164 | 168 | * insert statement do not free results. |
165 | 169 | */ |
166 | - if ($res) |
|
167 | - $this->result = $res; |
|
170 | + if ($res) { |
|
171 | + $this->result = $res; |
|
172 | + } |
|
168 | 173 | } |
169 | 174 | |
170 | 175 | # identify SELECT, SHOW, DESCRIBE or EXPLAIN queries |
171 | - if (is_object($this->result) && property_exists($this->result, 'num_rows')) |
|
172 | - $this->numRows = $this->result->num_rows; |
|
173 | - else |
|
176 | + if (is_object($this->result) && property_exists($this->result, 'num_rows')) { |
|
177 | + $this->numRows = $this->result->num_rows; |
|
178 | + } else |
|
174 | 179 | { |
175 | - if (property_exists($this->dbconn, 'affected_rows') && !$is_stmt_result) |
|
176 | - $this->rowsAffected = $this->dbconn->affected_rows; |
|
180 | + if (property_exists($this->dbconn, 'affected_rows') && !$is_stmt_result) { |
|
181 | + $this->rowsAffected = $this->dbconn->affected_rows; |
|
182 | + } |
|
177 | 183 | } |
178 | 184 | |
179 | 185 | # affected_rows return the same of num_rows on select statements! |
180 | - if ($this->numRows > 0) |
|
181 | - $this->rowsAffected = 0; |
|
186 | + if ($this->numRows > 0) { |
|
187 | + $this->rowsAffected = 0; |
|
188 | + } |
|
182 | 189 | |
183 | - if (property_exists($this->dbconn, 'field_count')) |
|
184 | - $this->numFields = $this->dbconn->field_count; |
|
190 | + if (property_exists($this->dbconn, 'field_count')) { |
|
191 | + $this->numFields = $this->dbconn->field_count; |
|
192 | + } |
|
185 | 193 | |
186 | - if ($this->transac_mode) |
|
187 | - $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result; |
|
194 | + if ($this->transac_mode) { |
|
195 | + $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result; |
|
196 | + } |
|
188 | 197 | /* |
189 | 198 | * Because mysqli_query() returns FALSE on failure, a mysqli_result object for SELECT, SHOW, DESCRIBE or EXPLAIN queries, |
190 | 199 | * and TRUE for other successful queries, it should be handled to return only objects or resources. |
@@ -252,10 +261,10 @@ discard block |
||
252 | 261 | { |
253 | 262 | $data[] = $row; |
254 | 263 | } |
255 | - } |
|
256 | - else |
|
257 | - # This error is thrown because of 'execute' method has not been executed. |
|
264 | + } else { |
|
265 | + # This error is thrown because of 'execute' method has not been executed. |
|
258 | 266 | throw new \LogicException('There are not data in the buffer!'); |
267 | + } |
|
259 | 268 | |
260 | 269 | $this->arrayResult = $data; |
261 | 270 | |
@@ -270,7 +279,8 @@ discard block |
||
270 | 279 | public function __destruct() |
271 | 280 | { |
272 | 281 | # prevent "Property access is not allowed yet" with @ on failure connections |
273 | - if ($this->dbconn !== false && !is_null($this->dbconn)) |
|
274 | - @$this->dbconn->close(); |
|
282 | + if ($this->dbconn !== false && !is_null($this->dbconn)) { |
|
283 | + @$this->dbconn->close(); |
|
284 | + } |
|
275 | 285 | } |
276 | 286 | } |
277 | 287 | \ No newline at end of file |
@@ -38,8 +38,9 @@ |
||
38 | 38 | { |
39 | 39 | foreach ($attributes as $name => $value) |
40 | 40 | { |
41 | - if (!is_string($name)) |
|
42 | - throw new \InvalidArgumentException("Attribute only accepts strings as names"); |
|
41 | + if (!is_string($name)) { |
|
42 | + throw new \InvalidArgumentException("Attribute only accepts strings as names"); |
|
43 | + } |
|
43 | 44 | |
44 | 45 | $instance->setAttribute(new Attribute($name, $value)); |
45 | 46 | } |
@@ -258,12 +258,12 @@ |
||
258 | 258 | { |
259 | 259 | if (static::HAS_END_TAG) |
260 | 260 | { |
261 | - $this->startTag = "<" .strtolower(static::NODE_NAME). ">"; |
|
262 | - $this->endTag = "</" .strtolower(static::NODE_NAME). ">"; |
|
261 | + $this->startTag = "<" . strtolower(static::NODE_NAME) . ">"; |
|
262 | + $this->endTag = "</" . strtolower(static::NODE_NAME) . ">"; |
|
263 | 263 | } |
264 | 264 | else |
265 | 265 | { |
266 | - $this->startTag = "<" .strtolower(static::NODE_NAME); |
|
266 | + $this->startTag = "<" . strtolower(static::NODE_NAME); |
|
267 | 267 | $this->endTag = "/>"; |
268 | 268 | } |
269 | 269 | } |
@@ -110,8 +110,9 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function hasChild($label) |
112 | 112 | { |
113 | - if (array_key_exists($label, $this->children)) |
|
114 | - return true; |
|
113 | + if (array_key_exists($label, $this->children)) { |
|
114 | + return true; |
|
115 | + } |
|
115 | 116 | |
116 | 117 | return false; |
117 | 118 | } |
@@ -125,8 +126,9 @@ discard block |
||
125 | 126 | */ |
126 | 127 | public function getChild($label) |
127 | 128 | { |
128 | - if (array_key_exists($label, $this->children)) |
|
129 | - return $this->children[$label]; |
|
129 | + if (array_key_exists($label, $this->children)) { |
|
130 | + return $this->children[$label]; |
|
131 | + } |
|
130 | 132 | |
131 | 133 | return null; |
132 | 134 | } |
@@ -155,10 +157,11 @@ discard block |
||
155 | 157 | */ |
156 | 158 | public function removeChild($label) |
157 | 159 | { |
158 | - if (array_key_exists($label, $this->children)) |
|
159 | - unset($this->children[$label]); |
|
160 | - else |
|
161 | - throw new Exception\ChildNotFoundException("The child to remove does not exists"); |
|
160 | + if (array_key_exists($label, $this->children)) { |
|
161 | + unset($this->children[$label]); |
|
162 | + } else { |
|
163 | + throw new Exception\ChildNotFoundException("The child to remove does not exists"); |
|
164 | + } |
|
162 | 165 | } |
163 | 166 | |
164 | 167 | /** |
@@ -174,8 +177,9 @@ discard block |
||
174 | 177 | { |
175 | 178 | foreach ($this->attributes as $attrib) |
176 | 179 | { |
177 | - if ($attrib->getName() == $name) |
|
178 | - return true; |
|
180 | + if ($attrib->getName() == $name) { |
|
181 | + return true; |
|
182 | + } |
|
179 | 183 | } |
180 | 184 | } |
181 | 185 | |
@@ -195,8 +199,9 @@ discard block |
||
195 | 199 | { |
196 | 200 | foreach ($this->attributes as $attrib) |
197 | 201 | { |
198 | - if ($attrib->getName() == $name) |
|
199 | - return $attrib; |
|
202 | + if ($attrib->getName() == $name) { |
|
203 | + return $attrib; |
|
204 | + } |
|
200 | 205 | } |
201 | 206 | } |
202 | 207 | |
@@ -218,12 +223,13 @@ discard block |
||
218 | 223 | { |
219 | 224 | foreach ($this->attributes as $key => $_attrib) |
220 | 225 | { |
221 | - if ($_attrib->getName() == $attrib->getName()) |
|
222 | - $this->attributes[$key] = $attribute; |
|
226 | + if ($_attrib->getName() == $attrib->getName()) { |
|
227 | + $this->attributes[$key] = $attribute; |
|
228 | + } |
|
223 | 229 | } |
230 | + } else { |
|
231 | + $this->attributes[] = $attribute; |
|
224 | 232 | } |
225 | - else |
|
226 | - $this->attributes[] = $attribute; |
|
227 | 233 | } |
228 | 234 | |
229 | 235 | /** |
@@ -241,8 +247,9 @@ discard block |
||
241 | 247 | { |
242 | 248 | foreach ($this->attributes as $key => $attrib) |
243 | 249 | { |
244 | - if ($attrib->getName() == $name) |
|
245 | - unset($this->attributes[$key]); |
|
250 | + if ($attrib->getName() == $name) { |
|
251 | + unset($this->attributes[$key]); |
|
252 | + } |
|
246 | 253 | } |
247 | 254 | } |
248 | 255 | |
@@ -260,8 +267,7 @@ discard block |
||
260 | 267 | { |
261 | 268 | $this->startTag = "<" .strtolower(static::NODE_NAME). ">"; |
262 | 269 | $this->endTag = "</" .strtolower(static::NODE_NAME). ">"; |
263 | - } |
|
264 | - else |
|
270 | + } else |
|
265 | 271 | { |
266 | 272 | $this->startTag = "<" .strtolower(static::NODE_NAME); |
267 | 273 | $this->endTag = "/>"; |
@@ -275,8 +281,9 @@ discard block |
||
275 | 281 | */ |
276 | 282 | public function isFormControl() |
277 | 283 | { |
278 | - if (in_array(static::NODE_NAME, ['INPUT'])) |
|
279 | - return true; |
|
284 | + if (in_array(static::NODE_NAME, ['INPUT'])) { |
|
285 | + return true; |
|
286 | + } |
|
280 | 287 | |
281 | 288 | return false; |
282 | 289 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | ]); |
48 | 48 | |
49 | 49 | $form->fill([ |
50 | - "username" => 'jobs', # wrong because of minlength attr |
|
50 | + "username" => 'jobs', # wrong because of minlength attr |
|
51 | 51 | "password" => 'jVi7Qp4X', |
52 | 52 | "email" => 'j@' # wrong because of type and minlength attr |
53 | 53 | ]); |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | ]); |
199 | 199 | |
200 | 200 | $form->fill([ |
201 | - "username" => 'jobs', # wrong because of minlength attr |
|
201 | + "username" => 'jobs', # wrong because of minlength attr |
|
202 | 202 | ]); |
203 | 203 | |
204 | 204 | $validator = new FormValidator($form, 'en'); |
@@ -243,12 +243,12 @@ discard block |
||
243 | 243 | $form->fill([ |
244 | 244 | "product" => [ |
245 | 245 | "optical mouse", |
246 | - "-", # wrong name |
|
246 | + "-", # wrong name |
|
247 | 247 | "78" # another wrong name |
248 | 248 | ], |
249 | 249 | "price" => [ |
250 | 250 | 10, |
251 | - 0, # wrong price |
|
251 | + 0, # wrong price |
|
252 | 252 | 0 # another wrong price |
253 | 253 | ] |
254 | 254 | ]); |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | ]); |
306 | 306 | |
307 | 307 | $form->fill([ |
308 | - "username" => 'steave jobs', # wrong because of minlength attr |
|
308 | + "username" => 'steave jobs', # wrong because of minlength attr |
|
309 | 309 | "password" => 'jVi7Qp4X', |
310 | 310 | "type" => 'moderator' # wrong because moderator is not a valid needle |
311 | 311 | ]); |
@@ -48,11 +48,13 @@ |
||
48 | 48 | { |
49 | 49 | $child = $this->getChild($label); |
50 | 50 | |
51 | - if (is_null($child)) |
|
52 | - throw new Exception\ChildNotFoundException("The child '$label' does not exists inside the form element"); |
|
51 | + if (is_null($child)) { |
|
52 | + throw new Exception\ChildNotFoundException("The child '$label' does not exists inside the form element"); |
|
53 | + } |
|
53 | 54 | |
54 | - if (!$child->isFormControl()) |
|
55 | - throw new Exception\NotFormControlException("The child '$label' is not a form control"); |
|
55 | + if (!$child->isFormControl()) { |
|
56 | + throw new Exception\NotFormControlException("The child '$label' is not a form control"); |
|
57 | + } |
|
56 | 58 | |
57 | 59 | $child->setAttribute(new Attribute("value", $value)); |
58 | 60 | } |
@@ -92,29 +92,32 @@ discard block |
||
92 | 92 | */ |
93 | 93 | protected function _error($code, $message = null) |
94 | 94 | { |
95 | - if (!is_null($code) && !is_integer($code) && !is_string($code)) |
|
96 | - throw new \InvalidArgumentException("Invalid type given. Integer or string expected"); |
|
95 | + if (!is_null($code) && !is_integer($code) && !is_string($code)) { |
|
96 | + throw new \InvalidArgumentException("Invalid type given. Integer or string expected"); |
|
97 | + } |
|
97 | 98 | |
98 | - if (is_null($code)) |
|
99 | - $code = preg_replace('/=|\/|\+/', "", base64_encode($message)); |
|
100 | - else |
|
99 | + if (is_null($code)) { |
|
100 | + $code = preg_replace('/=|\/|\+/', "", base64_encode($message)); |
|
101 | + } else |
|
101 | 102 | { |
102 | - if (!array_key_exists($code, $this->standardErrors) && empty($message)) |
|
103 | - /* |
|
103 | + if (!array_key_exists($code, $this->standardErrors) && empty($message)) { |
|
104 | + /* |
|
104 | 105 | * Non-standard errors must have a message to describe the error, make sure |
105 | 106 | * you execute the error() method with a message as the second parameter. |
106 | 107 | */ |
107 | 108 | throw new \LogicException('The message does not be empty in non-standard errors!'); |
109 | + } |
|
108 | 110 | } |
109 | 111 | |
110 | - if (!array_key_exists($code, $this->errors)) |
|
111 | - $this->errors[$code] = (array_key_exists($code, $this->standardErrors)) |
|
112 | + if (!array_key_exists($code, $this->errors)) { |
|
113 | + $this->errors[$code] = (array_key_exists($code, $this->standardErrors)) |
|
112 | 114 | ? |
113 | 115 | is_null($message) |
114 | 116 | ? preg_replace('/\s\'%[a-zA-Z]*%\'/', $message, $this->standardErrors[$code]) |
115 | 117 | # if $message is not null it will replace the %file% wildcard |
116 | 118 | : preg_replace('/%[a-zA-Z]*%/', $message, $this->standardErrors[$code]) |
117 | 119 | : $message; |
120 | + } |
|
118 | 121 | } |
119 | 122 | |
120 | 123 | function __call($method, $arguments) |
@@ -124,10 +127,11 @@ discard block |
||
124 | 127 | switch (count($arguments)) |
125 | 128 | { |
126 | 129 | case 1: |
127 | - if (is_integer($arguments[0])) |
|
128 | - return call_user_func([$this, '_error'], array_shift($arguments)); |
|
129 | - else |
|
130 | - return call_user_func([$this, '_error'], null, array_shift($arguments)); |
|
130 | + if (is_integer($arguments[0])) { |
|
131 | + return call_user_func([$this, '_error'], array_shift($arguments)); |
|
132 | + } else { |
|
133 | + return call_user_func([$this, '_error'], null, array_shift($arguments)); |
|
134 | + } |
|
131 | 135 | break; |
132 | 136 | case 2: |
133 | 137 | return call_user_func([$this, '_error'], $arguments[0], $arguments[1]); |
@@ -304,7 +304,7 @@ |
||
304 | 304 | { |
305 | 305 | foreach ($validator->getMessages() as $message) |
306 | 306 | { |
307 | - $this->error($label ."-~-". (count($this->getErrors()) + 1), $message); |
|
307 | + $this->error($label . "-~-" . (count($this->getErrors()) + 1), $message); |
|
308 | 308 | } |
309 | 309 | } |
310 | 310 | } |
@@ -69,9 +69,10 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function isValid() |
71 | 71 | { |
72 | - if (is_null($this->valid)) |
|
73 | - # This error is thrown because of 'setValid' method has not been executed. |
|
72 | + if (is_null($this->valid)) { |
|
73 | + # This error is thrown because of 'setValid' method has not been executed. |
|
74 | 74 | throw new \LogicException('No validation has been executed!'); |
75 | + } |
|
75 | 76 | |
76 | 77 | return $this->valid; |
77 | 78 | } |
@@ -98,8 +99,9 @@ discard block |
||
98 | 99 | { |
99 | 100 | $this->form = $form; |
100 | 101 | |
101 | - if (is_null($locale)) |
|
102 | - $locale = 'en'; |
|
102 | + if (is_null($locale)) { |
|
103 | + $locale = 'en'; |
|
104 | + } |
|
103 | 105 | |
104 | 106 | $i18nTranslator = \Zend\I18n\Translator\Translator::factory( |
105 | 107 | [ |
@@ -133,8 +135,9 @@ discard block |
||
133 | 135 | |
134 | 136 | foreach ($elements as $label => $element) |
135 | 137 | { |
136 | - if (!$element->isFormControl()) |
|
137 | - continue; |
|
138 | + if (!$element->isFormControl()) { |
|
139 | + continue; |
|
140 | + } |
|
138 | 141 | |
139 | 142 | $attribs = $element->getAttributes(); |
140 | 143 | |
@@ -203,19 +206,21 @@ discard block |
||
203 | 206 | |
204 | 207 | case 'min': |
205 | 208 | |
206 | - if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) |
|
207 | - $validator = new GreaterThan(['min' => $value, 'inclusive' => true]); |
|
208 | - else |
|
209 | - throw new \LogicException("The input type must be 'range' or 'number'"); |
|
209 | + if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) { |
|
210 | + $validator = new GreaterThan(['min' => $value, 'inclusive' => true]); |
|
211 | + } else { |
|
212 | + throw new \LogicException("The input type must be 'range' or 'number'"); |
|
213 | + } |
|
210 | 214 | |
211 | 215 | break; |
212 | 216 | |
213 | 217 | case 'max': |
214 | 218 | |
215 | - if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) |
|
216 | - $validator = new LessThan(['max' => $value, 'inclusive' => true]); |
|
217 | - else |
|
218 | - throw new \LogicException("The input type must be 'range' or 'number'"); |
|
219 | + if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) { |
|
220 | + $validator = new LessThan(['max' => $value, 'inclusive' => true]); |
|
221 | + } else { |
|
222 | + throw new \LogicException("The input type must be 'range' or 'number'"); |
|
223 | + } |
|
219 | 224 | |
220 | 225 | break; |
221 | 226 | |
@@ -223,17 +228,19 @@ discard block |
||
223 | 228 | |
224 | 229 | $baseValue = (array_key_exists('min', $all_attribs)) ? $all_attribs['min'] : 0; |
225 | 230 | |
226 | - if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['range'])) |
|
227 | - $validator = new Step(['baseValue' => $baseValue, 'step' => $value]); |
|
228 | - else |
|
229 | - throw new \LogicException("The input type must be 'range'"); |
|
231 | + if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['range'])) { |
|
232 | + $validator = new Step(['baseValue' => $baseValue, 'step' => $value]); |
|
233 | + } else { |
|
234 | + throw new \LogicException("The input type must be 'range'"); |
|
235 | + } |
|
230 | 236 | |
231 | 237 | break; |
232 | 238 | |
233 | 239 | case 'data-validators': |
234 | 240 | |
235 | - if (!is_array($value)) |
|
236 | - throw new \InvalidArgumentException("Invalid type given. Array expected in 'data-validators' attribute."); |
|
241 | + if (!is_array($value)) { |
|
242 | + throw new \InvalidArgumentException("Invalid type given. Array expected in 'data-validators' attribute."); |
|
243 | + } |
|
237 | 244 | |
238 | 245 | foreach ($value as $class => $params) |
239 | 246 | { |
@@ -243,8 +250,9 @@ discard block |
||
243 | 250 | { |
244 | 251 | $className = "\Zend\I18n\Validator\\" . $class; |
245 | 252 | |
246 | - if (!class_exists($className)) |
|
247 | - throw new \RuntimeException("The class '$userInputClass' or '$className' does not exists"); |
|
253 | + if (!class_exists($className)) { |
|
254 | + throw new \RuntimeException("The class '$userInputClass' or '$className' does not exists"); |
|
255 | + } |
|
248 | 256 | } |
249 | 257 | |
250 | 258 | $validator = new $className($params); |
@@ -291,8 +299,9 @@ discard block |
||
291 | 299 | $v->setTranslator($this->translator); |
292 | 300 | $notEmpty = $v->isValid($val); |
293 | 301 | |
294 | - if (!$required && !$notEmpty) |
|
295 | - return null; |
|
302 | + if (!$required && !$notEmpty) { |
|
303 | + return null; |
|
304 | + } |
|
296 | 305 | |
297 | 306 | $valid = $validator->isValid($val); |
298 | 307 | $this->setValid($valid); |
@@ -304,8 +313,7 @@ discard block |
||
304 | 313 | $this->error($label ."-~-". (count($this->getErrors()) + 1), $message); |
305 | 314 | } |
306 | 315 | } |
307 | - } |
|
308 | - else |
|
316 | + } else |
|
309 | 317 | { |
310 | 318 | foreach ($form_value as $val) |
311 | 319 | { |
@@ -330,8 +338,9 @@ discard block |
||
330 | 338 | $errorLbl = explode("-~-", $key); |
331 | 339 | $label = array_shift($errorLbl); |
332 | 340 | |
333 | - if (!array_key_exists($label, $errors)) |
|
334 | - $errors[$label] = []; |
|
341 | + if (!array_key_exists($label, $errors)) { |
|
342 | + $errors[$label] = []; |
|
343 | + } |
|
335 | 344 | |
336 | 345 | $errors[$label][] = $value; |
337 | 346 | } |