@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $optional |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public function validate( $input = null, $optional = false ) { |
|
| 35 | + public function validate($input = null, $optional = false) { |
|
| 36 | 36 | $v = $this->validator->create(); |
| 37 | - return ( $optional ) |
|
| 38 | - ? $v->optional( $v->create()->alnum() )->validate( $input ) |
|
| 39 | - : $v->alnum()->validate( $input ); |
|
| 37 | + return ($optional) |
|
| 38 | + ? $v->optional($v->create()->alnum())->validate($input) |
|
| 39 | + : $v->alnum()->validate($input); |
|
| 40 | 40 | } |
| 41 | 41 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -32,15 +32,15 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $optional |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public function validate( $input = null, $optional = false ) { |
|
| 35 | + public function validate($input = null, $optional = false) { |
|
| 36 | 36 | $args = func_get_args(); |
| 37 | 37 | $params = $args[2]; |
| 38 | 38 | $start = $params[0]; |
| 39 | 39 | $end = $params[1]; |
| 40 | 40 | |
| 41 | 41 | $v = $this->validator->create(); |
| 42 | - return ( $optional ) |
|
| 43 | - ? $v->optional( $v->create()->between( $start, $end ) )->validate( $input ) |
|
| 44 | - : $v->between( $start, $end )->validate( $input ); |
|
| 42 | + return ($optional) |
|
| 43 | + ? $v->optional($v->create()->between($start, $end))->validate($input) |
|
| 44 | + : $v->between($start, $end)->validate($input); |
|
| 45 | 45 | } |
| 46 | 46 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $optional |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public function validate( $input = null, $optional = false ) { |
|
| 35 | + public function validate($input = null, $optional = false) { |
|
| 36 | 36 | $v = $this->validator->create(); |
| 37 | - return ( $optional ) |
|
| 38 | - ? $v->optional( $v->create()->boolVal() )->validate( $input ) |
|
| 39 | - : $v->boolVal()->validate( $input ); |
|
| 37 | + return ($optional) |
|
| 38 | + ? $v->optional($v->create()->boolVal())->validate($input) |
|
| 39 | + : $v->boolVal()->validate($input); |
|
| 40 | 40 | } |
| 41 | 41 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | * @param bool (optional) $optional |
| 35 | 35 | * @return bool |
| 36 | 36 | */ |
| 37 | - public function validate( $input = null, $optional = false ){ |
|
| 37 | + public function validate($input = null, $optional = false) { |
|
| 38 | 38 | $args = func_get_args(); |
| 39 | 39 | $params = $args[2]; |
| 40 | 40 | $other_field = $params[0]; |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | $v = $this->validator->create(); |
| 44 | 44 | |
| 45 | 45 | return $v->when( |
| 46 | - $v->create()->key( $other_field, $v->create()->notEmpty() ), |
|
| 47 | - $v->create()->key( $field, $v->create()->notEmpty() ), |
|
| 48 | - $v->create()->key( $field, $v->create()->alwaysValid() ) |
|
| 49 | - )->validate( $_POST ); |
|
| 46 | + $v->create()->key($other_field, $v->create()->notEmpty()), |
|
| 47 | + $v->create()->key($field, $v->create()->notEmpty()), |
|
| 48 | + $v->create()->key($field, $v->create()->alwaysValid()) |
|
| 49 | + )->validate($_POST); |
|
| 50 | 50 | } |
| 51 | 51 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Factory; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators; |
| 6 | 6 | |
@@ -27,11 +27,11 @@ discard block |
||
| 27 | 27 | * |
| 28 | 28 | * @param array $rules |
| 29 | 29 | */ |
| 30 | - public function add( $rules ) { |
|
| 31 | - foreach( $rules as $rule ) { |
|
| 32 | - if ( !isset( $this->pool[ $rule ] ) ) { |
|
| 33 | - $class = $this->class_name( $rule ); |
|
| 34 | - $this->pool[ $rule ] = new $class(); |
|
| 30 | + public function add($rules) { |
|
| 31 | + foreach ($rules as $rule) { |
|
| 32 | + if (!isset($this->pool[$rule])) { |
|
| 33 | + $class = $this->class_name($rule); |
|
| 34 | + $this->pool[$rule] = new $class(); |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | return $this; |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | * @param string $rule |
| 46 | 46 | * @return ValidateInterface|bool |
| 47 | 47 | */ |
| 48 | - public function get( $rule ) { |
|
| 49 | - return ( isset( $this->pool[ $rule ] )) ? $this->pool[ $rule ] : false; |
|
| 48 | + public function get($rule) { |
|
| 49 | + return (isset($this->pool[$rule])) ? $this->pool[$rule] : false; |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -58,8 +58,8 @@ discard block |
||
| 58 | 58 | * @param string $rule |
| 59 | 59 | * @return string |
| 60 | 60 | */ |
| 61 | - protected function class_name( $rule ){ |
|
| 62 | - $name = str_replace(' ', '', ucwords( str_replace('_', ' ', $rule ) ) ); |
|
| 61 | + protected function class_name($rule) { |
|
| 62 | + $name = str_replace(' ', '', ucwords(str_replace('_', ' ', $rule))); |
|
| 63 | 63 | return 'WFV\Validators\\'.$name; |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Collection\MessageCollection; |
| 6 | 6 | use WFV\Contract\ValidateInterface; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @param |
| 40 | 40 | */ |
| 41 | - public function __construct( MessageCollection $messages ) { |
|
| 41 | + public function __construct(MessageCollection $messages) { |
|
| 42 | 42 | $this->messages = $messages; |
| 43 | 43 | } |
| 44 | 44 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @return bool |
| 62 | 62 | */ |
| 63 | 63 | public function is_valid() { |
| 64 | - return empty( $this->errors ); |
|
| 64 | + return empty($this->errors); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -75,11 +75,11 @@ discard block |
||
| 75 | 75 | * @param bool $optional |
| 76 | 76 | * @param array (optional) $params |
| 77 | 77 | */ |
| 78 | - public function validate( ValidateInterface $rule, $field, $value, $optional, $params = false ) { |
|
| 79 | - $params[] = ( $params ) ? $field : false; |
|
| 80 | - $valid = $rule->validate( $value, $optional, $params ); |
|
| 81 | - if( !$valid ){ |
|
| 82 | - $this->add_error( $field, $rule->template() ); |
|
| 78 | + public function validate(ValidateInterface $rule, $field, $value, $optional, $params = false) { |
|
| 79 | + $params[] = ($params) ? $field : false; |
|
| 80 | + $valid = $rule->validate($value, $optional, $params); |
|
| 81 | + if (!$valid) { |
|
| 82 | + $this->add_error($field, $rule->template()); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -92,10 +92,10 @@ discard block |
||
| 92 | 92 | * @param string $field |
| 93 | 93 | * @param array $template |
| 94 | 94 | */ |
| 95 | - protected function add_error( $field, array $template ) { |
|
| 96 | - $message = ( $this->messages->has( $field ) ) |
|
| 97 | - ? $this->messages->get_msg( $field, $template['name'] ) |
|
| 95 | + protected function add_error($field, array $template) { |
|
| 96 | + $message = ($this->messages->has($field)) |
|
| 97 | + ? $this->messages->get_msg($field, $template['name']) |
|
| 98 | 98 | : $template['message']; |
| 99 | - $this->errors[ $field ][ $template['name'] ] = $message; |
|
| 99 | + $this->errors[$field][$template['name']] = $message; |
|
| 100 | 100 | } |
| 101 | 101 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -32,15 +32,15 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $optional |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public function validate( $input = null, $optional = false ) { |
|
| 35 | + public function validate($input = null, $optional = false) { |
|
| 36 | 36 | $args = func_get_args(); |
| 37 | 37 | $params = $args[2]; |
| 38 | 38 | $min_value = $params[0]; |
| 39 | 39 | |
| 40 | 40 | $v = $this->validator->create(); |
| 41 | 41 | |
| 42 | - return ( $optional ) |
|
| 43 | - ? $v->optional( $v->create()->min( $min_value ) )->validate( $input ) |
|
| 44 | - : $v->min( $min_value )->validate( $input ); |
|
| 42 | + return ($optional) |
|
| 43 | + ? $v->optional($v->create()->min($min_value))->validate($input) |
|
| 44 | + : $v->min($min_value)->validate($input); |
|
| 45 | 45 | } |
| 46 | 46 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $optional |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public function validate( $input = null, $optional = false ) { |
|
| 35 | + public function validate($input = null, $optional = false) { |
|
| 36 | 36 | $v = $this->validator->create(); |
| 37 | 37 | |
| 38 | - return ( $optional ) |
|
| 39 | - ? $v->optional( $v->create()->numeric() )->validate( $input ) |
|
| 40 | - : $v->numeric()->validate( $input ); |
|
| 38 | + return ($optional) |
|
| 39 | + ? $v->optional($v->create()->numeric())->validate($input) |
|
| 40 | + : $v->numeric()->validate($input); |
|
| 41 | 41 | } |
| 42 | 42 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Validators; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Validators\AbstractValidator; |
| 6 | 6 | |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $optional |
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | - public function validate( $input = null, $optional = false ) { |
|
| 35 | + public function validate($input = null, $optional = false) { |
|
| 36 | 36 | $v = $this->validator->create(); |
| 37 | 37 | |
| 38 | - return ( $optional ) |
|
| 39 | - ? $v->optional( $v->create()->alpha() )->validate( $input ) |
|
| 40 | - : $v->alpha()->validate( $input ); |
|
| 38 | + return ($optional) |
|
| 39 | + ? $v->optional($v->create()->alpha())->validate($input) |
|
| 40 | + : $v->alpha()->validate($input); |
|
| 41 | 41 | } |
| 42 | 42 | } |