macder / wfv-validation

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);
 	}
 }

src/Validators/Url.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,10 +32,10 @@ 
 	 * @param bool (optional) $optional
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false ) {
+	public function validate($input = null, $optional = false) {
 		$v = $this->validator->create();
-		return ( $optional )
-			? $v->optional( $v->create()->url() )->validate( $input )
-			: $v->url()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->url())->validate($input)
+			: $v->url()->validate($input);
 	}
 }

src/Validators/Phone.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,10 +32,10 @@ 
 	 * @param bool (optional) $optional
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false ) {
+	public function validate($input = null, $optional = false) {
 		$v = $this->validator->create();
-		return ( $optional )
-			? $v->optional( $v->create()->phone() )->validate( $input )
-			: $v->phone()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->phone())->validate($input)
+			: $v->phone()->validate($input);
 	}
 }

src/Collection/RuleCollection.php

Spacing +42 added lines, -42 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);
 	}
 
 
@@ -32,8 +32,8 @@ 
 	 * @param bool (optional) $flat
 	 * @return array
 	 */
-	public function get_array( $flat = false ) {
-		return ( $flat ) ? $this->remove_params() : $this->data;
+	public function get_array($flat = false) {
+		return ($flat) ? $this->remove_params() : $this->data;
 	}
 
 	/**
@@ -45,9 +45,9 @@ 
 	 * @param int $index
 	 * @return array|bool
 	 */
-	public function get_params( $field, $index ) {
-		return ( $this-> has_params( $field, $index ) )
-			? $this->data[ $field ][ $index ]['params']
+	public function get_params($field, $index) {
+		return ($this-> has_params($field, $index))
+			? $this->data[$field][$index]['params']
 			: false;
 	}
 
@@ -59,9 +59,9 @@ 
 	 * @param string $field
 	 * @return bool
 	 */
-	public function is_optional( $field ) {
-		if( $this->has( $field ) ){
-			return in_array('optional', $this->data[ $field ] );
+	public function is_optional($field) {
+		if ($this->has($field)) {
+			return in_array('optional', $this->data[$field]);
 		}
 		return false;
 	}
@@ -74,8 +74,8 @@ 
 	 * @return array
 	 */
 	public function unique() {
-		$flat = $this->flatten( $this->remove_params() );
-		return array_values( array_unique( $flat ) );
+		$flat = $this->flatten($this->remove_params());
+		return array_values(array_unique($flat));
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_name( $rule ) {
-		return strstr( $rule, ':', true );
+	protected function extract_name($rule) {
+		return strstr($rule, ':', true);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_params( $rule ) {
-		return ltrim( strstr($rule, ':'), ':');
+	protected function extract_params($rule) {
+		return ltrim(strstr($rule, ':'), ':');
 	}
 
 	/**
@@ -113,11 +113,11 @@ 
 	 * @param array $array
 	 * @return array
 	 */
-	protected function flatten( array $array ) {
+	protected function flatten(array $array) {
 		$flat = array();
-		foreach( $array as $rule ) {
-			if( is_array( $rule ) ){
-				$flat = array_merge( $flat, $this->flatten( $rule ) );
+		foreach ($array as $rule) {
+			if (is_array($rule)) {
+				$flat = array_merge($flat, $this->flatten($rule));
 			} else {
 				$flat[] = $rule;
 			}
@@ -135,8 +135,8 @@ 
 	 * @param int $index
 	 * @return bool
 	 */
-	protected function has_params( $field, $index ) {
-		return is_array( $this->data[ $field ][ $index ] );
+	protected function has_params($field, $index) {
+		return is_array($this->data[$field][$index]);
 	}
 
 	/**
@@ -148,8 +148,8 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function string_has_params( $rule ) {
-		return strpos( $rule, ':' );
+	protected function string_has_params($rule) {
+		return strpos($rule, ':');
 	}
 
 	/**
@@ -162,20 +162,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->string_has_params( $rule ) ) {
+		$this->split_rules($rules);
+		foreach ($rules as $field => $ruleset) {
+			$parsed[$field] = array_map(function($rule) {
+				if ($this->string_has_params($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;
 	}
@@ -190,14 +190,14 @@ 
 	 * @return array
 	 */
 	protected function remove_params() {
-		return array_map( function( $item ) {
-			foreach( $item as $rule ) {
-				if( $rule !== 'optional' ) {
-					$rules[] = ( is_string( $rule ) ) ? $rule : $rule['rule'];
+		return array_map(function($item) {
+			foreach ($item as $rule) {
+				if ($rule !== 'optional') {
+					$rules[] = (is_string($rule)) ? $rule : $rule['rule'];
 				}
 			}
 			return $rules;
-		}, $this->data );
+		}, $this->data);
 	}
 
 	/**
@@ -208,10 +208,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/Validator.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Collection\MessageCollection;
 use WFV\Contract\ValidateInterface;
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param
 	 */
-	public function __construct( MessageCollection $messages ) {
+	public function __construct(MessageCollection $messages) {
 		$this->messages = $messages;
 	}
 
@@ -61,7 +61,7 @@ 
 	 * @return bool
 	 */
 	public function is_valid() {
-		return empty( $this->errors );
+		return empty($this->errors);
 	}
 
 	/**
@@ -76,11 +76,11 @@ 
 	 * @param array (optional) $params
 	 * @return self
 	 */
-	public function validate( ValidateInterface $rule, $field, $value, $optional, $params = false ) {
-		$params[] = ( $params ) ? $field : false;
-		$valid = $rule->validate( $value, $optional, $params );
-		if( !$valid ){
-			$this->add_error( $field, $rule->template() );
+	public function validate(ValidateInterface $rule, $field, $value, $optional, $params = false) {
+		$params[] = ($params) ? $field : false;
+		$valid = $rule->validate($value, $optional, $params);
+		if (!$valid) {
+			$this->add_error($field, $rule->template());
 		}
 		return $this;
 	}
@@ -94,10 +94,10 @@ 
 	 * @param string $field
 	 * @param array $template
 	 */
-	protected function add_error( $field, array $template ) {
-		$message = ( $this->messages->has( $field ) )
-			? $this->messages->get_msg( $field, $template['name'] )
+	protected function add_error($field, array $template) {
+		$message = ($this->messages->has($field))
+			? $this->messages->get_msg($field, $template['name'])
 			: $template['message'];
-		$this->errors[ $field ][ $template['name'] ] = $message;
+		$this->errors[$field][$template['name']] = $message;
 	}
 }

src/Agent/InspectionAgent.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Agent;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 
 /**
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param string $action
 	 */
-	public function __construct( $action ) {
+	public function __construct($action) {
 		$this->action = $action;
 	}
 
@@ -40,8 +40,8 @@ 
 	 * @return bool
 	 */
 	public function safe_submit() {
-		if( $this->submit_has_action() ) {
-			return ( $_POST['action'] === $this->action ) ? $this->nonce() : false;
+		if ($this->submit_has_action()) {
+			return ($_POST['action'] === $this->action) ? $this->nonce() : false;
 		}
 		return false;
 	}
@@ -54,7 +54,7 @@ 
 	 * @return bool
 	 */
 	private function submit_has_action() {
-		return isset( $_POST['action'] );
+		return isset($_POST['action']);
 	}
 
 	/**
@@ -66,8 +66,8 @@ 
 	 * @return bool
 	 */
 	private function nonce() {
-		$nonce = $_REQUEST[ $this->action.'_token' ];
-		return ( wp_verify_nonce( $nonce, $this->action ) ) ? true : false;
+		$nonce = $_REQUEST[$this->action.'_token'];
+		return (wp_verify_nonce($nonce, $this->action)) ? true : false;
 	}
 
 }

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\Agent\InspectionAgent;
 use WFV\Contract\ArtisanInterface;
@@ -60,7 +60,7 @@ 
 	 *
 	 * @param array $config
 	 */
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 	}
 
@@ -83,8 +83,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;
 	}
 
@@ -97,7 +97,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function errors() {
-		$this->collection['errors'] = new ErrorCollection( $this->labels() );
+		$this->collection['errors'] = new ErrorCollection($this->labels());
 		return $this;
 	}
 
@@ -110,8 +110,8 @@ 
 	 * @param InspectionAgent $guard
 	 * @return WFV\Artisan\FormArtisan
 	 */
-	public function input( InspectionAgent $guard ) {
-		$this->collection['input'] = new InputCollection( $guard );
+	public function input(InspectionAgent $guard) {
+		$this->collection['input'] = new InputCollection($guard);
 		return $this;
 	}
 
@@ -125,10 +125,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;
 	}
 
@@ -141,7 +141,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;
 	}
 
@@ -155,7 +155,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}

wfv-validate.php

Spacing +20 added lines, -20 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,11 +11,11 @@ 
 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_VERSION', '0.11.0');
+define('WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7');
+define('WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path(__FILE__));
 
-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;
@@ -32,19 +32,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 ) {
-	$guard = new InspectionAgent( $action );
+function wfv_create($action, array &$form, $trim = true) {
+	$guard = new InspectionAgent($action);
 
-	$builder = new FormArtisan( $form );
-	$form = ( new Director( $action ) )
-		->with( 'input', $guard )
-		->with( 'rules' )
-		->with( 'errors' )
-		->with( 'validator' )
-		->compose( $builder );
+	$builder = new FormArtisan($form);
+	$form = (new Director($action))
+		->with('input', $guard)
+		->with('rules')
+		->with('errors')
+		->with('validator')
+		->compose($builder);
 
-	if( $form->input()->is_populated() ) {
-		wfv_validate( $form );
+	if ($form->input()->is_populated()) {
+		wfv_validate($form);
 	}
 }
 
@@ -56,8 +56,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/FormComposite.php

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Artisan\FormArtisan;
 use WFV\Contract\ValidateInterface;
@@ -48,7 +48,7 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( FormArtisan $builder, $action ) {
+	public function __construct(FormArtisan $builder, $action) {
 		$this->alias = $action;
 		$this->collection = $builder->collection;
 		$this->validator = $builder->validator;
@@ -63,8 +63,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);
 	}
 
 	/**
@@ -78,8 +78,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;
 	}
 
@@ -117,10 +117,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;
 	}
 
@@ -144,8 +144,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);
 	}
 
 	/**
@@ -157,9 +157,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.'">';
 	}
 
 	/**
@@ -170,17 +170,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;
@@ -196,11 +196,11 @@ 
 	 * @param string $field
 	 * @return string|array|null
 	 */
-	protected function field_value( $field ) {
+	protected function field_value($field) {
 		$input = $this->utilize('input');
-		if( $input->has( $field ) ) {
+		if ($input->has($field)) {
 			$input = $input->get_array();
-			return $input[ $field ];
+			return $input[$field];
 		}
 		return null;
 	}
@@ -216,9 +216,9 @@ 
 	 * @param string (optional) $value
 	 * @return string|null
 	 */
-	protected function string_or_null( $response, $field = null, $value = null ) {
+	protected function string_or_null($response, $field = null, $value = null) {
 		$input = $this->utilize('input');
-		return ( $input->contains( $field, $value ) ) ? $response : null;
+		return ($input->contains($field, $value)) ? $response : null;
 	}
 
 	/**
@@ -229,9 +229,9 @@ 
 	 *
 	 * @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);
 	}
 
 	/**
@@ -242,7 +242,7 @@ 
 	 *
 	 * @param string $component Key indentifier.
 	 */
-	protected function utilize( $component ) {
-		return $this->collection[ $component ];
+	protected function utilize($component) {
+		return $this->collection[$component];
 	}
 }