@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Contract; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * |
@@ -12,12 +12,12 @@ discard block |
||
| 12 | 12 | /** |
| 13 | 13 | * @return bool |
| 14 | 14 | */ |
| 15 | - public function contains( $key = null, $value = null ); |
|
| 15 | + public function contains($key = null, $value = null); |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * @return bool |
| 19 | 19 | */ |
| 20 | - public function has( $key = null ); |
|
| 20 | + public function has($key = null); |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * @return bool |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | /** |
| 28 | 28 | * @return string|null |
| 29 | 29 | */ |
| 30 | - public function escape( $key, callable $callback = null ); |
|
| 30 | + public function escape($key, callable $callback = null); |
|
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * @return |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Contract; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | /** |
| 14 | 14 | * @return |
| 15 | 15 | */ |
| 16 | - public function create( $action ); |
|
| 16 | + public function create($action); |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * @return |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @access private |
| 109 | 109 | * |
| 110 | 110 | * @param array $array |
| 111 | - * @param string|array $callback |
|
| 111 | + * @param callable $callback |
|
| 112 | 112 | * @return array |
| 113 | 113 | */ |
| 114 | 114 | protected function transform_array_leafs( array $array, $callback ) { |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | * @since 0.10.0 |
| 125 | 125 | * @access private |
| 126 | 126 | * |
| 127 | - * @param string|array $callback |
|
| 127 | + * @param callable $callback |
|
| 128 | 128 | * @param string (optional) $input The input string |
| 129 | 129 | * @return |
| 130 | 130 | */ |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Abstraction; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Contract\CollectionInterface; |
| 6 | 6 | |
@@ -29,11 +29,11 @@ discard block |
||
| 29 | 29 | * @param string $value |
| 30 | 30 | * @return bool |
| 31 | 31 | */ |
| 32 | - public function contains( $key = null, $value = null ) { |
|
| 33 | - if( $this->has( $key ) ) { |
|
| 34 | - return ( is_array( $this->data[ $key ] ) ) |
|
| 35 | - ? in_array( $value, $this->data[ $key ] ) |
|
| 36 | - : $this->data[ $key ] === $value; |
|
| 32 | + public function contains($key = null, $value = null) { |
|
| 33 | + if ($this->has($key)) { |
|
| 34 | + return (is_array($this->data[$key])) |
|
| 35 | + ? in_array($value, $this->data[$key]) |
|
| 36 | + : $this->data[$key] === $value; |
|
| 37 | 37 | } |
| 38 | 38 | return false; |
| 39 | 39 | } |
@@ -47,10 +47,10 @@ discard block |
||
| 47 | 47 | * @param string|array (optional) $callback Context appropriate callable. |
| 48 | 48 | * @return string|null |
| 49 | 49 | */ |
| 50 | - public function escape( $key, callable $callback = null ) { |
|
| 51 | - if( is_string( $key ) ) { |
|
| 52 | - $callback = ( null === $callback ) ? 'esc_html' : $callback; |
|
| 53 | - return ( true === $this->has( $key ) ) ? $this->call_func( $callback, $this->data[ $key ] ) : null; |
|
| 50 | + public function escape($key, callable $callback = null) { |
|
| 51 | + if (is_string($key)) { |
|
| 52 | + $callback = (null === $callback) ? 'esc_html' : $callback; |
|
| 53 | + return (true === $this->has($key)) ? $this->call_func($callback, $this->data[$key]) : null; |
|
| 54 | 54 | } |
| 55 | 55 | return null; |
| 56 | 56 | } |
@@ -63,8 +63,8 @@ discard block |
||
| 63 | 63 | * @param string $key |
| 64 | 64 | * @return bool |
| 65 | 65 | */ |
| 66 | - public function has( $key = null ) { |
|
| 67 | - return array_key_exists( $key, $this->data ); |
|
| 66 | + public function has($key = null) { |
|
| 67 | + return array_key_exists($key, $this->data); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * @return bool |
| 76 | 76 | */ |
| 77 | 77 | public function is_populated() { |
| 78 | - return count( $this->data ) > 0; |
|
| 78 | + return count($this->data) > 0; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -88,11 +88,11 @@ discard block |
||
| 88 | 88 | * @param callable $callback |
| 89 | 89 | * @return array |
| 90 | 90 | */ |
| 91 | - public function transform( $key = null, callable $callback ) { |
|
| 91 | + public function transform($key = null, callable $callback) { |
|
| 92 | 92 | // WIP |
| 93 | - if( true === $this->has( $key ) ) { |
|
| 94 | - if( is_array( $this->data[ $key ] ) ) { |
|
| 95 | - return $this->transform_array_leafs( $this->data[ $key ], $callback ); |
|
| 93 | + if (true === $this->has($key)) { |
|
| 94 | + if (is_array($this->data[$key])) { |
|
| 95 | + return $this->transform_array_leafs($this->data[$key], $callback); |
|
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } |
@@ -109,9 +109,9 @@ discard block |
||
| 109 | 109 | * @param string|array $callback |
| 110 | 110 | * @return array |
| 111 | 111 | */ |
| 112 | - protected function transform_array_leafs( array $array, $callback ) { |
|
| 113 | - array_walk_recursive( $array, function( &$item ) use( $callback ) { |
|
| 114 | - $item = $this->call_func( $callback, $item ); |
|
| 112 | + protected function transform_array_leafs(array $array, $callback) { |
|
| 113 | + array_walk_recursive($array, function(&$item) use($callback) { |
|
| 114 | + $item = $this->call_func($callback, $item); |
|
| 115 | 115 | } ); |
| 116 | 116 | return $array; |
| 117 | 117 | } |
@@ -126,16 +126,16 @@ discard block |
||
| 126 | 126 | * @param string (optional) $input The input string |
| 127 | 127 | * @return |
| 128 | 128 | */ |
| 129 | - private function call_func( $callback, $input = null ) { |
|
| 129 | + private function call_func($callback, $input = null) { |
|
| 130 | 130 | // WIP - simplify |
| 131 | - if( is_array( $callback ) ) { |
|
| 131 | + if (is_array($callback)) { |
|
| 132 | 132 | $method = $callback[0]; |
| 133 | 133 | $args = $callback[1]; |
| 134 | - if ( $input ) { |
|
| 135 | - array_unshift( $args, $input ); |
|
| 134 | + if ($input) { |
|
| 135 | + array_unshift($args, $input); |
|
| 136 | 136 | } |
| 137 | - return call_user_func_array( $method, $args ); |
|
| 137 | + return call_user_func_array($method, $args); |
|
| 138 | 138 | } |
| 139 | - return $callback( $input ); |
|
| 139 | + return $callback($input); |
|
| 140 | 140 | } |
| 141 | 141 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param string (optional) $identity |
| 48 | 48 | */ |
| 49 | 49 | public function __construct( $identity = null ) { |
| 50 | - $this->entity = $identity; |
|
| 50 | + $this->entity = $identity; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | * @return self |
| 61 | 61 | */ |
| 62 | 62 | public function describe( $attribute, $characteristic ) { |
| 63 | - $this->scribe[ $attribute ] = $characteristic; |
|
| 64 | - return $this; |
|
| 63 | + $this->scribe[ $attribute ] = $characteristic; |
|
| 64 | + return $this; |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | * @return Composite |
| 74 | 74 | */ |
| 75 | 75 | public function compose( ArtisanInterface $artisan ) { |
| 76 | - $this->orchestrate( $this->aspect, $artisan ); |
|
| 77 | - return $artisan |
|
| 78 | - ->create( $this->entity ) |
|
| 79 | - ->actualize(); |
|
| 76 | + $this->orchestrate( $this->aspect, $artisan ); |
|
| 77 | + return $artisan |
|
| 78 | + ->create( $this->entity ) |
|
| 79 | + ->actualize(); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -89,8 +89,8 @@ discard block |
||
| 89 | 89 | * @return self |
| 90 | 90 | */ |
| 91 | 91 | public function with( $quality, $attributes = null ) { |
| 92 | - $this->aspect[ $quality ] = $attributes; |
|
| 93 | - return $this; |
|
| 92 | + $this->aspect[ $quality ] = $attributes; |
|
| 93 | + return $this; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | * @param ArtisanInterface $artisan |
| 104 | 104 | */ |
| 105 | 105 | private function orchestrate( array $aspect, ArtisanInterface &$artisan ) { |
| 106 | - foreach( $aspect as $component => $params ) { |
|
| 107 | - $artisan->$component( $params ); |
|
| 108 | - } |
|
| 106 | + foreach( $aspect as $component => $params ) { |
|
| 107 | + $artisan->$component( $params ); |
|
| 108 | + } |
|
| 109 | 109 | } |
| 110 | 110 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Artisan; |
| 3 | -defined( 'ABSPATH' ) || die( 'envois' ); |
|
| 3 | +defined('ABSPATH') || die('envois'); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Contract\ArtisanInterface; |
| 6 | 6 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | * |
| 47 | 47 | * @param string (optional) $identity |
| 48 | 48 | */ |
| 49 | - public function __construct( $identity = null ) { |
|
| 49 | + public function __construct($identity = null) { |
|
| 50 | 50 | $this->entity = $identity; |
| 51 | 51 | } |
| 52 | 52 | |
@@ -59,8 +59,8 @@ discard block |
||
| 59 | 59 | * @param mixed $characteristic |
| 60 | 60 | * @return self |
| 61 | 61 | */ |
| 62 | - public function describe( $attribute, $characteristic ) { |
|
| 63 | - $this->scribe[ $attribute ] = $characteristic; |
|
| 62 | + public function describe($attribute, $characteristic) { |
|
| 63 | + $this->scribe[$attribute] = $characteristic; |
|
| 64 | 64 | return $this; |
| 65 | 65 | } |
| 66 | 66 | |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | * @param ArtisanInterface $artisan |
| 73 | 73 | * @return Composite |
| 74 | 74 | */ |
| 75 | - public function compose( ArtisanInterface $artisan ) { |
|
| 76 | - $this->orchestrate( $this->aspect, $artisan ); |
|
| 75 | + public function compose(ArtisanInterface $artisan) { |
|
| 76 | + $this->orchestrate($this->aspect, $artisan); |
|
| 77 | 77 | return $artisan |
| 78 | - ->create( $this->entity ) |
|
| 78 | + ->create($this->entity) |
|
| 79 | 79 | ->actualize(); |
| 80 | 80 | } |
| 81 | 81 | |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | * @param string|array (optional) $attributes |
| 89 | 89 | * @return self |
| 90 | 90 | */ |
| 91 | - public function with( $quality, $attributes = null ) { |
|
| 92 | - $this->aspect[ $quality ] = $attributes; |
|
| 91 | + public function with($quality, $attributes = null) { |
|
| 92 | + $this->aspect[$quality] = $attributes; |
|
| 93 | 93 | return $this; |
| 94 | 94 | } |
| 95 | 95 | |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | * @param array $aspect |
| 103 | 103 | * @param ArtisanInterface $artisan |
| 104 | 104 | */ |
| 105 | - private function orchestrate( array $aspect, ArtisanInterface &$artisan ) { |
|
| 106 | - foreach( $aspect as $component => $params ) { |
|
| 107 | - $artisan->$component( $params ); |
|
| 105 | + private function orchestrate(array $aspect, ArtisanInterface&$artisan) { |
|
| 106 | + foreach ($aspect as $component => $params) { |
|
| 107 | + $artisan->$component($params); |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | } |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * |
| 28 | 28 | * @since 0.10.0 |
| 29 | 29 | * |
| 30 | - * @param ArtisanInterface $builder |
|
| 30 | + * @param FormArtisan $builder |
|
| 31 | 31 | * @param string $action |
| 32 | 32 | */ |
| 33 | 33 | public function __construct( FormArtisan $builder, $action ) { |
@@ -194,6 +194,8 @@ discard block |
||
| 194 | 194 | * @param string $response |
| 195 | 195 | * @param string (optional) $field |
| 196 | 196 | * @param string (optional) $value |
| 197 | + * @param string $field |
|
| 198 | + * @param string $value |
|
| 197 | 199 | * @return string|null |
| 198 | 200 | */ |
| 199 | 201 | protected function string_or_null( $response, $field = null, $value = null ) { |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | defined( 'ABSPATH' ) || die(); |
| 4 | 4 | |
| 5 | 5 | use WFV\Artisan\FormArtisan; |
| 6 | -use WFV\Contract\ValidateInterface; |
|
| 7 | 6 | use WFV\RuleFactory; |
| 8 | 7 | |
| 9 | 8 | /** |
@@ -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\Artisan\FormArtisan; |
| 6 | 6 | use WFV\Contract\ValidateInterface; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * @param ArtisanInterface $builder |
| 58 | 58 | * @param string $action |
| 59 | 59 | */ |
| 60 | - public function __construct( FormArtisan $builder, $action ) { |
|
| 60 | + public function __construct(FormArtisan $builder, $action) { |
|
| 61 | 61 | $this->alias = $action; |
| 62 | 62 | $this->collection = $builder->collection; |
| 63 | 63 | $this->factory = $builder->factory; |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | * @param string $value Value to compare against. |
| 74 | 74 | * @return string|null |
| 75 | 75 | */ |
| 76 | - public function checked_if( $field = null, $value = null ) { |
|
| 77 | - return $this->string_or_null( 'checked', $field, $value ); |
|
| 76 | + public function checked_if($field = null, $value = null) { |
|
| 77 | + return $this->string_or_null('checked', $field, $value); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | * @param callable (optional) $callback |
| 89 | 89 | * @return string |
| 90 | 90 | */ |
| 91 | - public function display( $field = null, callable $callback = null ) { |
|
| 92 | - echo $input = $this->utilize('input')->escape( $field ); |
|
| 91 | + public function display($field = null, callable $callback = null) { |
|
| 92 | + echo $input = $this->utilize('input')->escape($field); |
|
| 93 | 93 | return $input; |
| 94 | 94 | } |
| 95 | 95 | |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | * @param string $value Value to compare against. |
| 137 | 137 | * @return string|null |
| 138 | 138 | */ |
| 139 | - public function selected_if( $field = null, $value = null ) { |
|
| 140 | - return $this->string_or_null( 'selected', $field, $value ); |
|
| 139 | + public function selected_if($field = null, $value = null) { |
|
| 140 | + return $this->string_or_null('selected', $field, $value); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -149,9 +149,9 @@ discard block |
||
| 149 | 149 | */ |
| 150 | 150 | public function token_fields() { |
| 151 | 151 | // TODO - Move markup into something - perhaps a renderable interface? |
| 152 | - $token_name = $this->alias . '_token'; |
|
| 153 | - echo $nonce_field = wp_nonce_field( $this->alias, $token_name, false, false ); |
|
| 154 | - echo $action_field = '<input type="hidden" name="action" value="'. $this->alias .'">'; |
|
| 152 | + $token_name = $this->alias.'_token'; |
|
| 153 | + echo $nonce_field = wp_nonce_field($this->alias, $token_name, false, false); |
|
| 154 | + echo $action_field = '<input type="hidden" name="action" value="'.$this->alias.'">'; |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |
@@ -163,15 +163,15 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | public function validate() { |
| 165 | 165 | $rule_collection = $this->utilize('rules'); |
| 166 | - $rules = $rule_collection->get_array( true ); |
|
| 166 | + $rules = $rule_collection->get_array(true); |
|
| 167 | 167 | |
| 168 | - foreach( $rules as $field => $ruleset ) { |
|
| 169 | - $input = $this->field_value( $field ); |
|
| 170 | - $optional = $rule_collection->is_optional( $field ); |
|
| 168 | + foreach ($rules as $field => $ruleset) { |
|
| 169 | + $input = $this->field_value($field); |
|
| 170 | + $optional = $rule_collection->is_optional($field); |
|
| 171 | 171 | |
| 172 | - foreach( $ruleset as $index => $rule ) { |
|
| 173 | - $params = $rule_collection->get_params( $field, $index ); |
|
| 174 | - $this->validator->validate( $this->factory->get( $rule ), $field, $input, $optional, $params ); |
|
| 172 | + foreach ($ruleset as $index => $rule) { |
|
| 173 | + $params = $rule_collection->get_params($field, $index); |
|
| 174 | + $this->validator->validate($this->factory->get($rule), $field, $input, $optional, $params); |
|
| 175 | 175 | } |
| 176 | 176 | } |
| 177 | 177 | return $this->is_valid(); |
@@ -187,11 +187,11 @@ discard block |
||
| 187 | 187 | * @param string $field |
| 188 | 188 | * @return string|array|null |
| 189 | 189 | */ |
| 190 | - protected function field_value( $field ) { |
|
| 190 | + protected function field_value($field) { |
|
| 191 | 191 | $input = $this->utilize('input'); |
| 192 | - if( $input->has( $field ) ) { |
|
| 192 | + if ($input->has($field)) { |
|
| 193 | 193 | $input = $input->get_array(); |
| 194 | - return $input[ $field ]; |
|
| 194 | + return $input[$field]; |
|
| 195 | 195 | } |
| 196 | 196 | return null; |
| 197 | 197 | } |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | protected function is_valid() { |
| 209 | 209 | $is_valid = $this->validator->is_valid(); |
| 210 | - if( false === $is_valid ) { |
|
| 211 | - $this->utilize('errors')->set_errors( $this->validator->errors() ); |
|
| 210 | + if (false === $is_valid) { |
|
| 211 | + $this->utilize('errors')->set_errors($this->validator->errors()); |
|
| 212 | 212 | } |
| 213 | - $this->trigger_post_validate_action( $is_valid ); |
|
| 213 | + $this->trigger_post_validate_action($is_valid); |
|
| 214 | 214 | return $is_valid; |
| 215 | 215 | } |
| 216 | 216 | |
@@ -225,9 +225,9 @@ discard block |
||
| 225 | 225 | * @param string (optional) $value |
| 226 | 226 | * @return string|null |
| 227 | 227 | */ |
| 228 | - protected function string_or_null( $response, $field = null, $value = null ) { |
|
| 228 | + protected function string_or_null($response, $field = null, $value = null) { |
|
| 229 | 229 | $input = $this->utilize('input'); |
| 230 | - return ( $input->contains( $field, $value ) ) ? $response : null; |
|
| 230 | + return ($input->contains($field, $value)) ? $response : null; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
@@ -238,9 +238,9 @@ discard block |
||
| 238 | 238 | * |
| 239 | 239 | * @param bool $is_valid |
| 240 | 240 | */ |
| 241 | - protected function trigger_post_validate_action( $is_valid = false ) { |
|
| 242 | - $action = ( true === $is_valid ) ? $this->alias : $this->alias .'_fail'; |
|
| 243 | - do_action( $action, $this ); |
|
| 241 | + protected function trigger_post_validate_action($is_valid = false) { |
|
| 242 | + $action = (true === $is_valid) ? $this->alias : $this->alias.'_fail'; |
|
| 243 | + do_action($action, $this); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | /** |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | * |
| 252 | 252 | * @param string $component Key indentifier. |
| 253 | 253 | */ |
| 254 | - protected function utilize( $component ) { |
|
| 255 | - return $this->collection[ $component ]; |
|
| 254 | + protected function utilize($component) { |
|
| 255 | + return $this->collection[$component]; |
|
| 256 | 256 | } |
| 257 | 257 | } |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | * @access protected |
| 144 | 144 | * |
| 145 | 145 | * @param string $rule |
| 146 | - * @return bool |
|
| 146 | + * @return integer |
|
| 147 | 147 | */ |
| 148 | 148 | protected function string_has_params( $rule ) { |
| 149 | 149 | return strpos( $rule, ':' ); |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Collection; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Abstraction\Collectable; |
| 6 | 6 | |
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | * |
| 19 | 19 | * @param array $rules |
| 20 | 20 | */ |
| 21 | - public function __construct( array $rules ) { |
|
| 22 | - $this->data = $this->parse_rules( $rules ); |
|
| 21 | + public function __construct(array $rules) { |
|
| 22 | + $this->data = $this->parse_rules($rules); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | * @param bool (optional) $flat |
| 33 | 33 | * @return array |
| 34 | 34 | */ |
| 35 | - public function get_array( $flat = false ) { |
|
| 36 | - return ( $flat ) ? $this->remove_params() : $this->data; |
|
| 35 | + public function get_array($flat = false) { |
|
| 36 | + return ($flat) ? $this->remove_params() : $this->data; |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | * @param int $index |
| 46 | 46 | * @return array|bool |
| 47 | 47 | */ |
| 48 | - public function get_params( $field, $index ) { |
|
| 49 | - return ( $this->has_params( $field, $index ) ) |
|
| 50 | - ? $this->data[ $field ][ $index ]['params'] |
|
| 48 | + public function get_params($field, $index) { |
|
| 49 | + return ($this->has_params($field, $index)) |
|
| 50 | + ? $this->data[$field][$index]['params'] |
|
| 51 | 51 | : false; |
| 52 | 52 | } |
| 53 | 53 | |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | * @param string $field |
| 60 | 60 | * @return bool |
| 61 | 61 | */ |
| 62 | - public function is_optional( $field ) { |
|
| 63 | - if( $this->has( $field ) ){ |
|
| 64 | - return in_array('optional', $this->data[ $field ] ); |
|
| 62 | + public function is_optional($field) { |
|
| 63 | + if ($this->has($field)) { |
|
| 64 | + return in_array('optional', $this->data[$field]); |
|
| 65 | 65 | } |
| 66 | 66 | return false; |
| 67 | 67 | } |
@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | * @return array |
| 75 | 75 | */ |
| 76 | 76 | public function unique() { |
| 77 | - $flat = $this->flatten( $this->remove_params() ); |
|
| 78 | - return array_values( array_unique( $flat ) ); |
|
| 77 | + $flat = $this->flatten($this->remove_params()); |
|
| 78 | + return array_values(array_unique($flat)); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | * @param string $rule |
| 88 | 88 | * @return string |
| 89 | 89 | */ |
| 90 | - protected function extract_name( $rule ) { |
|
| 91 | - return strstr( $rule, ':', true ); |
|
| 90 | + protected function extract_name($rule) { |
|
| 91 | + return strstr($rule, ':', true); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | /** |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | * @param string $rule |
| 101 | 101 | * @return string |
| 102 | 102 | */ |
| 103 | - protected function extract_params( $rule ) { |
|
| 104 | - return ltrim( strstr($rule, ':'), ':'); |
|
| 103 | + protected function extract_params($rule) { |
|
| 104 | + return ltrim(strstr($rule, ':'), ':'); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | * @param array $array |
| 114 | 114 | * @return array |
| 115 | 115 | */ |
| 116 | - protected function flatten( array $array ) { |
|
| 116 | + protected function flatten(array $array) { |
|
| 117 | 117 | $flat = array(); |
| 118 | - foreach( $array as $rule ) { |
|
| 119 | - if( is_array( $rule ) ){ |
|
| 120 | - $flat = array_merge( $flat, $this->flatten( $rule ) ); |
|
| 118 | + foreach ($array as $rule) { |
|
| 119 | + if (is_array($rule)) { |
|
| 120 | + $flat = array_merge($flat, $this->flatten($rule)); |
|
| 121 | 121 | } else { |
| 122 | 122 | $flat[] = $rule; |
| 123 | 123 | } |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | * @param int $index |
| 136 | 136 | * @return bool |
| 137 | 137 | */ |
| 138 | - protected function has_params( $field, $index ) { |
|
| 139 | - return is_array( $this->data[ $field ][ $index ] ); |
|
| 138 | + protected function has_params($field, $index) { |
|
| 139 | + return is_array($this->data[$field][$index]); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -148,8 +148,8 @@ discard block |
||
| 148 | 148 | * @param string $rule |
| 149 | 149 | * @return bool |
| 150 | 150 | */ |
| 151 | - protected function string_has_params( $rule ) { |
|
| 152 | - return strpos( $rule, ':' ); |
|
| 151 | + protected function string_has_params($rule) { |
|
| 152 | + return strpos($rule, ':'); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
@@ -162,20 +162,20 @@ discard block |
||
| 162 | 162 | * @param array $rules |
| 163 | 163 | * @return array |
| 164 | 164 | */ |
| 165 | - protected function parse_rules( array $rules ) { |
|
| 165 | + protected function parse_rules(array $rules) { |
|
| 166 | 166 | // WIP - works, but confusing - simplify or breakdown into small methods |
| 167 | 167 | $parsed = array(); |
| 168 | - $this->split_rules( $rules ); |
|
| 169 | - foreach( $rules as $field => $ruleset ) { |
|
| 170 | - $parsed[ $field ] = array_map( function( $rule ) { |
|
| 171 | - if ( $this->string_has_params( $rule ) ) { |
|
| 168 | + $this->split_rules($rules); |
|
| 169 | + foreach ($rules as $field => $ruleset) { |
|
| 170 | + $parsed[$field] = array_map(function($rule) { |
|
| 171 | + if ($this->string_has_params($rule)) { |
|
| 172 | 172 | return array( |
| 173 | - 'rule' => $this->extract_name( $rule ), |
|
| 174 | - 'params' => explode( ',', $this->extract_params( $rule ) ) |
|
| 173 | + 'rule' => $this->extract_name($rule), |
|
| 174 | + 'params' => explode(',', $this->extract_params($rule)) |
|
| 175 | 175 | ); |
| 176 | 176 | } |
| 177 | 177 | return $rule; |
| 178 | - }, $ruleset ); |
|
| 178 | + }, $ruleset); |
|
| 179 | 179 | } |
| 180 | 180 | return $parsed; |
| 181 | 181 | } |
@@ -190,14 +190,14 @@ discard block |
||
| 190 | 190 | * @return array |
| 191 | 191 | */ |
| 192 | 192 | protected function remove_params() { |
| 193 | - return array_map( function( $item ) { |
|
| 194 | - foreach( $item as $index => $rule ) { |
|
| 195 | - if( $rule !== 'optional' ) { |
|
| 196 | - $rules[ $index ] = ( is_string( $rule ) ) ? $rule : $rule['rule']; |
|
| 193 | + return array_map(function($item) { |
|
| 194 | + foreach ($item as $index => $rule) { |
|
| 195 | + if ($rule !== 'optional') { |
|
| 196 | + $rules[$index] = (is_string($rule)) ? $rule : $rule['rule']; |
|
| 197 | 197 | } |
| 198 | 198 | } |
| 199 | 199 | return $rules; |
| 200 | - }, $this->data ); |
|
| 200 | + }, $this->data); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | /** |
@@ -208,10 +208,10 @@ discard block |
||
| 208 | 208 | * |
| 209 | 209 | * @param array $rules |
| 210 | 210 | */ |
| 211 | - protected function split_rules( array &$rules ) { |
|
| 211 | + protected function split_rules(array &$rules) { |
|
| 212 | 212 | // perhaps the $rules array structure should be validated here?... |
| 213 | - $rules = array_map( function( $item ) { |
|
| 214 | - return explode( '|', $item ); |
|
| 215 | - }, $rules ); |
|
| 213 | + $rules = array_map(function($item) { |
|
| 214 | + return explode('|', $item); |
|
| 215 | + }, $rules); |
|
| 216 | 216 | } |
| 217 | 217 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Contract; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | |
| 6 | 6 | /** |
@@ -14,5 +14,5 @@ discard block |
||
| 14 | 14 | /** |
| 15 | 15 | * @return bool |
| 16 | 16 | */ |
| 17 | - public function validate( $input = null, $optional = false ); |
|
| 17 | + public function validate($input = null, $optional = false); |
|
| 18 | 18 | } |
@@ -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 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace WFV\Collection; |
| 3 | -defined( 'ABSPATH' ) || die(); |
|
| 3 | +defined('ABSPATH') || die(); |
|
| 4 | 4 | |
| 5 | 5 | use WFV\Abstraction\Collectable; |
| 6 | 6 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @param array $labels Human friendly labels for the fields |
| 28 | 28 | */ |
| 29 | - function __construct( array $labels = [] ) { |
|
| 29 | + function __construct(array $labels = []) { |
|
| 30 | 30 | $this->labels = $labels; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | * @param string $field |
| 39 | 39 | * @return string|null |
| 40 | 40 | */ |
| 41 | - public function first( $field ) { |
|
| 42 | - return ( isset( $this->data[ $field ] ) ) |
|
| 43 | - ? array_values( $this->data[ $field ] )[0] |
|
| 41 | + public function first($field) { |
|
| 42 | + return (isset($this->data[$field])) |
|
| 43 | + ? array_values($this->data[$field])[0] |
|
| 44 | 44 | : null; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | * @param string $field |
| 53 | 53 | * @return array|null |
| 54 | 54 | */ |
| 55 | - public function get( $field ) { |
|
| 56 | - return ( isset( $this->data[ $field ] ) ) |
|
| 57 | - ? $this->data[ $field ] |
|
| 55 | + public function get($field) { |
|
| 56 | + return (isset($this->data[$field])) |
|
| 57 | + ? $this->data[$field] |
|
| 58 | 58 | : null; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -66,10 +66,10 @@ discard block |
||
| 66 | 66 | * |
| 67 | 67 | * @param array $errors |
| 68 | 68 | */ |
| 69 | - public function set_errors( array $errors = [] ) { |
|
| 70 | - $this->data = ( $this->is_populated() ) |
|
| 69 | + public function set_errors(array $errors = []) { |
|
| 70 | + $this->data = ($this->is_populated()) |
|
| 71 | 71 | ? $this->data |
| 72 | - : $this->with_labels( $errors ); |
|
| 72 | + : $this->with_labels($errors); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | * @param string $field |
| 83 | 83 | * @return string |
| 84 | 84 | */ |
| 85 | - protected function label( $field ) { |
|
| 86 | - return ( isset( $this->labels[ $field ] ) ) |
|
| 87 | - ? $this->labels[ $field ] |
|
| 85 | + protected function label($field) { |
|
| 86 | + return (isset($this->labels[$field])) |
|
| 87 | + ? $this->labels[$field] |
|
| 88 | 88 | : $field; |
| 89 | 89 | } |
| 90 | 90 | |
@@ -97,11 +97,11 @@ discard block |
||
| 97 | 97 | * @param array $errors |
| 98 | 98 | * @return array |
| 99 | 99 | */ |
| 100 | - protected function with_labels( $errors ) { |
|
| 100 | + protected function with_labels($errors) { |
|
| 101 | 101 | $labeled = array(); |
| 102 | - foreach( $errors as $field => $messages ) { |
|
| 103 | - $label = $this->label( $field ); |
|
| 104 | - $labeled[ $field ] = str_replace( '{label}', $label, $errors[ $field ] ); |
|
| 102 | + foreach ($errors as $field => $messages) { |
|
| 103 | + $label = $this->label($field); |
|
| 104 | + $labeled[$field] = str_replace('{label}', $label, $errors[$field]); |
|
| 105 | 105 | } |
| 106 | 106 | return $labeled; |
| 107 | 107 | } |