macder / wfv-validation

src/Artisan/FormArtisan.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use WFV\Collection\ErrorCollection;
 use WFV\Collection\InputCollection;
 use WFV\Collection\RuleCollection;
-
 use WFV\FormComposite;
 use WFV\Validators;
 use WFV\Validator;

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use \Respect\Validation\Validator as RespectValidator;
 
@@ -69,7 +69,7 @@ 
 	 *
 	 * @param array $config
 	 */
-	function __construct( array $config ) {
+	function __construct(array $config) {
 		$this->config = $config;
 	}
 
@@ -92,8 +92,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;
 	}
 
@@ -106,7 +106,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function errors() {
-		$this->collection['errors'] = new ErrorCollection( $this->labels() );
+		$this->collection['errors'] = new ErrorCollection($this->labels());
 		return $this;
 	}
 
@@ -120,7 +120,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}
@@ -134,10 +134,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;
 	}
 
@@ -150,10 +150,10 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function rules() {
-		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);
 		$this->resolve_strategies();
 		return $this;
 	}
@@ -186,25 +186,25 @@ 
 		$optional = false;
 		$rules = $this->collection['rules']->get_array();
 
-		foreach( $rules as $field => $ruleset ) {
+		foreach ($rules as $field => $ruleset) {
 
 			$optional = in_array("optional", $ruleset);
 
-			foreach( $ruleset as $rule ) {
+			foreach ($ruleset as $rule) {
 
-				if( 'optional' !== $rule ){
+				if ('optional' !== $rule) {
 
-					$rule_name = ( is_string( $rule ) ) ? $rule : $rule['rule'];
-					$class = str_replace(' ', '', ucwords( str_replace('_', ' ', $rule_name ) ) );
+					$rule_name = (is_string($rule)) ? $rule : $rule['rule'];
+					$class = str_replace(' ', '', ucwords(str_replace('_', ' ', $rule_name)));
 					$class = 'WFV\Validators\\'.$class;
 
-					$message = ( isset( $this->config[ $field ]['messages'][ $rule_name ] ) )
-						? $this->config[ $field ]['messages'][ $rule_name ]
+					$message = (isset($this->config[$field]['messages'][$rule_name]))
+						? $this->config[$field]['messages'][$rule_name]
 						: false;
 
-					$strategies[ $field ][ $rule_name ] = ( is_string( $rule ) )
-						? new $class( new RespectValidator(), $field, $optional, $message )
-						: new $class( new RespectValidator(), $field, $optional, $message, $rule['params'] );
+					$strategies[$field][$rule_name] = (is_string($rule))
+						? new $class(new RespectValidator(), $field, $optional, $message)
+						: new $class(new RespectValidator(), $field, $optional, $message, $rule['params']);
 				}
 			}
 		}

src/FormComposite.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use WFV\Abstraction\Composable;
 use WFV\Contract\ArtisanInterface;
-use WFV\Contract\ValidateInterface;
 
 /**
  * Form Composition

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Abstraction\Composable;
 use WFV\Contract\ArtisanInterface;
@@ -39,9 +39,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	function __construct( ArtisanInterface $builder, $action ) {
+	function __construct(ArtisanInterface $builder, $action) {
 		$this->alias = $action;
-		$this->install( $builder->collection );
+		$this->install($builder->collection);
 		$this->strategies = $builder->strategies;
 		$this->validator = $builder->validator;
 	}
@@ -55,8 +55,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);
 	}
 
 	/**
@@ -70,8 +70,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;
 	}
 
@@ -107,8 +107,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);
 	}
 
 	/**
@@ -120,9 +120,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.'">';
 	}
 
 	/**
@@ -134,14 +134,14 @@ 
 	 * @return bool
 	 */
 	public function validate() {
-		$input = $this->utilize('input')->get_array( false );
+		$input = $this->utilize('input')->get_array(false);
 		$rules = $this->utilize('rules')->get_array();
 
-		foreach( array_keys($rules) as $field ) {
-			if( $this->strategies[ $field ] ) {
-				foreach( $this->strategies[ $field ] as $rule ) {
-					$value = ( isset( $input[ $field ] ) ) ? $input[ $field ] : null;
-					$this->validator->validate( $rule, $value );
+		foreach (array_keys($rules) as $field) {
+			if ($this->strategies[$field]) {
+				foreach ($this->strategies[$field] as $rule) {
+					$value = (isset($input[$field])) ? $input[$field] : null;
+					$this->validator->validate($rule, $value);
 				}
 			}
 		}
@@ -161,10 +161,10 @@ 
 	protected 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;
 	}
 
@@ -179,8 +179,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;
 	}
 
 	/**
@@ -191,8 +191,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);
 	}
 }

wfv-validate.php

Spacing +17 added lines, -17 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 /*
 Plugin Name: WFV - Form Validation
 Plugin URI:  https://macder.github.io/wfv/
@@ -11,12 +11,12 @@ 
 License URI: https://github.com/macder/wp-form-validation/blob/master/LICENSE
 */
 
-define( 'WFV_VALIDATE_VERSION', '0.11.0' );
-define( 'WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7' );
-define( 'WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'WFV_VALIDATE__ACTION_POST', 'validate_form' );
+define('WFV_VALIDATE_VERSION', '0.11.0');
+define('WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7');
+define('WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path(__FILE__));
+define('WFV_VALIDATE__ACTION_POST', 'validate_form');
 
-require_once WFV_VALIDATE__PLUGIN_DIR . '/vendor/autoload.php';
+require_once WFV_VALIDATE__PLUGIN_DIR.'/vendor/autoload.php';
 
 use WFV\Agent\InspectionAgent;
 use WFV\Artisan\Director;
@@ -31,19 +31,19 @@ 
  * @param array $form Form arguments
  * @param bool $trim Trim whitespace from beginning and end of string
  */
-function wfv_create( $action, array &$form, $trim = true ) {
-	$inspect = new InspectionAgent( $action );
-	$input = ( true === $inspect->safe_submit() ) ? $_POST : array();
+function wfv_create($action, array &$form, $trim = true) {
+	$inspect = new InspectionAgent($action);
+	$input = (true === $inspect->safe_submit()) ? $_POST : array();
 
-	$builder = new FormArtisan( $form );
-	$form = ( new Director( $action ) )
-		->with( 'input', [ $input, $trim ] )
-		->with( 'rules' )
-		->with( 'errors' )
-		->with( 'validator' )
-		->compose( $builder );
+	$builder = new FormArtisan($form);
+	$form = (new Director($action))
+		->with('input', [$input, $trim])
+		->with('rules')
+		->with('errors')
+		->with('validator')
+		->compose($builder);
 
-	if( $input ) {
+	if ($input) {
 		$form->validate();
 	}
 }

src/Collection/RuleCollection.php

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or 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);
 	}
 
 
@@ -42,10 +42,10 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	public function is_custom( $rule ) {
+	public function is_custom($rule) {
 		// WIP - needs adjusting to new rule string format
-		if ( false === is_array( $rule ) ){
-			return ( false !== strpos( $rule, 'custom:' ) ) ? true : false;
+		if (false === is_array($rule)) {
+			return (false !== strpos($rule, 'custom:')) ? true : false;
 		}
 	}
 
@@ -58,8 +58,8 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function extract_name( $rule ) {
-		return strstr( $rule, ':', true );
+	protected function extract_name($rule) {
+		return strstr($rule, ':', true);
 	}
 
 	/**
@@ -71,8 +71,8 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function extract_params( $rule ) {
-		return ltrim( strstr($rule, ':'), ':');
+	protected function extract_params($rule) {
+		return ltrim(strstr($rule, ':'), ':');
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function has_parameters( $rule ) {
-		return strpos( $rule, ':' );
+	protected function has_parameters($rule) {
+		return strpos($rule, ':');
 	}
 
 	/**
@@ -98,19 +98,19 @@ 
 	 * @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
-		$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;
 	}
@@ -124,10 +124,10 @@ 
 	 * @param array $rules
 	 * @return array
 	 */
-	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/Collection/InputCollection.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Abstraction\Collectable;
 
@@ -20,9 +20,9 @@ 
 	 * @param array $data
 	 * @param bool $trim
 	 */
-	function __construct( array $data = array(), $trim ) {
-		$data = $this->transform_array_leafs( $data, 'stripslashes' );
-		$this->data = ( $trim ) ? $this->transform_array_leafs( $data, 'trim' ) : $data;
+	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/ErrorCollection.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or 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,10 +83,10 @@ 
 	 * @param array $errors
 	 * @return array
 	 */
-	protected function with_labels( $errors ) {
-		foreach( $errors as $field => $messages ) {
-			$label = $this->label( $field );
-			$labeled[ $field ] = str_replace( '{label}', $label, $errors[ $field ] );
+	protected function with_labels($errors) {
+		foreach ($errors as $field => $messages) {
+			$label = $this->label($field);
+			$labeled[$field] = str_replace('{label}', $label, $errors[$field]);
 		}
 		return $labeled;
 	}

src/Validators/AbstractValidator.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use \Respect\Validation\Validator as RespectValidator;
 use \Respect\Validation\Exceptions\NestedValidationException;
@@ -67,7 +67,7 @@ 
 	 * @param bool (optional) $optional
 	 * @param string (optional) $message
 	 */
-	function __construct( RespectValidator $validator, $field, $optional = false, $message = false ) {
+	function __construct(RespectValidator $validator, $field, $optional = false, $message = false) {
 		// WIP - simplify - parameter overload...
 
 		$this->optional = $optional;
@@ -76,10 +76,10 @@ 
 
 		$args = func_get_args();
 
-		$this->params = ( isset( $args[4] ) ) ? $args[4] : null;
+		$this->params = (isset($args[4])) ? $args[4] : null;
 
-		if( $message ) {
-			$this->set_message( $message );
+		if ($message) {
+			$this->set_message($message);
 		}
 
 		$this->set_policy();
@@ -126,8 +126,8 @@ 
 	 * @param string|array $input
 	 * @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;
 	}
 
@@ -138,7 +138,7 @@ 
 	 *
 	 * @param
 	 */
-	protected function set_message( $message ) {
+	protected function set_message($message) {
 		$this->template['message'] = $message;
 	}
 }

src/Validators/Required.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Validators\AbstractValidator;
 

src/Validators/Boolean.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -32,8 +32,8 @@ 
 	 */
 	protected function set_policy() {
 		$v = $this->validator;
-		$v = ( $this->optional )
-			? $v->optional( $v->create()->boolVal() )
+		$v = ($this->optional)
+			? $v->optional($v->create()->boolVal())
 			: $v->boolVal();
 	}
 }