@@ -17,42 +17,42 @@ discard block |
||
17 | 17 | /** |
18 | 18 | * @var array |
19 | 19 | */ |
20 | - protected $data = []; |
|
20 | + protected $data = [ ]; |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * @var array |
24 | 24 | */ |
25 | - protected $ruleGroups = []; |
|
25 | + protected $ruleGroups = [ ]; |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * @var array |
29 | 29 | */ |
30 | - protected $messages = []; |
|
30 | + protected $messages = [ ]; |
|
31 | 31 | |
32 | 32 | /** |
33 | 33 | * @var array |
34 | 34 | */ |
35 | - protected static $forceRules = ['Required', 'RequiredIf', 'RequiredWith', 'RequiredUnless', 'RequiredWithout']; |
|
35 | + protected static $forceRules = [ 'Required', 'RequiredIf', 'RequiredWith', 'RequiredUnless', 'RequiredWithout' ]; |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * @var array |
39 | 39 | */ |
40 | - protected $messageTemplates = []; |
|
40 | + protected $messageTemplates = [ ]; |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @var array |
44 | 44 | */ |
45 | - protected static $extensions = []; |
|
45 | + protected static $extensions = [ ]; |
|
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @var array |
49 | 49 | */ |
50 | - protected static $extensionMessageTemplates = []; |
|
50 | + protected static $extensionMessageTemplates = [ ]; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * @var array |
54 | 54 | */ |
55 | - protected static $initialMessageTemplates = []; |
|
55 | + protected static $initialMessageTemplates = [ ]; |
|
56 | 56 | |
57 | 57 | /** |
58 | 58 | * Validator constructor. |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * @param array $ruleGroups |
62 | 62 | * @param array $messageTemplates |
63 | 63 | */ |
64 | - public function __construct(array $data, array $ruleGroups, array $messageTemplates = []) |
|
64 | + public function __construct(array $data, array $ruleGroups, array $messageTemplates = [ ]) |
|
65 | 65 | { |
66 | 66 | $this->data = $data; |
67 | 67 | $this->parseRules($ruleGroups); |
@@ -78,11 +78,11 @@ discard block |
||
78 | 78 | { |
79 | 79 | $name = self::formatRuleName($name); |
80 | 80 | |
81 | - self::$extensions[$name] = $callback; |
|
81 | + self::$extensions[ $name ] = $callback; |
|
82 | 82 | |
83 | - $isForce && self::$forceRules[] = $name; |
|
83 | + $isForce && self::$forceRules[ ] = $name; |
|
84 | 84 | |
85 | - !empty($message) && (static::$extensionMessageTemplates[$name] = $message); |
|
85 | + !empty($message) && (static::$extensionMessageTemplates[ $name ] = $message); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -95,14 +95,14 @@ discard block |
||
95 | 95 | $value = $this->getField($field); |
96 | 96 | foreach ($rules as $rule => $parameters) { |
97 | 97 | if (!$this->runValidateRule($field, $value, $rule, $parameters)) { |
98 | - $this->messages[$field][$rule] = $this->buildFailMessage($rule, $field, $parameters); |
|
98 | + $this->messages[ $field ][ $rule ] = $this->buildFailMessage($rule, $field, $parameters); |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | } elseif ($forceRules = array_intersect(self::$forceRules, array_keys($rules))) { |
102 | 102 | $value = null; |
103 | 103 | foreach ($forceRules as $rule) { |
104 | - if (!$this->runValidateRule($field, null, $rule, $rules[$rule])) { |
|
105 | - $this->messages[$field][$rule] = $this->buildFailMessage($rule, $field, $rules[$rule]); |
|
104 | + if (!$this->runValidateRule($field, null, $rule, $rules[ $rule ])) { |
|
105 | + $this->messages[ $field ][ $rule ] = $this->buildFailMessage($rule, $field, $rules[ $rule ]); |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | /** |
139 | 139 | * @param array $messages |
140 | 140 | */ |
141 | - protected function createMessageTemplates(array $messages = []) |
|
141 | + protected function createMessageTemplates(array $messages = [ ]) |
|
142 | 142 | { |
143 | 143 | if (empty(self::$initialMessageTemplates)) { |
144 | 144 | self::$initialMessageTemplates = require __DIR__.'/message.php'; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $this->messageTemplates = array_merge(self::$initialMessageTemplates, self::$extensionMessageTemplates); |
148 | 148 | |
149 | 149 | foreach ($messages as $rule => $message) { |
150 | - $this->messageTemplates[self::formatRuleName($rule)] = $message; |
|
150 | + $this->messageTemplates[ self::formatRuleName($rule) ] = $message; |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
@@ -156,13 +156,13 @@ discard block |
||
156 | 156 | */ |
157 | 157 | protected function parseRules(array $ruleGroups) |
158 | 158 | { |
159 | - $map = []; |
|
159 | + $map = [ ]; |
|
160 | 160 | foreach ($ruleGroups as $field => $rules) { |
161 | 161 | foreach (explode('|', $rules) as $rule) { |
162 | 162 | list($rule, $parameters) = explode(':', (false === strpos($rule, ':') ? ($rule.':') : $rule), 2); |
163 | - !isset($map[$rule]) && $map[$rule] = self::formatRuleName($rule); |
|
164 | - $rule = $map[$rule]; |
|
165 | - $this->ruleGroups[$field][$rule] = ('' === $parameters ? [] : explode(',', $parameters)); |
|
163 | + !isset($map[ $rule ]) && $map[ $rule ] = self::formatRuleName($rule); |
|
164 | + $rule = $map[ $rule ]; |
|
165 | + $this->ruleGroups[ $field ][ $rule ] = ('' === $parameters ? [ ] : explode(',', $parameters)); |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | unset($map); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | return implode( |
179 | 179 | '', |
180 | 180 | array_map( |
181 | - function ($value) { |
|
181 | + function($value) { |
|
182 | 182 | return ucfirst($value); |
183 | 183 | }, |
184 | 184 | explode('_', $name) |
@@ -198,13 +198,13 @@ discard block |
||
198 | 198 | if (!array_key_exists($item, $this->data)) { |
199 | 199 | return false; |
200 | 200 | } |
201 | - $value = $this->data[$item]; |
|
201 | + $value = $this->data[ $item ]; |
|
202 | 202 | |
203 | 203 | foreach ($field as $item) { |
204 | 204 | if (!array_key_exists($item, $value)) { |
205 | 205 | return false; |
206 | 206 | } |
207 | - $value = $value[$item]; |
|
207 | + $value = $value[ $item ]; |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | return true; |
@@ -219,9 +219,9 @@ discard block |
||
219 | 219 | { |
220 | 220 | $field = explode('.', $field); |
221 | 221 | $item = array_shift($field); |
222 | - $value = $this->data[$item]; |
|
222 | + $value = $this->data[ $item ]; |
|
223 | 223 | foreach ($field as $item) { |
224 | - $value = $value[$item]; |
|
224 | + $value = $value[ $item ]; |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | return $value; |
@@ -235,10 +235,10 @@ discard block |
||
235 | 235 | * |
236 | 236 | * @return bool |
237 | 237 | */ |
238 | - protected function runValidateRule($field, $value, $rule, array $parameters = []) |
|
238 | + protected function runValidateRule($field, $value, $rule, array $parameters = [ ]) |
|
239 | 239 | { |
240 | 240 | if (array_key_exists($rule, self::$extensions)) { |
241 | - $callback = self::$extensions[$rule]; |
|
241 | + $callback = self::$extensions[ $rule ]; |
|
242 | 242 | if ($callback instanceof Closure) { |
243 | 243 | $callback = $callback->bindTo($this, $this); |
244 | 244 | } |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | return (bool) call_user_func($callback, $field, $value, $parameters); |
247 | 247 | } |
248 | 248 | |
249 | - return (bool) call_user_func([$this, "validate{$rule}"], $field, $value, $parameters); |
|
249 | + return (bool) call_user_func([ $this, "validate{$rule}" ], $field, $value, $parameters); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
@@ -256,12 +256,12 @@ discard block |
||
256 | 256 | * |
257 | 257 | * @return string |
258 | 258 | */ |
259 | - protected function buildFailMessage($rule, $field, array $parameters = []) |
|
259 | + protected function buildFailMessage($rule, $field, array $parameters = [ ]) |
|
260 | 260 | { |
261 | - if (!isset($this->messageTemplates[$rule])) { |
|
261 | + if (!isset($this->messageTemplates[ $rule ])) { |
|
262 | 262 | return "{$field} field check failed"; |
263 | 263 | } |
264 | - array_unshift($parameters, "{$field} {$this->messageTemplates[$rule]}"); |
|
264 | + array_unshift($parameters, "{$field} {$this->messageTemplates[ $rule ]}"); |
|
265 | 265 | |
266 | 266 | try { |
267 | 267 | return call_user_func_array('sprintf', $parameters); |
@@ -277,9 +277,9 @@ discard block |
||
277 | 277 | * |
278 | 278 | * @return bool |
279 | 279 | */ |
280 | - protected function validateAccept($field, $value, array $parameters = []) |
|
280 | + protected function validateAccept($field, $value, array $parameters = [ ]) |
|
281 | 281 | { |
282 | - return in_array(strtolower($value), ['yes', 'on', '1', 1, true], true); |
|
282 | + return in_array(strtolower($value), [ 'yes', 'on', '1', 1, true ], true); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | /** |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | * |
290 | 290 | * @return bool |
291 | 291 | */ |
292 | - protected function validateNumeric($field, $value, array $parameters = []) |
|
292 | + protected function validateNumeric($field, $value, array $parameters = [ ]) |
|
293 | 293 | { |
294 | 294 | return false !== filter_var($value, FILTER_VALIDATE_INT) || false !== filter_var($value, FILTER_VALIDATE_FLOAT); |
295 | 295 | } |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * |
302 | 302 | * @return bool |
303 | 303 | */ |
304 | - protected function validateInteger($field, $value, array $parameters = []) |
|
304 | + protected function validateInteger($field, $value, array $parameters = [ ]) |
|
305 | 305 | { |
306 | 306 | return false !== filter_var($value, FILTER_VALIDATE_INT); |
307 | 307 | } |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | * |
314 | 314 | * @return bool |
315 | 315 | */ |
316 | - protected function validateFloat($field, $value, array $parameters = []) |
|
316 | + protected function validateFloat($field, $value, array $parameters = [ ]) |
|
317 | 317 | { |
318 | 318 | return false !== filter_var($value, FILTER_VALIDATE_FLOAT); |
319 | 319 | } |
@@ -327,8 +327,8 @@ discard block |
||
327 | 327 | */ |
328 | 328 | protected function validateSize($field, $value, array $parameters) |
329 | 329 | { |
330 | - $size = filter_var($parameters[0], FILTER_VALIDATE_INT); |
|
331 | - false === $size && $size = filter_var($parameters[0], FILTER_VALIDATE_FLOAT); |
|
330 | + $size = filter_var($parameters[ 0 ], FILTER_VALIDATE_INT); |
|
331 | + false === $size && $size = filter_var($parameters[ 0 ], FILTER_VALIDATE_FLOAT); |
|
332 | 332 | |
333 | 333 | return $this->getSize($field, $value) === $size; |
334 | 334 | } |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | * |
341 | 341 | * @return bool |
342 | 342 | */ |
343 | - protected function validateUrl($field, $value, array $parameters = []) |
|
343 | + protected function validateUrl($field, $value, array $parameters = [ ]) |
|
344 | 344 | { |
345 | 345 | return false !== filter_var($value, FILTER_VALIDATE_URL); |
346 | 346 | } |
@@ -352,9 +352,9 @@ discard block |
||
352 | 352 | * |
353 | 353 | * @return bool |
354 | 354 | */ |
355 | - protected function validateBoolean($field, $value, array $parameters = []) |
|
355 | + protected function validateBoolean($field, $value, array $parameters = [ ]) |
|
356 | 356 | { |
357 | - return in_array($value, [true, false, 0, 1, '0', '1'], true); |
|
357 | + return in_array($value, [ true, false, 0, 1, '0', '1' ], true); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | /** |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | */ |
367 | 367 | protected function validateConfirm($field, $value, array $parameters) |
368 | 368 | { |
369 | - return $value === $this->data[$parameters[0]]; |
|
369 | + return $value === $this->data[ $parameters[ 0 ] ]; |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | /** |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | * |
377 | 377 | * @return bool |
378 | 378 | */ |
379 | - protected function validateDate($field, $value, array $parameters = []) |
|
379 | + protected function validateDate($field, $value, array $parameters = [ ]) |
|
380 | 380 | { |
381 | 381 | return false !== strtotime($value); |
382 | 382 | } |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | * |
391 | 391 | * @return bool |
392 | 392 | */ |
393 | - protected function validateEmail($field, $value, array $parameters = []) |
|
393 | + protected function validateEmail($field, $value, array $parameters = [ ]) |
|
394 | 394 | { |
395 | 395 | return false !== filter_var($value, FILTER_VALIDATE_EMAIL); |
396 | 396 | } |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | * |
403 | 403 | * @return bool |
404 | 404 | */ |
405 | - protected function validateRequired($field, $value, array $parameters = []) |
|
405 | + protected function validateRequired($field, $value, array $parameters = [ ]) |
|
406 | 406 | { |
407 | 407 | return !is_null($value); |
408 | 408 | } |
@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | */ |
417 | 417 | protected function validateRequiredWith($field, $value, array $parameters) |
418 | 418 | { |
419 | - return !is_null($value) || !array_key_exists($parameters[0], $this->data); |
|
419 | + return !is_null($value) || !array_key_exists($parameters[ 0 ], $this->data); |
|
420 | 420 | } |
421 | 421 | |
422 | 422 | /** |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | */ |
429 | 429 | protected function validateRequiredWithout($field, $value, array $parameters) |
430 | 430 | { |
431 | - return !is_null($value) || array_key_exists($parameters[0], $this->data); |
|
431 | + return !is_null($value) || array_key_exists($parameters[ 0 ], $this->data); |
|
432 | 432 | } |
433 | 433 | |
434 | 434 | /** |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | $otherField = array_shift($parameters); |
444 | 444 | |
445 | 445 | return !is_null($value) || ( |
446 | - !array_key_exists($otherField, $this->data) || false === array_search($this->data[$otherField], $parameters) |
|
446 | + !array_key_exists($otherField, $this->data) || false === array_search($this->data[ $otherField ], $parameters) |
|
447 | 447 | ); |
448 | 448 | } |
449 | 449 | |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | $otherField = array_shift($parameters); |
460 | 460 | |
461 | 461 | return !is_null($value) || ( |
462 | - !array_key_exists($otherField, $this->data) || false !== array_search($this->data[$otherField], $parameters) |
|
462 | + !array_key_exists($otherField, $this->data) || false !== array_search($this->data[ $otherField ], $parameters) |
|
463 | 463 | ); |
464 | 464 | } |
465 | 465 | |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | * |
471 | 471 | * @return bool |
472 | 472 | */ |
473 | - protected function validateArray($field, $value, array $parameters = []) |
|
473 | + protected function validateArray($field, $value, array $parameters = [ ]) |
|
474 | 474 | { |
475 | 475 | return is_array($value); |
476 | 476 | } |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | * |
483 | 483 | * @return bool |
484 | 484 | */ |
485 | - protected function validateString($field, $value, array $parameteres = []) |
|
485 | + protected function validateString($field, $value, array $parameteres = [ ]) |
|
486 | 486 | { |
487 | 487 | return is_string($value); |
488 | 488 | } |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | * |
495 | 495 | * @return bool |
496 | 496 | */ |
497 | - protected function validateNullable($field, $value, array $parameters = []) |
|
497 | + protected function validateNullable($field, $value, array $parameters = [ ]) |
|
498 | 498 | { |
499 | 499 | return true; |
500 | 500 | } |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | */ |
509 | 509 | protected function validateMin($field, $value, array $parameters) |
510 | 510 | { |
511 | - return $this->getSize($field, $value) >= $parameters[0]; |
|
511 | + return $this->getSize($field, $value) >= $parameters[ 0 ]; |
|
512 | 512 | } |
513 | 513 | |
514 | 514 | /** |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | */ |
521 | 521 | protected function validateMax($field, $value, array $parameters) |
522 | 522 | { |
523 | - return $this->getSize($field, $value) <= $parameters[0]; |
|
523 | + return $this->getSize($field, $value) <= $parameters[ 0 ]; |
|
524 | 524 | } |
525 | 525 | |
526 | 526 | /** |
@@ -533,25 +533,25 @@ discard block |
||
533 | 533 | protected function validateRange($field, $value, array $parameters) |
534 | 534 | { |
535 | 535 | $size = $this->getSize($field, $value); |
536 | - if (!isset($parameters[0])) { |
|
536 | + if (!isset($parameters[ 0 ])) { |
|
537 | 537 | return false; |
538 | 538 | } |
539 | - if (isset($parameters[1])) { |
|
540 | - if ('' === $parameters[0]) { |
|
541 | - if ('' === $parameters[1]) { |
|
539 | + if (isset($parameters[ 1 ])) { |
|
540 | + if ('' === $parameters[ 0 ]) { |
|
541 | + if ('' === $parameters[ 1 ]) { |
|
542 | 542 | return false; |
543 | 543 | } |
544 | 544 | |
545 | - return $size <= $parameters[1]; |
|
545 | + return $size <= $parameters[ 1 ]; |
|
546 | 546 | } |
547 | - if ('' === $parameters[1]) { |
|
548 | - return $size >= $parameters[0]; |
|
547 | + if ('' === $parameters[ 1 ]) { |
|
548 | + return $size >= $parameters[ 0 ]; |
|
549 | 549 | } |
550 | 550 | |
551 | - return $size >= $parameters[0] && $size <= $parameters[1]; |
|
551 | + return $size >= $parameters[ 0 ] && $size <= $parameters[ 1 ]; |
|
552 | 552 | } |
553 | 553 | |
554 | - return '' === $parameters[0] ? false : ($size >= $parameters[0]); |
|
554 | + return '' === $parameters[ 0 ] ? false : ($size >= $parameters[ 0 ]); |
|
555 | 555 | } |
556 | 556 | |
557 | 557 | /** |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | */ |
564 | 564 | protected function validateRegex($field, $value, array $parameters) |
565 | 565 | { |
566 | - return (bool) preg_match($parameters[0], $value); |
|
566 | + return (bool) preg_match($parameters[ 0 ], $value); |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | /** |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | * |
586 | 586 | * @return bool |
587 | 587 | */ |
588 | - protected function validateIp($field, $value, array $parameters = []) |
|
588 | + protected function validateIp($field, $value, array $parameters = [ ]) |
|
589 | 589 | { |
590 | 590 | return false !== filter_var($value, FILTER_VALIDATE_IP); |
591 | 591 | } |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | */ |
600 | 600 | protected function validateDateFormat($field, $value, array $parameters) |
601 | 601 | { |
602 | - return !(bool) date_parse_from_format($parameters[0], $value)['error_count']; |
|
602 | + return !(bool) date_parse_from_format($parameters[ 0 ], $value)[ 'error_count' ]; |
|
603 | 603 | } |
604 | 604 | |
605 | 605 | /** |
@@ -611,7 +611,7 @@ discard block |
||
611 | 611 | */ |
612 | 612 | protected function validateDateBefore($field, $value, array $parameters) |
613 | 613 | { |
614 | - return strtotime($value) < strtotime($parameters[0]); |
|
614 | + return strtotime($value) < strtotime($parameters[ 0 ]); |
|
615 | 615 | } |
616 | 616 | |
617 | 617 | /** |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | */ |
624 | 624 | protected function validateDateAfter($field, $value, array $parameters) |
625 | 625 | { |
626 | - return strtotime($value) > strtotime($parameters[0]); |
|
626 | + return strtotime($value) > strtotime($parameters[ 0 ]); |
|
627 | 627 | } |
628 | 628 | |
629 | 629 | /** |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | { |
650 | 650 | $specifyField = array_shift($parameters); |
651 | 651 | |
652 | - return array_key_exists($specifyField, $this->data) && $value !== $this->data[$specifyField]; |
|
652 | + return array_key_exists($specifyField, $this->data) && $value !== $this->data[ $specifyField ]; |
|
653 | 653 | } |
654 | 654 | |
655 | 655 | /** |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | protected function getSize($field, $value) |
662 | 662 | { |
663 | 663 | switch (true) { |
664 | - case isset($this->ruleGroups[$field]['String']) && is_string($value): |
|
664 | + case isset($this->ruleGroups[ $field ][ 'String' ]) && is_string($value): |
|
665 | 665 | return strlen($value); |
666 | 666 | case is_array($value): |
667 | 667 | return count($value); |