@@ -17,37 +17,37 @@ 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 | * Validator constructor. |
@@ -75,11 +75,11 @@ discard block |
||
| 75 | 75 | { |
| 76 | 76 | $name = self::formatRuleName($name); |
| 77 | 77 | |
| 78 | - self::$extensions[$name] = $callback; |
|
| 78 | + self::$extensions[ $name ] = $callback; |
|
| 79 | 79 | |
| 80 | - $isForce && self::$forceRules[] = $name; |
|
| 80 | + $isForce && self::$forceRules[ ] = $name; |
|
| 81 | 81 | |
| 82 | - !empty($message) && (static::$extensionMessageTemplates[$name] = $message); |
|
| 82 | + !empty($message) && (static::$extensionMessageTemplates[ $name ] = $message); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
@@ -92,14 +92,14 @@ discard block |
||
| 92 | 92 | $value = $this->getField($field); |
| 93 | 93 | foreach ($rules as $rule => $parameters) { |
| 94 | 94 | if (!$this->runValidateRule($field, $value, $rule, $parameters)) { |
| 95 | - $this->messages[$field][$rule] = $this->buildFailMessage($rule, $field, $parameters); |
|
| 95 | + $this->messages[ $field ][ $rule ] = $this->buildFailMessage($rule, $field, $parameters); |
|
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } elseif ($forceRules = array_intersect(self::$forceRules, array_keys($rules))) { |
| 99 | 99 | $value = null; |
| 100 | 100 | foreach ($forceRules as $rule) { |
| 101 | - if (!$this->runValidateRule($field, null, $rule, $rules[$rule])) { |
|
| 102 | - $this->messages[$field][$rule] = $this->buildFailMessage($rule, $field, $rules[$rule]); |
|
| 101 | + if (!$this->runValidateRule($field, null, $rule, $rules[ $rule ])) { |
|
| 102 | + $this->messages[ $field ][ $rule ] = $this->buildFailMessage($rule, $field, $rules[ $rule ]); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -137,13 +137,13 @@ discard block |
||
| 137 | 137 | */ |
| 138 | 138 | protected function parseRules(array $ruleGroups) |
| 139 | 139 | { |
| 140 | - $map = []; |
|
| 140 | + $map = [ ]; |
|
| 141 | 141 | foreach ($ruleGroups as $field => $rules) { |
| 142 | 142 | foreach (explode('|', $rules) as $rule) { |
| 143 | 143 | list($rule, $parameters) = explode(':', (false === strpos($rule, ':') ? ($rule.':') : $rule), 2); |
| 144 | - !isset($map[$rule]) && $map[$rule] = self::formatRuleName($rule); |
|
| 145 | - $rule = $map[$rule]; |
|
| 146 | - $this->ruleGroups[$field][$rule] = ('' === $parameters ? [] : explode(',', $parameters)); |
|
| 144 | + !isset($map[ $rule ]) && $map[ $rule ] = self::formatRuleName($rule); |
|
| 145 | + $rule = $map[ $rule ]; |
|
| 146 | + $this->ruleGroups[ $field ][ $rule ] = ('' === $parameters ? [ ] : explode(',', $parameters)); |
|
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | unset($map); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | return implode( |
| 160 | 160 | '', |
| 161 | 161 | array_map( |
| 162 | - function ($value) { |
|
| 162 | + function($value) { |
|
| 163 | 163 | return ucfirst($value); |
| 164 | 164 | }, |
| 165 | 165 | explode('_', $name) |
@@ -179,13 +179,13 @@ discard block |
||
| 179 | 179 | if (!array_key_exists($item, $this->data)) { |
| 180 | 180 | return false; |
| 181 | 181 | } |
| 182 | - $value = $this->data[$item]; |
|
| 182 | + $value = $this->data[ $item ]; |
|
| 183 | 183 | |
| 184 | 184 | foreach ($field as $item) { |
| 185 | 185 | if (!array_key_exists($item, $value)) { |
| 186 | 186 | return false; |
| 187 | 187 | } |
| 188 | - $value = $value[$item]; |
|
| 188 | + $value = $value[ $item ]; |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | return true; |
@@ -200,9 +200,9 @@ discard block |
||
| 200 | 200 | { |
| 201 | 201 | $field = explode('.', $field); |
| 202 | 202 | $item = array_shift($field); |
| 203 | - $value = $this->data[$item]; |
|
| 203 | + $value = $this->data[ $item ]; |
|
| 204 | 204 | foreach ($field as $item) { |
| 205 | - $value = $value[$item]; |
|
| 205 | + $value = $value[ $item ]; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | return $value; |
@@ -216,10 +216,10 @@ discard block |
||
| 216 | 216 | * |
| 217 | 217 | * @return bool |
| 218 | 218 | */ |
| 219 | - protected function runValidateRule($field, $value, $rule, array $parameters = []) |
|
| 219 | + protected function runValidateRule($field, $value, $rule, array $parameters = [ ]) |
|
| 220 | 220 | { |
| 221 | 221 | if (array_key_exists($rule, self::$extensions)) { |
| 222 | - $callback = self::$extensions[$rule]; |
|
| 222 | + $callback = self::$extensions[ $rule ]; |
|
| 223 | 223 | if ($callback instanceof Closure) { |
| 224 | 224 | $callback = $callback->bindTo($this, $this); |
| 225 | 225 | } |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | return (bool) call_user_func($callback, $field, $value, $parameters); |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - return (bool) call_user_func([$this, "validate{$rule}"], $field, $value, $parameters); |
|
| 230 | + return (bool) call_user_func([ $this, "validate{$rule}" ], $field, $value, $parameters); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
@@ -237,12 +237,12 @@ discard block |
||
| 237 | 237 | * |
| 238 | 238 | * @return string |
| 239 | 239 | */ |
| 240 | - protected function buildFailMessage($rule, $field, array $parameters = []) |
|
| 240 | + protected function buildFailMessage($rule, $field, array $parameters = [ ]) |
|
| 241 | 241 | { |
| 242 | - if (!isset($this->messageTemplates[$rule])) { |
|
| 242 | + if (!isset($this->messageTemplates[ $rule ])) { |
|
| 243 | 243 | return "{$field} field check failed"; |
| 244 | 244 | } |
| 245 | - array_unshift($parameters, "{$field} {$this->messageTemplates[$rule]}"); |
|
| 245 | + array_unshift($parameters, "{$field} {$this->messageTemplates[ $rule ]}"); |
|
| 246 | 246 | |
| 247 | 247 | try { |
| 248 | 248 | return call_user_func_array('sprintf', $parameters); |
@@ -258,9 +258,9 @@ discard block |
||
| 258 | 258 | * |
| 259 | 259 | * @return bool |
| 260 | 260 | */ |
| 261 | - protected function validateAccept($field, $value, array $parameters = []) |
|
| 261 | + protected function validateAccept($field, $value, array $parameters = [ ]) |
|
| 262 | 262 | { |
| 263 | - return in_array(strtolower($value), ['yes', 'on', '1', 1, true], true); |
|
| 263 | + return in_array(strtolower($value), [ 'yes', 'on', '1', 1, true ], true); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | * |
| 271 | 271 | * @return bool |
| 272 | 272 | */ |
| 273 | - protected function validateNumeric($field, $value, array $parameters = []) |
|
| 273 | + protected function validateNumeric($field, $value, array $parameters = [ ]) |
|
| 274 | 274 | { |
| 275 | 275 | return false !== filter_var($value, FILTER_VALIDATE_INT) || false !== filter_var($value, FILTER_VALIDATE_FLOAT); |
| 276 | 276 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * |
| 283 | 283 | * @return bool |
| 284 | 284 | */ |
| 285 | - protected function validateInteger($field, $value, array $parameters = []) |
|
| 285 | + protected function validateInteger($field, $value, array $parameters = [ ]) |
|
| 286 | 286 | { |
| 287 | 287 | return false !== filter_var($value, FILTER_VALIDATE_INT); |
| 288 | 288 | } |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | * |
| 295 | 295 | * @return bool |
| 296 | 296 | */ |
| 297 | - protected function validateFloat($field, $value, array $parameters = []) |
|
| 297 | + protected function validateFloat($field, $value, array $parameters = [ ]) |
|
| 298 | 298 | { |
| 299 | 299 | return false !== filter_var($value, FILTER_VALIDATE_FLOAT); |
| 300 | 300 | } |
@@ -308,8 +308,8 @@ discard block |
||
| 308 | 308 | */ |
| 309 | 309 | protected function validateSize($field, $value, array $parameters) |
| 310 | 310 | { |
| 311 | - $size = filter_var($parameters[0], FILTER_VALIDATE_INT); |
|
| 312 | - false === $size && $size = filter_var($parameters[0], FILTER_VALIDATE_FLOAT); |
|
| 311 | + $size = filter_var($parameters[ 0 ], FILTER_VALIDATE_INT); |
|
| 312 | + false === $size && $size = filter_var($parameters[ 0 ], FILTER_VALIDATE_FLOAT); |
|
| 313 | 313 | |
| 314 | 314 | return $this->getSize($field, $value) === $size; |
| 315 | 315 | } |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | * |
| 322 | 322 | * @return bool |
| 323 | 323 | */ |
| 324 | - protected function validateUrl($field, $value, array $parameters = []) |
|
| 324 | + protected function validateUrl($field, $value, array $parameters = [ ]) |
|
| 325 | 325 | { |
| 326 | 326 | return false !== filter_var($value, FILTER_VALIDATE_URL); |
| 327 | 327 | } |
@@ -333,9 +333,9 @@ discard block |
||
| 333 | 333 | * |
| 334 | 334 | * @return bool |
| 335 | 335 | */ |
| 336 | - protected function validateBoolean($field, $value, array $parameters = []) |
|
| 336 | + protected function validateBoolean($field, $value, array $parameters = [ ]) |
|
| 337 | 337 | { |
| 338 | - return in_array($value, [true, false, 0, 1, '0', '1'], true); |
|
| 338 | + return in_array($value, [ true, false, 0, 1, '0', '1' ], true); |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | /** |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | */ |
| 348 | 348 | protected function validateConfirm($field, $value, array $parameters) |
| 349 | 349 | { |
| 350 | - return $value === $this->data[$parameters[0]]; |
|
| 350 | + return $value === $this->data[ $parameters[ 0 ] ]; |
|
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | /** |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | * |
| 358 | 358 | * @return bool |
| 359 | 359 | */ |
| 360 | - protected function validateDate($field, $value, array $parameters = []) |
|
| 360 | + protected function validateDate($field, $value, array $parameters = [ ]) |
|
| 361 | 361 | { |
| 362 | 362 | return false !== strtotime($value); |
| 363 | 363 | } |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | * |
| 372 | 372 | * @return bool |
| 373 | 373 | */ |
| 374 | - protected function validateEmail($field, $value, array $parameters = []) |
|
| 374 | + protected function validateEmail($field, $value, array $parameters = [ ]) |
|
| 375 | 375 | { |
| 376 | 376 | return false !== filter_var($value, FILTER_VALIDATE_EMAIL); |
| 377 | 377 | } |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | * |
| 384 | 384 | * @return bool |
| 385 | 385 | */ |
| 386 | - protected function validateRequired($field, $value, array $parameters = []) |
|
| 386 | + protected function validateRequired($field, $value, array $parameters = [ ]) |
|
| 387 | 387 | { |
| 388 | 388 | return !is_null($value); |
| 389 | 389 | } |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | */ |
| 398 | 398 | protected function validateRequiredWith($field, $value, array $parameters) |
| 399 | 399 | { |
| 400 | - return !is_null($value) || !array_key_exists($parameters[0], $this->data); |
|
| 400 | + return !is_null($value) || !array_key_exists($parameters[ 0 ], $this->data); |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | */ |
| 410 | 410 | protected function validateRequiredWithout($field, $value, array $parameters) |
| 411 | 411 | { |
| 412 | - return !is_null($value) || array_key_exists($parameters[0], $this->data); |
|
| 412 | + return !is_null($value) || array_key_exists($parameters[ 0 ], $this->data); |
|
| 413 | 413 | } |
| 414 | 414 | |
| 415 | 415 | /** |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | $otherField = array_shift($parameters); |
| 425 | 425 | |
| 426 | 426 | return !is_null($value) || ( |
| 427 | - !array_key_exists($otherField, $this->data) || false === array_search($this->data[$otherField], $parameters) |
|
| 427 | + !array_key_exists($otherField, $this->data) || false === array_search($this->data[ $otherField ], $parameters) |
|
| 428 | 428 | ); |
| 429 | 429 | } |
| 430 | 430 | |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | $otherField = array_shift($parameters); |
| 441 | 441 | |
| 442 | 442 | return !is_null($value) || ( |
| 443 | - !array_key_exists($otherField, $this->data) || false !== array_search($this->data[$otherField], $parameters) |
|
| 443 | + !array_key_exists($otherField, $this->data) || false !== array_search($this->data[ $otherField ], $parameters) |
|
| 444 | 444 | ); |
| 445 | 445 | } |
| 446 | 446 | |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | * |
| 452 | 452 | * @return bool |
| 453 | 453 | */ |
| 454 | - protected function validateArray($field, $value, array $parameters = []) |
|
| 454 | + protected function validateArray($field, $value, array $parameters = [ ]) |
|
| 455 | 455 | { |
| 456 | 456 | return is_array($value); |
| 457 | 457 | } |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | * |
| 464 | 464 | * @return bool |
| 465 | 465 | */ |
| 466 | - protected function validateString($field, $value, array $parameteres = []) |
|
| 466 | + protected function validateString($field, $value, array $parameteres = [ ]) |
|
| 467 | 467 | { |
| 468 | 468 | return is_string($value); |
| 469 | 469 | } |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | * |
| 476 | 476 | * @return bool |
| 477 | 477 | */ |
| 478 | - protected function validateNullable($field, $value, array $parameters = []) |
|
| 478 | + protected function validateNullable($field, $value, array $parameters = [ ]) |
|
| 479 | 479 | { |
| 480 | 480 | return true; |
| 481 | 481 | } |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | */ |
| 490 | 490 | protected function validateMin($field, $value, array $parameters) |
| 491 | 491 | { |
| 492 | - return $this->getSize($field, $value) >= $parameters[0]; |
|
| 492 | + return $this->getSize($field, $value) >= $parameters[ 0 ]; |
|
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | /** |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | */ |
| 502 | 502 | protected function validateMax($field, $value, array $parameters) |
| 503 | 503 | { |
| 504 | - return $this->getSize($field, $value) <= $parameters[0]; |
|
| 504 | + return $this->getSize($field, $value) <= $parameters[ 0 ]; |
|
| 505 | 505 | } |
| 506 | 506 | |
| 507 | 507 | /** |
@@ -514,25 +514,25 @@ discard block |
||
| 514 | 514 | protected function validateRange($field, $value, array $parameters) |
| 515 | 515 | { |
| 516 | 516 | $size = $this->getSize($field, $value); |
| 517 | - if (!isset($parameters[0])) { |
|
| 517 | + if (!isset($parameters[ 0 ])) { |
|
| 518 | 518 | return false; |
| 519 | 519 | } |
| 520 | - if (isset($parameters[1])) { |
|
| 521 | - if ('' === $parameters[0]) { |
|
| 522 | - if ('' === $parameters[1]) { |
|
| 520 | + if (isset($parameters[ 1 ])) { |
|
| 521 | + if ('' === $parameters[ 0 ]) { |
|
| 522 | + if ('' === $parameters[ 1 ]) { |
|
| 523 | 523 | return false; |
| 524 | 524 | } |
| 525 | 525 | |
| 526 | - return $size <= $parameters[1]; |
|
| 526 | + return $size <= $parameters[ 1 ]; |
|
| 527 | 527 | } |
| 528 | - if ('' === $parameters[1]) { |
|
| 529 | - return $size >= $parameters[0]; |
|
| 528 | + if ('' === $parameters[ 1 ]) { |
|
| 529 | + return $size >= $parameters[ 0 ]; |
|
| 530 | 530 | } |
| 531 | 531 | |
| 532 | - return $size >= $parameters[0] && $size <= $parameters[1]; |
|
| 532 | + return $size >= $parameters[ 0 ] && $size <= $parameters[ 1 ]; |
|
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - return '' === $parameters[0] ? false : ($size >= $parameters[0]); |
|
| 535 | + return '' === $parameters[ 0 ] ? false : ($size >= $parameters[ 0 ]); |
|
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | /** |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | protected function validateRegex($field, $value, array $parameters) |
| 546 | 546 | { |
| 547 | - return (bool) preg_match($parameters[0], $value); |
|
| 547 | + return (bool) preg_match($parameters[ 0 ], $value); |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /** |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | * |
| 567 | 567 | * @return bool |
| 568 | 568 | */ |
| 569 | - protected function validateIp($field, $value, array $parameters = []) |
|
| 569 | + protected function validateIp($field, $value, array $parameters = [ ]) |
|
| 570 | 570 | { |
| 571 | 571 | return false !== filter_var($value, FILTER_VALIDATE_IP); |
| 572 | 572 | } |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | */ |
| 581 | 581 | protected function validateDateFormat($field, $value, array $parameters) |
| 582 | 582 | { |
| 583 | - return !(bool) date_parse_from_format($parameters[0], $value)['error_count']; |
|
| 583 | + return !(bool) date_parse_from_format($parameters[ 0 ], $value)[ 'error_count' ]; |
|
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | /** |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | */ |
| 593 | 593 | protected function validateDateBefore($field, $value, array $parameters) |
| 594 | 594 | { |
| 595 | - return strtotime($value) < strtotime($parameters[0]); |
|
| 595 | + return strtotime($value) < strtotime($parameters[ 0 ]); |
|
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | /** |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | */ |
| 605 | 605 | protected function validateDateAfter($field, $value, array $parameters) |
| 606 | 606 | { |
| 607 | - return strtotime($value) > strtotime($parameters[0]); |
|
| 607 | + return strtotime($value) > strtotime($parameters[ 0 ]); |
|
| 608 | 608 | } |
| 609 | 609 | |
| 610 | 610 | /** |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | { |
| 631 | 631 | $specifyField = array_shift($parameters); |
| 632 | 632 | |
| 633 | - return array_key_exists($specifyField, $this->data) && $value !== $this->data[$specifyField]; |
|
| 633 | + return array_key_exists($specifyField, $this->data) && $value !== $this->data[ $specifyField ]; |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | /** |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | protected function getSize($field, $value) |
| 643 | 643 | { |
| 644 | 644 | switch (true) { |
| 645 | - case isset($this->ruleGroups[$field]['String']) && is_string($value): |
|
| 645 | + case isset($this->ruleGroups[ $field ][ 'String' ]) && is_string($value): |
|
| 646 | 646 | return strlen($value); |
| 647 | 647 | case is_array($value): |
| 648 | 648 | return count($value); |