@@ -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\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 | } |
@@ -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()->ip() )->validate( $input ) |
|
| 40 | - : $v->ip()->validate( $input ); |
|
| 38 | + return ($optional) |
|
| 39 | + ? $v->optional($v->create()->ip())->validate($input) |
|
| 40 | + : $v->ip()->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,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 | $max_value = $params[0]; |
| 39 | 39 | |
| 40 | 40 | $v = $this->validator->create(); |
| 41 | 41 | |
| 42 | - return ( $optional ) |
|
| 43 | - ? $v->optional( $v->create()->max( $max_value ) )->validate( $input ) |
|
| 44 | - : $v->max( $max_value )->validate( $input ); |
|
| 42 | + return ($optional) |
|
| 43 | + ? $v->optional($v->create()->max($max_value))->validate($input) |
|
| 44 | + : $v->max($max_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,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 | $compare_value = $params[0]; |
| 39 | 39 | |
| 40 | 40 | $v = $this->validator->create(); |
| 41 | 41 | |
| 42 | - return ( $optional ) |
|
| 43 | - ? $v->optional( $v->create()->equals( $compare_value ) )->validate( $input ) |
|
| 44 | - : $v->equals( $compare_value )->validate( $input ); |
|
| 42 | + return ($optional) |
|
| 43 | + ? $v->optional($v->create()->equals($compare_value))->validate($input) |
|
| 44 | + : $v->equals($compare_value)->validate($input); |
|
| 45 | 45 | } |
| 46 | 46 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Collection; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | use WFV\Abstraction\Collectable; |
| 5 | 5 | /** |
| 6 | 6 | * |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | * |
| 17 | 17 | * @param array $form Config array |
| 18 | 18 | */ |
| 19 | - public function __construct( array $form ) { |
|
| 20 | - $this->set_messages( $form ); |
|
| 19 | + public function __construct(array $form) { |
|
| 20 | + $this->set_messages($form); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -40,9 +40,9 @@ discard block |
||
| 40 | 40 | * @param string $rule |
| 41 | 41 | * @return array|null |
| 42 | 42 | */ |
| 43 | - public function get_msg( $field, $rule ) { |
|
| 44 | - return ( isset( $this->data[ $field ][ $rule ] ) ) |
|
| 45 | - ? $this->data[ $field ][ $rule ] |
|
| 43 | + public function get_msg($field, $rule) { |
|
| 44 | + return (isset($this->data[$field][$rule])) |
|
| 45 | + ? $this->data[$field][$rule] |
|
| 46 | 46 | : null; |
| 47 | 47 | } |
| 48 | 48 | |
@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | * @param array $form |
| 57 | 57 | * @return array |
| 58 | 58 | */ |
| 59 | - protected function filter_config( array $form ) { |
|
| 60 | - return array_filter( $form, function( $item ) { |
|
| 61 | - return array_key_exists('messages', $item ); |
|
| 59 | + protected function filter_config(array $form) { |
|
| 60 | + return array_filter($form, function($item) { |
|
| 61 | + return array_key_exists('messages', $item); |
|
| 62 | 62 | }); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -70,10 +70,10 @@ discard block |
||
| 70 | 70 | * |
| 71 | 71 | * @param array |
| 72 | 72 | */ |
| 73 | - protected function make_array( array $filtered ) { |
|
| 73 | + protected function make_array(array $filtered) { |
|
| 74 | 74 | $messages = array(); |
| 75 | - foreach( $filtered as $field => $options ) { |
|
| 76 | - $messages[ $field ] = $options['messages']; |
|
| 75 | + foreach ($filtered as $field => $options) { |
|
| 76 | + $messages[$field] = $options['messages']; |
|
| 77 | 77 | } |
| 78 | 78 | return $messages; |
| 79 | 79 | } |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | * |
| 87 | 87 | * @param array $form |
| 88 | 88 | */ |
| 89 | - protected function set_messages( array $form ) { |
|
| 90 | - $filtered = $this->filter_config( $form ); |
|
| 91 | - $this->data = $this->make_array( $filtered ); |
|
| 89 | + protected function set_messages(array $form) { |
|
| 90 | + $filtered = $this->filter_config($form); |
|
| 91 | + $this->data = $this->make_array($filtered); |
|
| 92 | 92 | } |
| 93 | 93 | } |