macder / wfv-validation

src/Validators/Equals.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -32,15 +32,15 @@ 
 	 * @param bool (optional) $optional
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false ) {
+	public function validate($input = null, $optional = false) {
 		$args = func_get_args();
 		$params = $args[2];
 		$compare_value = $params[0];
 
 		$v = $this->validator->create();
 
-		return ( $optional )
-			? $v->optional( $v->create()->equals( $compare_value ) )->validate( $input )
-			: $v->equals( $compare_value )->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->equals($compare_value))->validate($input)
+			: $v->equals($compare_value)->validate($input);
 	}
 }

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;
 	}
 
@@ -126,10 +126,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;
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function validator() {
-		$this->validator = new Validator( new MessageCollection( $this->config ) );
+		$this->validator = new Validator(new MessageCollection($this->config));
 		return $this;
 	}
 
@@ -156,7 +156,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}

src/Collection/MessageCollection.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;
 /**
  *
@@ -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);
 	}
 
 	/**
@@ -40,9 +40,9 @@ 
 	 * @param string $rule
 	 * @return array|null
 	 */
-	public function get_msg( $field, $rule ) {
-		return ( isset( $this->data[ $field ][ $rule ] ) )
-			? $this->data[ $field ][ $rule ]
+	public function get_msg($field, $rule) {
+		return (isset($this->data[$field][$rule]))
+			? $this->data[$field][$rule]
 			: null;
 	}
 
@@ -56,9 +56,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);
 		});
 	}
 
@@ -70,10 +70,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;
 	}
@@ -86,8 +86,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/FormComposite.php

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Composable;
 use WFV\Artisan\FormArtisan;
@@ -31,9 +31,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( FormArtisan $builder, $action ) {
+	public function __construct(FormArtisan $builder, $action) {
 		$this->alias = $action;
-		$this->install( $builder->collection );
+		$this->install($builder->collection);
 		$this->validator = $builder->validator;
 	}
 
@@ -46,8 +46,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);
 	}
 
 	/**
@@ -61,8 +61,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;
 	}
 
@@ -100,10 +100,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;
 	}
 
@@ -127,8 +127,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);
 	}
 
 	/**
@@ -140,9 +140,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.'">';
 	}
 
 	/**
@@ -153,17 +153,17 @@ 
 	 * @param ValidatorFactory $factory
 	 * @return self
 	 */
-	public function validate( ValidatorFactory $factory ) {
+	public function validate(ValidatorFactory $factory) {
 		$rule_collection = $this->utilize('rules');
-		$rules = $rule_collection->get_array( true );
+		$rules = $rule_collection->get_array(true);
 
-		foreach( $rules as $field => $ruleset ) {
-			$input = $this->field_value( $field );
-			$optional = $rule_collection->is_optional( $field );
+		foreach ($rules as $field => $ruleset) {
+			$input = $this->field_value($field);
+			$optional = $rule_collection->is_optional($field);
 
-			foreach( $ruleset as $index => $rule ) {
-				$params = $rule_collection->get_params( $field, $index );
-				$this->validator->validate( $factory->get( $rule ), $field, $input, $optional, $params );
+			foreach ($ruleset as $index => $rule) {
+				$params = $rule_collection->get_params($field, $index);
+				$this->validator->validate($factory->get($rule), $field, $input, $optional, $params);
 			}
 		}
 		return $this;
@@ -178,11 +178,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;
 	}
@@ -198,8 +198,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;
 	}
 
 	/**
@@ -210,8 +210,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 +22 added lines, -22 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || 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\FormComposite;
 use WFV\Agent\InspectionAgent;
@@ -33,20 +33,20 @@ 
  * @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 ) {
-		wfv_validate( $form );
+	if ($input) {
+		wfv_validate($form);
 	}
 }
 
@@ -58,8 +58,8 @@ 
  * @param FormComposite $form
  * @return bool
  */
-function wfv_validate( FormComposite $form ) {
-	$factory = ( new ValidatorFactory() )
-		->add( $form->rules()->unique() );
-	return $form->validate( $factory )->is_valid();
+function wfv_validate(FormComposite $form) {
+	$factory = (new ValidatorFactory())
+		->add($form->rules()->unique());
+	return $form->validate($factory)->is_valid();
 }

src/Collection/ErrorCollection.php

Spacing +18 added lines, -18 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 ( isset( $this->data[ $field ] ) )
-			? array_values( $this->data[ $field ] )[0]
+	public function first($field) {
+		return (isset($this->data[$field]))
+			? array_values($this->data[$field])[0]
 			: null;
 	}
 
@@ -52,9 +52,9 @@ 
 	 * @param string $field
 	 * @return array|null
 	 */
-	public function get( $field ) {
-		return ( isset( $this->data[ $field ] ) )
-			? $this->data[ $field ]
+	public function get($field) {
+		return (isset($this->data[$field]))
+			? $this->data[$field]
 			: null;
 	}
 
@@ -66,10 +66,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);
 	}
 
 	/**
@@ -82,9 +82,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;
 	}
 
@@ -97,11 +97,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/Validators/LengthMax.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -32,14 +32,14 @@ 
 	 * @param bool (optional) $optional
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false ) {
+	public function validate($input = null, $optional = false) {
 		$args = func_get_args();
 		$params = $args[2];
 		$max_value = $params[0];
 
 		$v = $this->validator->create();
-		return ( $optional )
-			? $v->optional( $v->create()->length( null, $max_value ) )->validate( $input )
-			: $v->length( null, $max_value )->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->length(null, $max_value))->validate($input)
+			: $v->length(null, $max_value)->validate($input);
 	}
 }

src/Validators/Different.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -32,18 +32,18 @@ 
 	 * @param bool (optional) $optional
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false ){
+	public function validate($input = null, $optional = false) {
 		$args = func_get_args();
 		$params = $args[2];
 		$other_field = $params[0];
 
 		$v = $this->validator->create();
 
-		if( $optional ) {
+		if ($optional) {
 			return $v->optional(
-				$v->create()->not( $v->create()->equals( $_POST[ $other_field ] )) )
-					->validate( $input );
+				$v->create()->not($v->create()->equals($_POST[$other_field])) )
+					->validate($input);
 		}
-		return $v->not( $v->create()->equals( $_POST[ $other_field ] ))->validate( $input );
+		return $v->not($v->create()->equals($_POST[$other_field]))->validate($input);
 	}
 }

src/Validators/LengthMin.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -32,14 +32,14 @@ 
 	 * @param bool (optional) $optional
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false ) {
+	public function validate($input = null, $optional = false) {
 		$args = func_get_args();
 		$params = $args[2];
 		$min_value = $params[0];
 
 		$v = $this->validator->create();
-		return ( $optional )
-			? $v->optional( $v->create()->length( $min_value, null ) )->validate( $input )
-			: $v->length( $min_value, null )->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->length($min_value, null))->validate($input)
+			: $v->length($min_value, null)->validate($input);
 	}
 }