macder / wfv-validation

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

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

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