macder / wfv-validation

src/Abstraction/Collectable.php

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Abstraction;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Contract\CollectionInterface;
 
@@ -29,13 +29,13 @@ 
 	 * @param string $value
 	 * @return bool
 	 */
-	public function contains( $key = null, $value = null ) {
+	public function contains($key = null, $value = null) {
 		// WIP
-		if( $this->has( $key ) ) {
-			if ( is_array( $this->data[ $key ] ) ) {
-				return ( in_array( $value, $this->data[ $key ] ) ) ? true : false;
+		if ($this->has($key)) {
+			if (is_array($this->data[$key])) {
+				return (in_array($value, $this->data[$key])) ? true : false;
 			}
-			return ( $this->data[ $key ] === $value ) ? true : false;
+			return ($this->data[$key] === $value) ? true : false;
 		}
 		return false;
 	}
@@ -49,10 +49,10 @@ 
 	 * @param string|array (optional) $callback Context appropriate callable.
 	 * @return string|null
 	 */
-	public function escape( $key, callable $callback = null ) {
-		if( is_string( $key ) ) {
-			$callback = ( null === $callback ) ? 'esc_html' : $callback;
-			return ( true === $this->has( $key ) ) ? $this->call_func( $callback, $this->data[ $key ] ) : null;
+	public function escape($key, callable $callback = null) {
+		if (is_string($key)) {
+			$callback = (null === $callback) ? 'esc_html' : $callback;
+			return (true === $this->has($key)) ? $this->call_func($callback, $this->data[$key]) : null;
 		}
 		return null;
 	}
@@ -65,8 +65,8 @@ 
 	 * @param string $key
 	 * @return bool
 	 */
-	public function has( $key = null ) {
-		return array_key_exists( $key, $this->data );
+	public function has($key = null) {
+		return array_key_exists($key, $this->data);
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 * @return bool
 	 */
 	public function is_populated() {
-		return ( count( $this->data ) > 0 ) ? true : false;
+		return (count($this->data) > 0) ? true : false;
 	}
 
 	/**
@@ -90,11 +90,11 @@ 
 	 * @param callable $callback
 	 * @return array
 	 */
-	public function transform( $key = null, callable $callback ) {
+	public function transform($key = null, callable $callback) {
 		// WIP
-		if( true === $this->has( $key ) ) {
-			if( is_array( $this->data[ $key ] ) ) {
-				return $this->transform_array_leafs( $this->data[ $key ], $callback );
+		if (true === $this->has($key)) {
+			if (is_array($this->data[$key])) {
+				return $this->transform_array_leafs($this->data[$key], $callback);
 			}
 		}
 	}
@@ -111,9 +111,9 @@ 
 	 * @param string|array $callback
 	 * @return array
 	 */
-	protected function transform_array_leafs( array $array, $callback ) {
-		array_walk_recursive( $array, function( &$item ) use( $callback ) {
-			$item = $this->call_func( $callback, $item );
+	protected function transform_array_leafs(array $array, $callback) {
+		array_walk_recursive($array, function(&$item) use($callback) {
+			$item = $this->call_func($callback, $item);
 		} );
 		return $array;
 	}
@@ -128,16 +128,16 @@ 
 	 * @param string (optional) $input The input string
 	 * @return
 	 */
-	private function call_func( $callback, $input = null ) {
+	private function call_func($callback, $input = null) {
 		// WIP - simplify
-		if( is_array( $callback ) ) {
+		if (is_array($callback)) {
 			$method = $callback[0];
 			$args = $callback[1];
-			if ( $input ) {
-				array_unshift( $args, $input );
+			if ($input) {
+				array_unshift($args, $input);
 			}
-			return call_user_func_array( $method, $args );
+			return call_user_func_array($method, $args);
 		}
-		return $callback( $input );
+		return $callback($input);
 	}
 }

src/FormComposite.php

Spacing +27 added lines, -27 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Composable;
 use WFV\Contract\ArtisanInterface;
@@ -30,9 +30,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( ArtisanInterface $builder, $action ) {
+	public function __construct(ArtisanInterface $builder, $action) {
 		$this->alias = $action;
-		$this->install( $builder->collection );
+		$this->install($builder->collection);
 		$this->validator = $builder->validator;
 	}
 
@@ -45,8 +45,8 @@ 
 	 * @param string $value Value to compare against.
 	 * @return string|null
 	 */
-	public function checked_if( $field = null, $value = null ) {
-		return $this->string_or_null( 'checked', $field, $value );
+	public function checked_if($field = null, $value = null) {
+		return $this->string_or_null('checked', $field, $value);
 	}
 
 	/**
@@ -60,8 +60,8 @@ 
 	 * @param callable (optional) $callback
 	 * @return string
 	 */
-	public function display( $field = null, callable $callback = null ) {
-		echo $input = $this->utilize('input')->escape( $field );
+	public function display($field = null, callable $callback = null) {
+		echo $input = $this->utilize('input')->escape($field);
 		return $input;
 	}
 
@@ -99,10 +99,10 @@ 
 	 */
 	public function is_valid() {
 		$is_valid = $this->validator->is_valid();
-		if( false === $is_valid ) {
-			$this->utilize('errors')->set_errors( $this->validator->errors() );
+		if (false === $is_valid) {
+			$this->utilize('errors')->set_errors($this->validator->errors());
 		}
-		$this->trigger_post_validate_action( $is_valid );
+		$this->trigger_post_validate_action($is_valid);
 		return $is_valid;
 	}
 
@@ -137,8 +137,8 @@ 
 	 * @param string $value Value to compare against.
 	 * @return string|null
 	 */
-	public function selected_if( $field = null, $value = null ) {
-		return $this->string_or_null( 'selected', $field, $value );
+	public function selected_if($field = null, $value = null) {
+		return $this->string_or_null('selected', $field, $value);
 	}
 
 	/**
@@ -150,9 +150,9 @@ 
 	 */
 	public function token_fields() {
 		// TODO - Move markup into something - perhaps a renderable interface?
-		$token_name = $this->alias . '_token';
-		echo $nonce_field = wp_nonce_field( $this->alias, $token_name, false, false );
-		echo $action_field = '<input type="hidden" name="action" value="'. $this->alias .'">';
+		$token_name = $this->alias.'_token';
+		echo $nonce_field = wp_nonce_field($this->alias, $token_name, false, false);
+		echo $action_field = '<input type="hidden" name="action" value="'.$this->alias.'">';
 	}
 
 	/**
@@ -163,9 +163,9 @@ 
 	 * @param ValidateInterface $rule
 	 * @param string $field
 	 */
-	public function validate( ValidateInterface $rule, $field ) {
-		$input = $this->field_value( $field );
-		$this->validator->validate( $rule, $field, $input );
+	public function validate(ValidateInterface $rule, $field) {
+		$input = $this->field_value($field);
+		$this->validator->validate($rule, $field, $input);
 	}
 
 	/**
@@ -176,11 +176,11 @@ 
 	 *
 	 * @param string $field
 	 */
-	protected function field_value( $field ) {
+	protected function field_value($field) {
 		$input = $this->utilize('input');
-		if( $input->has( $field ) ) {
-			$input = $input->get_array( false );
-			return $input[ $field ];
+		if ($input->has($field)) {
+			$input = $input->get_array(false);
+			return $input[$field];
 		}
 		return null;
 	}
@@ -196,8 +196,8 @@ 
 	 * @param string (optional) $value
 	 * @return string|null
 	 */
-	protected function string_or_null( $response, $field = null, $value = null ) {
-		return ( $this->input( $field )->contains( $field, $value ) ) ? $response : null;
+	protected function string_or_null($response, $field = null, $value = null) {
+		return ($this->input($field)->contains($field, $value)) ? $response : null;
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 *
 	 * @param bool $is_valid
 	 */
-	protected function trigger_post_validate_action( $is_valid = false ) {
-		$action = ( true === $is_valid ) ? $this->alias : $this->alias .'_fail';
-		do_action( $action, $this );
+	protected function trigger_post_validate_action($is_valid = false) {
+		$action = (true === $is_valid) ? $this->alias : $this->alias.'_fail';
+		do_action($action, $this);
 	}
 }

src/Collection/ErrorCollection.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param array $labels Human friendly labels for the fields
 	 */
-	function __construct( array $labels = [] ) {
+	function __construct(array $labels = []) {
 		$this->labels = $labels;
 	}
 
@@ -38,9 +38,9 @@ 
 	 * @param string $field
 	 * @return string|null
 	 */
-	public function first( $field ) {
-		return ( $this->data[ $field ] )
-			? array_values( $this->data[ $field ] )[0]
+	public function first($field) {
+		return ($this->data[$field])
+			? array_values($this->data[$field])[0]
 			: null;
 	}
 
@@ -52,10 +52,10 @@ 
 	 *
 	 * @param array $errors
 	 */
-	public function set_errors( array $errors = [] ) {
-		$this->data = ( $this->is_populated() )
+	public function set_errors(array $errors = []) {
+		$this->data = ($this->is_populated())
 			? $this->data
-			: $this->with_labels( $errors );
+			: $this->with_labels($errors);
 	}
 
 	/**
@@ -68,9 +68,9 @@ 
 	 * @param string $field
 	 * @return string
 	 */
-	protected function label( $field ) {
-		return ( isset( $this->labels[ $field ] ) )
-			? $this->labels[ $field ]
+	protected function label($field) {
+		return (isset($this->labels[$field]))
+			? $this->labels[$field]
 			: $field;
 	}
 
@@ -83,11 +83,11 @@ 
 	 * @param array $errors
 	 * @return array
 	 */
-	protected function with_labels( $errors ) {
+	protected function with_labels($errors) {
 		$labeled = array();
-		foreach( $errors as $field => $messages ) {
-			$label = $this->label( $field );
-			$labeled[ $field ] = str_replace( '{label}', $label, $errors[ $field ] );
+		foreach ($errors as $field => $messages) {
+			$label = $this->label($field);
+			$labeled[$field] = str_replace('{label}', $label, $errors[$field]);
 		}
 		return $labeled;
 	}

src/Collection/MessageCollection.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 use WFV\Abstraction\Collectable;
 /**
  *
@@ -16,8 +16,8 @@ 
 	 *
 	 * @param array $form Config array
 	 */
-	public function __construct( array $form ) {
-		$this->set_messages( $form );
+	public function __construct(array $form) {
+		$this->set_messages($form);
 	}
 
 	/**
@@ -41,9 +41,9 @@ 
 	 * @param array $form
 	 * @return array
 	 */
-	protected function filter_config( array $form ) {
-		return array_filter( $form, function( $item ) {
-			return array_key_exists('messages', $item );
+	protected function filter_config(array $form) {
+		return array_filter($form, function($item) {
+			return array_key_exists('messages', $item);
 		});
 	}
 
@@ -55,10 +55,10 @@ 
 	 *
 	 * @param array
 	 */
-	protected function make_array( array $filtered ) {
+	protected function make_array(array $filtered) {
 		$messages = array();
-		foreach( $filtered as $field => $options ) {
-			$messages[ $field ] = $options['messages'];
+		foreach ($filtered as $field => $options) {
+			$messages[$field] = $options['messages'];
 		}
 		return $messages;
 	}
@@ -71,8 +71,8 @@ 
 	 *
 	 * @param array $form
 	 */
-	protected function set_messages( array $form ) {
-		$filtered = $this->filter_config( $form );
-		$this->data = $this->make_array( $filtered );
+	protected function set_messages(array $form) {
+		$filtered = $this->filter_config($form);
+		$this->data = $this->make_array($filtered);
 	}
 }

src/Collection/InputCollection.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 
@@ -20,9 +20,9 @@ 
 	 * @param array $data
 	 * @param bool $trim
 	 */
-	public function __construct( array $data = array(), $trim ) {
-		$data = $this->transform_array_leafs( $data, 'stripslashes' );
-		$this->data = ( $trim ) ? $this->transform_array_leafs( $data, 'trim' ) : $data;
+	public function __construct(array $data = array(), $trim) {
+		$data = $this->transform_array_leafs($data, 'stripslashes');
+		$this->data = ($trim) ? $this->transform_array_leafs($data, 'trim') : $data;
 	}
 
 	/**
@@ -33,8 +33,8 @@ 
 	 * @param bool $tokens With or without token and action attributes.
 	 * @return array
 	 */
-	public function get_array( $tokens = true ) {
-		return ( $tokens ) ? $this->data : $this->neat_array();
+	public function get_array($tokens = true) {
+		return ($tokens) ? $this->data : $this->neat_array();
 	}
 
 	/**
@@ -47,8 +47,8 @@ 
 	 */
 	protected function neat_array() {
 		$input = $this->data;
-		unset( $input[ $input['action'] .'_token'] );
-		unset( $input['action'] );
+		unset($input[$input['action'].'_token']);
+		unset($input['action']);
 		return $input;
 	}
 }

src/Collection/RuleCollection.php

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 
@@ -18,8 +18,8 @@ 
 	 *
 	 * @param array $rules
 	 */
-	public function __construct( array $rules ) {
-		$this->data = $this->parse_rules( $rules );
+	public function __construct(array $rules) {
+		$this->data = $this->parse_rules($rules);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_name( $rule ) {
-		return strstr( $rule, ':', true );
+	protected function extract_name($rule) {
+		return strstr($rule, ':', true);
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_params( $rule ) {
-		return ltrim( strstr($rule, ':'), ':');
+	protected function extract_params($rule) {
+		return ltrim(strstr($rule, ':'), ':');
 	}
 
 	/**
@@ -69,8 +69,8 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function has_parameters( $rule ) {
-		return strpos( $rule, ':' );
+	protected function has_parameters($rule) {
+		return strpos($rule, ':');
 	}
 
 	/**
@@ -83,20 +83,20 @@ 
 	 * @param array $rules
 	 * @return array
 	 */
-	protected function parse_rules( array $rules ) {
+	protected function parse_rules(array $rules) {
 		// WIP - works, but confusing - simplify or breakdown into small methods
 		$parsed = array();
-		$this->split_rules( $rules );
-		foreach( $rules as $field => $ruleset ) {
-			$parsed[ $field ] = array_map( function( $rule ) {
-				if ( $this->has_parameters( $rule ) ) {
+		$this->split_rules($rules);
+		foreach ($rules as $field => $ruleset) {
+			$parsed[$field] = array_map(function($rule) {
+				if ($this->has_parameters($rule)) {
 					return array(
-						'rule' => $this->extract_name( $rule ),
-						'params' => explode( ',', $this->extract_params( $rule ) )
+						'rule' => $this->extract_name($rule),
+						'params' => explode(',', $this->extract_params($rule))
 					);
 				}
 				return $rule;
-			}, $ruleset );
+			}, $ruleset);
 		}
 		return $parsed;
 	}
@@ -109,10 +109,10 @@ 
 	 *
 	 * @param array $rules
 	 */
-	protected function split_rules( array &$rules ) {
+	protected function split_rules(array &$rules) {
 		// perhaps the $rules array structure should be validated here?...
-		$rules = array_map( function( $item ) {
-			return explode( '|', $item );
-		}, $rules );
+		$rules = array_map(function($item) {
+			return explode('|', $item);
+		}, $rules);
 	}
 }

src/Artisan/Director.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) || die( 'envois' );
+defined('ABSPATH') || die('envois');
 
 use WFV\Contract\ArtisanInterface;
 
@@ -46,7 +46,7 @@ 
    *
    * @param string (optional) $identity
    */
-  public function __construct( $identity = null ) {
+  public function __construct($identity = null) {
     $this->entity = $identity;
   }
 
@@ -59,8 +59,8 @@ 
    * @param mixed $characteristic
    * @return self
    */
-  public function describe( $attribute, $characteristic ) {
-    $this->scribe[ $attribute ] = $characteristic;
+  public function describe($attribute, $characteristic) {
+    $this->scribe[$attribute] = $characteristic;
     return $this;
   }
 
@@ -72,10 +72,10 @@ 
    * @param ArtisanInterface $artisan
    * @return Composite
    */
-  public function compose( ArtisanInterface $artisan ) {
-    $this->orchestrate( $this->aspect, $artisan );
+  public function compose(ArtisanInterface $artisan) {
+    $this->orchestrate($this->aspect, $artisan);
     return $artisan
-      ->create( $this->entity )
+      ->create($this->entity)
       ->actualize();
   }
 
@@ -88,8 +88,8 @@ 
    * @param string|array (optional) $attributes
    * @return self
    */
-  public function with( $quality, $attributes = null ) {
-    $this->aspect[ $quality ] = $attributes;
+  public function with($quality, $attributes = null) {
+    $this->aspect[$quality] = $attributes;
     return $this;
   }
 
@@ -102,9 +102,9 @@ 
    * @param array $aspect
    * @param ArtisanInterface $artisan
    */
-  private function orchestrate( array $aspect, ArtisanInterface &$artisan ) {
-    foreach( $aspect as $component => $params ) {
-      $artisan->$component( $params );
+  private function orchestrate(array $aspect, ArtisanInterface&$artisan) {
+    foreach ($aspect as $component => $params) {
+      $artisan->$component($params);
     }
   }
 }

src/Artisan/FormArtisan.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Contract\ArtisanInterface;
 use WFV\Collection\ErrorCollection;
@@ -59,7 +59,7 @@ 
 	 *
 	 * @param array $config
 	 */
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 	}
 
@@ -82,8 +82,8 @@ 
 	 * @param string $action
 	 * @return WFV\Artisan\FormArtisan
 	 */
-	public function create( $action ) {
-		$this->form = new FormComposite( $this, $action );
+	public function create($action) {
+		$this->form = new FormComposite($this, $action);
 		return $this;
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function errors() {
-		$this->collection['errors'] = new ErrorCollection( $this->labels() );
+		$this->collection['errors'] = new ErrorCollection($this->labels());
 		return $this;
 	}
 
@@ -109,10 +109,10 @@ 
 	 * @param array $data
 	 * @return WFV\Artisan\FormArtisan
 	 */
-	public function input( array $data = [] ) {
+	public function input(array $data = []) {
 		$input = $data[0];
 		$trim = $data[1];
-		$this->collection['input'] = new InputCollection( $input, $trim );
+		$this->collection['input'] = new InputCollection($input, $trim);
 		return $this;
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function messages() {
-		$this->collection['messages'] = new MessageCollection( $this->config );
+		$this->collection['messages'] = new MessageCollection($this->config);
 		return $this;
 	}
 
@@ -138,10 +138,10 @@ 
 	 */
 	public function rules() {
 		$rules = array();
-		foreach( $this->config as $field => $options ) {
-			$rules[ $field ] = $options['rules'];
+		foreach ($this->config as $field => $options) {
+			$rules[$field] = $options['rules'];
 		}
-		$this->collection['rules'] = new RuleCollection( $rules );
+		$this->collection['rules'] = new RuleCollection($rules);
 		return $this;
 	}
 
@@ -168,7 +168,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}

src/Validators/AbstractValidator.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use \Respect\Validation\Validator as RespectValidator;
 use \Respect\Validation\Exceptions\NestedValidationException;
@@ -46,7 +46,7 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	abstract protected function set_policy( $optional = false );
+	abstract protected function set_policy($optional = false);
 
 	/**
 	 *
@@ -54,11 +54,11 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	public function __construct( $field ) {
+	public function __construct($field) {
 		$this->validator = new RespectValidator();
 		$this->field = $field;
 		$args = func_get_args();
-		$this->params = ( isset( $args[1] ) ) ? $args[1] : null;
+		$this->params = (isset($args[1])) ? $args[1] : null;
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 *
 	 * @param
 	 */
-	public function set_message( $message ) {
+	public function set_message($message) {
 		$this->template['message'] = $message;
 	}
 
@@ -113,8 +113,8 @@ 
 	 * @param string|array $value
 	 * @return bool
 	 */
-	public function validate( $value ) {
-		$is_valid = $this->validator->validate( $value );
+	public function validate($value) {
+		$is_valid = $this->validator->validate($value);
 		return $is_valid;
 	}
 }