macder / wfv-validation

src/Rules/RequiredWith.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Rules;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Rules\AbstractRule;
 
@@ -34,7 +34,7 @@ 
 	 * @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];
@@ -43,9 +43,9 @@ 
 		$v = $this->validator->create();
 
 		return $v->when(
-			$v->create()->key( $other_field, $v->create()->notEmpty() ),
-			$v->create()->key( $field, $v->create()->notEmpty() ),
-			$v->create()->key( $field, $v->create()->alwaysValid() )
-		)->validate( $_POST );
+			$v->create()->key($other_field, $v->create()->notEmpty()),
+			$v->create()->key($field, $v->create()->notEmpty()),
+			$v->create()->key($field, $v->create()->alwaysValid())
+		)->validate($_POST);
 	}
 }

src/Rules/Different.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Rules;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Rules\AbstractRule;
 
@@ -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/Rules/Callback.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Rules;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Rules\AbstractRule;
 
@@ -32,13 +32,13 @@ 
 	 * @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];
 
 		$v = $this->validator->create();
-		return ( $optional )
-			? $v->optional( $v->create()->callback( $params[0] ) )->validate( $input )
-			: $v->callback( $params[0] )->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->callback($params[0]))->validate($input)
+			: $v->callback($params[0])->validate($input);
 	}
 }

src/Rules/Date.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Rules;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Rules\AbstractRule;
 
@@ -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 = isset( $args[2] ) ? $args[2]: false;
-		$format = ( isset( $params[0] ) ) ? $params[0] : null;
+		$params = isset($args[2]) ? $args[2] : false;
+		$format = (isset($params[0])) ? $params[0] : null;
 
 		$v = $this->validator->create();
-		return ( $optional )
-			? $v->optional( $v->create()->date( $format ) )->validate( $input )
-			: $v->date( $format )->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->date($format))->validate($input)
+			: $v->date($format)->validate($input);
 	}
 }

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 +16 added lines, -16 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;
 	}
 
@@ -115,7 +115,7 @@ 
 	 * @return bool
 	 */
 	public function is_valid() {
-		return ( $this->input()->is_populated() ) &&
+		return ($this->input()->is_populated()) &&
 			!$this->has_errors();
 	}
 
@@ -150,8 +150,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);
 	}
 
 	/**
@@ -163,9 +163,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.'">';
 	}
 
 	/**
@@ -179,9 +179,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;
 	}
 
 	/**
@@ -192,7 +192,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.12.0' );
-define( 'WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7' );
-define( 'WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define('WFV_VALIDATE_VERSION', '0.12.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\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/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);
 	}
 }