macder / wfv-validation

src/FormComposite.php

Doc Comments +2 added lines

@@ -177,6 +177,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 ) {

Spacing +27 added lines, -27 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Composable;
 use WFV\Contract\ArtisanInterface;
@@ -30,9 +30,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( ArtisanInterface $builder, $action ) {
+	public function __construct(ArtisanInterface $builder, $action) {
 		$this->alias = $action;
-		$this->install( $builder->collection );
+		$this->install($builder->collection);
 		$this->validator = $builder->validator;
 	}
 
@@ -45,8 +45,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);
 	}
 
 	/**
@@ -60,8 +60,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;
 	}
 
@@ -99,10 +99,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;
 	}
 
@@ -137,8 +137,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);
 	}
 
 	/**
@@ -150,9 +150,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.'">';
 	}
 
 	/**
@@ -163,9 +163,9 @@ 
 	 * @param ValidateInterface $rule
 	 * @param string $field
 	 */
-	public function validate( ValidateInterface $rule, $field ) {
-		$input = $this->field_value( $field );
-		$this->validator->validate( $rule, $field, $input );
+	public function validate(ValidateInterface $rule, $field) {
+		$input = $this->field_value($field);
+		$this->validator->validate($rule, $field, $input);
 	}
 
 	/**
@@ -176,11 +176,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;
 	}
@@ -196,8 +196,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;
 	}
 
 	/**
@@ -208,8 +208,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 +29 added lines, -29 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,21 +33,21 @@ 
  * @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( 'messages' )
-		->with( 'validator' )
-		->compose( $builder );
+	$builder = new FormArtisan($form);
+	$form = (new Director($action))
+		->with('input', [$input, $trim])
+		->with('rules')
+		->with('errors')
+		->with('messages')
+		->with('validator')
+		->compose($builder);
 
-	if( $input ) {
-		wfv_validate( $form );
+	if ($input) {
+		wfv_validate($form);
 	}
 }
 
@@ -59,21 +59,21 @@ 
  * @param FormComposite $form
  * @return bool
  */
-function wfv_validate( FormComposite $form ) {
+function wfv_validate(FormComposite $form) {
 	$rules = $form->rules()->get_array();
 	$messages = $form->messages()->get_array();
-	$factory = new ValidatorFactory( $messages );
+	$factory = new ValidatorFactory($messages);
 
-	foreach( $rules as $field => $ruleset ) {
+	foreach ($rules as $field => $ruleset) {
 		$optional = in_array('optional', $ruleset);
-		if( $optional ) {
-			array_shift( $ruleset );
+		if ($optional) {
+			array_shift($ruleset);
 		}
-		foreach( $ruleset as $rule ) {
-			$params = ( is_array( $rule ) ) ? $rule['params'] : null;
-			$rule_name = ( is_string( $rule ) ) ? $rule : $rule['rule'];
-			$validator = $factory->create( $rule_name, $field, $params, $optional );
-			$form->validate( $validator, $field );
+		foreach ($ruleset as $rule) {
+			$params = (is_array($rule)) ? $rule['params'] : null;
+			$rule_name = (is_string($rule)) ? $rule : $rule['rule'];
+			$validator = $factory->create($rule_name, $field, $params, $optional);
+			$form->validate($validator, $field);
 		}
 	}
 	return $form->is_valid();

src/Validators/Date.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -31,13 +31,13 @@ 
 	 * @param bool (optional) $optional
 	 * @return self
 	 */
-	public function set_policy( $optional = false ) {
-		$format = ( isset( $this->params[0] ) ) ? $this->params[0] : null;
+	public function set_policy($optional = false) {
+		$format = (isset($this->params[0])) ? $this->params[0] : null;
 
 		$v = $this->validator;
-		$v = ( $optional )
-			? $v->optional( $v->create()->date( $format ) )
-			: $v->date( $format );
+		$v = ($optional)
+			? $v->optional($v->create()->date($format))
+			: $v->date($format);
 		return $this;
 	}
 }

src/Validators/Required.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -32,7 +32,7 @@ 
 	 * @param bool (optional) $optional
 	 * @return self
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$this->validator->notEmpty();
 		return $this;
 	}

src/Validators/Boolean.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -31,10 +31,10 @@ 
 	 * @param bool (optional) $optional
 	 * @return self
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$v = $this->validator;
-		$v = ( $optional )
-			? $v->optional( $v->create()->boolVal() )
+		$v = ($optional)
+			? $v->optional($v->create()->boolVal())
 			: $v->boolVal();
 		return $this;
 	}

src/Validators/AlphaDash.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -31,10 +31,10 @@ 
 	 * @param bool (optional) $optional
 	 * @return self
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$v = $this->validator;
-		$v = ( $optional )
-			? $v->optional( $v->create()->alpha('-_') )
+		$v = ($optional)
+			? $v->optional($v->create()->alpha('-_'))
 			: $v->alpha('-_');
 		return $this;
 	}

src/Validators/Callback.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;
 
@@ -31,11 +31,11 @@ 
 	 * @param bool (optional) $optional
 	 * @return self
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$v = $this->validator;
-		$v = ( $optional )
-			? $v->optional( $v->create()->callback( $this->params[0] ) )
-			: $v->callback( $this->params[0] );
+		$v = ($optional)
+			? $v->optional($v->create()->callback($this->params[0]))
+			: $v->callback($this->params[0]);
 		return $this;
 	}
 }

src/Validators/Between.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;
 
@@ -31,14 +31,14 @@ 
 	 * @param bool (optional) $optional
 	 * @return self
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$start = $this->params[0];
 		$end = $this->params[1];
 
 		$v = $this->validator;
-		$v = ( $optional )
-			? $v->optional( $v->create()->between( $start, $end ) )
-			: $v->between( $start, $end );
+		$v = ($optional)
+			? $v->optional($v->create()->between($start, $end))
+			: $v->between($start, $end);
 		return $this;
 	}
 }

src/Validators/RequiredWith.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -31,14 +31,14 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$other_field = $this->params[0];
 		$v = $this->validator;
 
 		$v->when(
-			$v->create()->key( $other_field, $v->create()->notEmpty() ),
-			$v->create()->key( $this->field, $v->create()->notEmpty() ),
-			$v->create()->key( $this->field, $v->create()->alwaysValid() )
+			$v->create()->key($other_field, $v->create()->notEmpty()),
+			$v->create()->key($this->field, $v->create()->notEmpty()),
+			$v->create()->key($this->field, $v->create()->alwaysValid())
 		);
 		return $this;
 	}
@@ -51,7 +51,7 @@ 
 	 * @param string|array $input
 	 * @return bool
 	 */
-	public function validate( $input ){
-		return $this->validator->validate( $_POST );
+	public function validate($input) {
+		return $this->validator->validate($_POST);
 	}
 }