macder / wfv-validation

src/Artisan/FormArtisan.php

Doc Comments +5 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\FormComposite
+	 * @return FormComposite
 	 */
 	public function actualize() {
 		return $this->form;
@@ -80,8 +80,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @param string $action
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function create() {
 		$this->form = new FormComposite( $this );
@@ -94,7 +93,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function errors() {
 		$this->collection['errors'] = new ErrorCollection( $this->labels() );
@@ -107,7 +106,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function input() {
 		$guard = new InspectionAgent( $this->action );
@@ -121,7 +120,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function rules() {
 		$this->collection['rules'] = new RuleCollection( $this->config );

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use WFV\Collection\ErrorCollection;
 use WFV\Collection\InputCollection;
 use WFV\Collection\RuleCollection;
-
 use WFV\FormComposite;
 
 /**

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Agent\InspectionAgent;
 use WFV\Contract\ArtisanInterface;
@@ -59,7 +59,7 @@ 
 	 * @param array $config
 	 * @param string $action
 	 */
-	public function __construct( array $config, $action ) {
+	public function __construct(array $config, $action) {
 		$this->config = $config;
 		$this->action = $action;
 	}
@@ -84,7 +84,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function create() {
-		$this->form = new FormComposite( $this );
+		$this->form = new FormComposite($this);
 		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 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function input() {
-		$guard = new InspectionAgent( $this->action );
-		$this->collection['input'] = new InputCollection( $guard );
+		$guard = new InspectionAgent($this->action);
+		$this->collection['input'] = new InputCollection($guard);
 		return $this;
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function rules() {
-		$this->collection['rules'] = new RuleCollection( $this->config );
+		$this->collection['rules'] = new RuleCollection($this->config);
 		return $this;
 	}
 
@@ -138,7 +138,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}

src/FormComposite.php

Doc Comments +4 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @param ArtisanInterface $builder
+	 * @param FormArtisan $builder
 	 */
 	public function __construct( FormArtisan $builder ) {
 		$this->alias = $builder->action;
@@ -89,7 +89,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\Collection\InputCollection
+	 * @return Collection\InputCollection
 	 */
 	public function input() {
 		return $this->utilize('input');
@@ -153,6 +153,8 @@ 
 	 * @param string $response
 	 * @param string (optional) $field
 	 * @param string (optional) $value
+	 * @param string $field
+	 * @param string $value
 	 * @return string|null
 	 */
 	protected function string_or_null( $response, $field = null, $value = null ) {

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 defined( 'ABSPATH' ) || die();
 
 use WFV\Artisan\FormArtisan;
-use WFV\Contract\ValidateInterface;
-use WFV\RuleFactory;
 
 /**
  * Form Composition

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Artisan\FormArtisan;
 use WFV\Contract\ValidateInterface;
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param ArtisanInterface $builder
 	 */
-	public function __construct( FormArtisan $builder ) {
+	public function __construct(FormArtisan $builder) {
 		$this->alias = $builder->action;
 		$this->collection = $builder->collection;
 	}
@@ -52,8 +52,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);
 	}
 
 	/**
@@ -67,8 +67,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;
 	}
 
@@ -126,8 +126,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);
 	}
 
 	/**
@@ -139,9 +139,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.'">';
 	}
 
 	/**
@@ -155,9 +155,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;
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 *
 	 * @param string $component Key indentifier.
 	 */
-	protected function utilize( $component ) {
-		return $this->collection[ $component ];
+	protected function utilize($component) {
+		return $this->collection[$component];
 	}
 }

wfv-validate.php

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
 
 require_once WFV_VALIDATE__PLUGIN_DIR . '/vendor/autoload.php';
 
-use WFV\FormComposite;
 use WFV\RuleFactory;
 use WFV\Validator;
 use WFV\Artisan\Director;

Spacing +15 added lines, -15 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/wfv-validation/blob/master/LICENSE
 */
 
-define( 'WFV_VALIDATE_VERSION', '0.11.3' );
-define( 'WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7' );
-define( 'WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define('WFV_VALIDATE_VERSION', '0.11.3');
+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\RuleFactory;
@@ -33,17 +33,17 @@ 
  * @param array $form Form arguments
  * @param bool $trim Trim whitespace from beginning and end of string
  */
-function wfv_create( $action, array &$form, $trim = true ) {
-	$messages = new MessageCollection( $form );
+function wfv_create($action, array &$form, $trim = true) {
+	$messages = new MessageCollection($form);
 
-	$builder = new FormArtisan( $form, $action );
-	$form = ( new Director() )
-		->with( 'input' )
-		->with( 'rules' )
-		->with( 'errors' )
-		->compose( $builder );
+	$builder = new FormArtisan($form, $action);
+	$form = (new Director())
+		->with('input')
+		->with('rules')
+		->with('errors')
+		->compose($builder);
 
-	if( $form->input()->is_populated() ) {
-		( new Validator( new RuleFactory(), $messages ) )->validate( $form );
+	if ($form->input()->is_populated()) {
+		(new Validator(new RuleFactory(), $messages))->validate($form);
 	}
 }

src/Collection/RuleCollection.php

Spacing +46 added lines, -46 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 $form
 	 */
-	public function __construct( array $form ) {
-		$this->data = $this->parse_rules( $form );
+	public function __construct(array $form) {
+		$this->data = $this->parse_rules($form);
 	}
 
 
@@ -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,9 +113,9 @@ 
 	 * @param array $form
 	 * @return array
 	 */
-	protected function extract_rules( array $form ) {
-		foreach( $form as $field => $options ) {
-			$rules[ $field ] = $options['rules'];
+	protected function extract_rules(array $form) {
+		foreach ($form as $field => $options) {
+			$rules[$field] = $options['rules'];
 		}
 		return $rules;
 	}
@@ -129,11 +129,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;
 			}
@@ -151,8 +151,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]);
 	}
 
 	/**
@@ -165,22 +165,22 @@ 
 	 * @param array $form
 	 * @return array
 	 */
-	protected function parse_rules( array $form ) {
+	protected function parse_rules(array $form) {
 		// WIP - works, but confusing - simplify or breakdown into small methods
-		$rules = $this->extract_rules( $form );
+		$rules = $this->extract_rules($form);
 
 		$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;
 	}
@@ -195,14 +195,14 @@ 
 	 * @return array
 	 */
 	protected function remove_params() {
-		return array_map( function( $item ) {
-			foreach( $item as $index => $rule ) {
-				if( $rule !== 'optional' ) {
-					$rules[ $index ] = ( is_string( $rule ) ) ? $rule : $rule['rule'];
+		return array_map(function($item) {
+			foreach ($item as $index => $rule) {
+				if ($rule !== 'optional') {
+					$rules[$index] = (is_string($rule)) ? $rule : $rule['rule'];
 				}
 			}
 			return $rules;
-		}, $this->data );
+		}, $this->data);
 	}
 
 	/**
@@ -213,11 +213,11 @@ 
 	 *
 	 * @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);
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function string_has_params( $rule ) {
-		return strpos( $rule, ':' );
+	protected function string_has_params($rule) {
+		return strpos($rule, ':');
 	}
 }

src/Contract/ArtisanInterface.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 namespace WFV\Contract;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 /**
  *

src/Validator.php

Spacing +31 added lines, -31 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\FormComposite;
 use WFV\Collection\InputCollection;
@@ -49,7 +49,7 @@ 
 	 *
 	 * @param RuleFactory $factory
 	 */
-	public function __construct( RuleFactory $factory, MessageCollection $messages ) {
+	public function __construct(RuleFactory $factory, MessageCollection $messages) {
 		$this->factory = $factory;
 		$this->messages = $messages;
 	}
@@ -62,20 +62,20 @@ 
 	 * @param FormComposite $form
 	 * @return bool
 	 */
-	public function validate( FormComposite $form ) {
+	public function validate(FormComposite $form) {
 		$rule_collection = $form->rules();
-		$rules = $rule_collection->get_array( true );
+		$rules = $rule_collection->get_array(true);
 
-		foreach( $rules as $field => $ruleset ) {
-			$input = $this->field_value( $form->input(), $field );
-			$optional = $rule_collection->is_optional( $field );
+		foreach ($rules as $field => $ruleset) {
+			$input = $this->field_value($form->input(), $field);
+			$optional = $rule_collection->is_optional($field);
 
-			foreach( $ruleset as $index => $rule ) {
-				$params = $rule_collection->get_params( $field, $index );
-				$this->is_valid( $this->factory->get( $rule ), $field, $input, $optional, $params );
+			foreach ($ruleset as $index => $rule) {
+				$params = $rule_collection->get_params($field, $index);
+				$this->is_valid($this->factory->get($rule), $field, $input, $optional, $params);
 			}
 		}
-		return $this->result( $form );
+		return $this->result($form);
 	}
 
 	/**
@@ -87,11 +87,11 @@ 
 	 * @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;
 	}
 
 	/**
@@ -118,10 +118,10 @@ 
 	 * @param string $field
 	 * @return string|array|null
 	 */
-	protected function field_value( InputCollection $input, $field ) {
-		if( $input->has( $field ) ) {
+	protected function field_value(InputCollection $input, $field) {
+		if ($input->has($field)) {
 			$input = $input->get_array();
-			return $input[ $field ];
+			return $input[$field];
 		}
 		return null;
 	}
@@ -137,11 +137,11 @@ 
 	 * @param bool $optional
 	 * @param array (optional) $params
 	 */
-	protected function is_valid( 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() );
+	protected function is_valid(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());
 		}
 	}
 
@@ -154,12 +154,12 @@ 
 	 * @param FormComposite $form
 	 * @return bool
 	 */
-	protected function result( FormComposite $form ) {
-		$valid = empty( $this->errors );
-		if( !$valid ) {
-			$form->errors()->set_errors( $this->errors );
+	protected function result(FormComposite $form) {
+		$valid = empty($this->errors);
+		if (!$valid) {
+			$form->errors()->set_errors($this->errors);
 		}
-		$this->trigger_post_validate_action( $form, $valid );
+		$this->trigger_post_validate_action($form, $valid);
 		return $valid;
 	}
 
@@ -173,8 +173,8 @@ 
 	 * @param FormComposite $form
 	 * @param bool $is_valid
 	 */
-	protected function trigger_post_validate_action( FormComposite $form, $is_valid = false ) {
-		$action = ( true === $is_valid ) ? $form->name() : $form->name() .'_fail';
-		do_action( $action, $form );
+	protected function trigger_post_validate_action(FormComposite $form, $is_valid = false) {
+		$action = (true === $is_valid) ? $form->name() : $form->name().'_fail';
+		do_action($action, $form);
 	}
 }

src/Artisan/Director.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Contract\ArtisanInterface;
 
@@ -29,8 +29,8 @@ 
 	 * @param ArtisanInterface $builder
 	 * @return object
 	 */
-	public function compose( ArtisanInterface $builder ) {
-		$this->amalgamate( $this->component, $builder );
+	public function compose(ArtisanInterface $builder) {
+		$this->amalgamate($this->component, $builder);
 		return $builder
 			->create()
 			->actualize();
@@ -45,8 +45,8 @@ 
 	 * @param string|array|object (optional) $params
 	 * @return self
 	 */
-	public function with( $name, $params = null ) {
-		$this->component[ $name ] = $params;
+	public function with($name, $params = null) {
+		$this->component[$name] = $params;
 		return $this;
 	}
 
@@ -59,9 +59,9 @@ 
 	 * @param array $components
 	 * @param ArtisanInterface $builder
 	 */
-	private function amalgamate( array $components, ArtisanInterface &$builder ) {
-		foreach( $components as $component => $params ) {
-			$builder->$component( $params );
+	private function amalgamate(array $components, ArtisanInterface&$builder) {
+		foreach ($components as $component => $params) {
+			$builder->$component($params);
 		}
 	}
 }