@@ -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 | } |
@@ -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\Artisan; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Contract\ArtisanInterface; |
| 6 | 6 | use WFV\Collection\ErrorCollection; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | * |
| 60 | 60 | * @param array $config |
| 61 | 61 | */ |
| 62 | - public function __construct( array $config ) { |
|
| 62 | + public function __construct(array $config) { |
|
| 63 | 63 | $this->config = $config; |
| 64 | 64 | } |
| 65 | 65 | |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | * @param string $action |
| 83 | 83 | * @return WFV\Artisan\FormArtisan |
| 84 | 84 | */ |
| 85 | - public function create( $action ) { |
|
| 86 | - $this->form = new FormComposite( $this, $action ); |
|
| 85 | + public function create($action) { |
|
| 86 | + $this->form = new FormComposite($this, $action); |
|
| 87 | 87 | return $this; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * @return WFV\Artisan\FormArtisan |
| 97 | 97 | */ |
| 98 | 98 | public function errors() { |
| 99 | - $this->collection['errors'] = new ErrorCollection( $this->labels() ); |
|
| 99 | + $this->collection['errors'] = new ErrorCollection($this->labels()); |
|
| 100 | 100 | return $this; |
| 101 | 101 | } |
| 102 | 102 | |
@@ -109,10 +109,10 @@ discard block |
||
| 109 | 109 | * @param array $data |
| 110 | 110 | * @return WFV\Artisan\FormArtisan |
| 111 | 111 | */ |
| 112 | - public function input( array $data = [] ) { |
|
| 112 | + public function input(array $data = []) { |
|
| 113 | 113 | $input = $data[0]; |
| 114 | 114 | $trim = $data[1]; |
| 115 | - $this->collection['input'] = new InputCollection( $input, $trim ); |
|
| 115 | + $this->collection['input'] = new InputCollection($input, $trim); |
|
| 116 | 116 | return $this; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -126,10 +126,10 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | public function rules() { |
| 128 | 128 | $rules = array(); |
| 129 | - foreach( $this->config as $field => $options ) { |
|
| 130 | - $rules[ $field ] = $options['rules']; |
|
| 129 | + foreach ($this->config as $field => $options) { |
|
| 130 | + $rules[$field] = $options['rules']; |
|
| 131 | 131 | } |
| 132 | - $this->collection['rules'] = new RuleCollection( $rules ); |
|
| 132 | + $this->collection['rules'] = new RuleCollection($rules); |
|
| 133 | 133 | return $this; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @return WFV\Artisan\FormArtisan |
| 143 | 143 | */ |
| 144 | 144 | public function validator() { |
| 145 | - $this->validator = new Validator( new MessageCollection( $this->config ) ); |
|
| 145 | + $this->validator = new Validator(new MessageCollection($this->config)); |
|
| 146 | 146 | return $this; |
| 147 | 147 | } |
| 148 | 148 | |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | * @return array |
| 157 | 157 | */ |
| 158 | 158 | protected function labels() { |
| 159 | - return array_map( function( $item ) { |
|
| 159 | + return array_map(function($item) { |
|
| 160 | 160 | return $item['label']; |
| 161 | 161 | }, $this->config); |
| 162 | 162 | } |
@@ -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 | } |