macder / wfv-validation

src/FormComposite.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use WFV\Abstraction\Composable;
 use WFV\Artisan\FormArtisan;
-use WFV\Contract\ValidateInterface;
 use WFV\Factory\ValidatorFactory;
 
 /**

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Composable;
 use WFV\Artisan\FormArtisan;
@@ -31,9 +31,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( FormArtisan $builder, $action ) {
+	public function __construct(FormArtisan $builder, $action) {
 		$this->alias = $action;
-		$this->install( $builder->collection );
+		$this->install($builder->collection);
 		$this->validator = $builder->validator;
 	}
 
@@ -46,8 +46,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);
 	}
 
 	/**
@@ -61,8 +61,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;
 	}
 
@@ -100,10 +100,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;
 	}
 
@@ -138,8 +138,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);
 	}
 
 	/**
@@ -151,9 +151,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.'">';
 	}
 
 	/**
@@ -164,15 +164,15 @@ 
 	 * @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 );
-		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 );
+		$rules = $rule_collection->get_array(true);
+		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);
 			}
 		}
 		return $this;
@@ -187,11 +187,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;
 	}
@@ -207,8 +207,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;
 	}
 
 	/**
@@ -219,8 +219,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);
 	}
 }

src/Validator.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Contract\ValidateInterface;
 
@@ -40,7 +40,7 @@ 
 	 * @return bool
 	 */
 	public function is_valid() {
-		return empty( $this->errors );
+		return empty($this->errors);
 	}
 
 	/**
@@ -54,11 +54,11 @@ 
 	 * @param bool $optional
 	 * @param array (optional) $params
 	 */
-	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());
 		}
 	}
 
@@ -71,7 +71,7 @@ 
 	 * @param string $field
 	 * @param array $template
 	 */
-	protected function add_error( $field, array $template ) {
-		$this->errors[ $field ][ $template['name'] ] = $template['message'];
+	protected function add_error($field, array $template) {
+		$this->errors[$field][$template['name']] = $template['message'];
 	}
 }

src/Contract/ValidateInterface.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Contract;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 
 /**
@@ -14,5 +14,5 @@ 
 	/**
 	 * @return bool
 	 */
-	public function validate( $input = null, $optional = false );
+	public function validate($input = null, $optional = false);
 }

src/Validators/Email.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;
 
@@ -34,10 +34,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()->email() )->validate( $input )
-			: $v->email()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->email())->validate($input)
+			: $v->email()->validate($input);
 	}
 }

src/Validators/Integer.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()->intVal() )->validate( $input )
-			: $v->intVal()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->intVal())->validate($input)
+			: $v->intVal()->validate($input);
 	}
 }

src/Validators/RequiredIf.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;
 
@@ -33,7 +33,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()->equals( $other_value ) ),
-			$v->create()->key( $field, $v->create()->notEmpty() ),
-			$v->create()->key( $field, $v->create()->alwaysValid() )
-		)->validate( $_POST );
+			$v->create()->key($other_field, $v->create()->equals($other_value)),
+			$v->create()->key($field, $v->create()->notEmpty()),
+			$v->create()->key($field, $v->create()->alwaysValid())
+		)->validate($_POST);
 	}
 }

src/Validators/Digit.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()->digit()->length(1,1) )->validate( $input )
-			: $v->digit()->length(1,1)->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->digit()->length(1, 1))->validate($input)
+			: $v->digit()->length(1, 1)->validate($input);
 	}
 }

src/Validators/AlphaDash.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()->alpha('-_') )->validate( $input )
-			: $v->alpha('-_')->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->alpha('-_'))->validate($input)
+			: $v->alpha('-_')->validate($input);
 	}
 }

src/Validators/ArrayType.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()->arrayType() )->validate( $input )
-			: $v->arrayType()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->arrayType())->validate($input)
+			: $v->arrayType()->validate($input);
 	}
 }