macder / wfv-validation

src/Validators/Email.php

Spacing +4 added lines, -4 removed lines

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

src/Validators/Alpha.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -29,10 +29,10 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	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/ArrayType.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Validators\AbstractValidator;
 
@@ -29,10 +29,10 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	public function set_policy( $optional = false ) {
+	public function set_policy($optional = false) {
 		$v = $this->validator;
-		$v = ( $optional )
-			? $v->optional( $v->create()->arrayType() )
+		$v = ($optional)
+			? $v->optional($v->create()->arrayType())
 			: $v->arrayType();
 		return $this;
 	}

src/Factory/ValidatorFactory.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Factory;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Factory\AbstractFactory;
 use WFV\Validators;
@@ -28,7 +28,7 @@ 
 	 *
 	 * @param array $messages Custom error messages
 	 */
-	function __construct( array $messages ) {
+	function __construct(array $messages) {
 		$this->messages = $messages;
 	}
 
@@ -43,11 +43,11 @@ 
 	 * @param bool (optional) $optional
 	 * @return ValidateInterface
 	 */
-	public function create( $rule, $field, $params, $optional = false ) {
-		$class = $this->class_name( $rule );
-		$validator = ( new $class( $field, $params ) )->set_policy( $optional );
-		if( isset( $this->messages[ $field ][ $rule ] ) ) {
-			$validator->set_message( $this->messages[ $field ][ $rule ] );
+	public function create($rule, $field, $params, $optional = false) {
+		$class = $this->class_name($rule);
+		$validator = (new $class($field, $params))->set_policy($optional);
+		if (isset($this->messages[$field][$rule])) {
+			$validator->set_message($this->messages[$field][$rule]);
 		}
 		return $validator;
 	}
@@ -61,8 +61,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function class_name( $rule ){
-		$name = str_replace(' ', '', ucwords( str_replace('_', ' ', $rule ) ) );
+	protected function class_name($rule) {
+		$name = str_replace(' ', '', ucwords(str_replace('_', ' ', $rule)));
 		return 'WFV\Validators\\'.$name;
 	}
 }

src/Factory/AbstractFactory.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Factory;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Contract\ValidateInterface;
 
@@ -11,5 +11,5 @@ 
  */
 abstract class AbstractFactory {
 
-	abstract public function create( $rule, $field, $params, $optional = false );
+	abstract public function create($rule, $field, $params, $optional = false);
 }

src/FormComposite.php

Spacing +27 added lines, -27 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Abstraction\Composable;
 use WFV\Contract\ArtisanInterface;
@@ -30,9 +30,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	function __construct( ArtisanInterface $builder, $action ) {
+	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;
 	}
 
@@ -119,8 +119,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);
 	}
 
 	/**
@@ -132,9 +132,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.'">';
 	}
 
 	/**
@@ -143,9 +143,9 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	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);
 	}
 
 	/**
@@ -156,11 +156,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;
 	}
@@ -176,10 +176,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;
 	}
 
@@ -194,8 +194,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;
 	}
 
 	/**
@@ -206,8 +206,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/Artisan/FormArtisan.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Contract\ArtisanInterface;
 use WFV\Collection\ErrorCollection;
@@ -59,7 +59,7 @@ 
 	 *
 	 * @param array $config
 	 */
-	function __construct( array $config ) {
+	function __construct(array $config) {
 		$this->config = $config;
 	}
 
@@ -82,8 +82,8 @@ 
 	 * @param string $action
 	 * @return WFV\Artisan\FormArtisan
 	 */
-	public function create( $action ) {
-		$this->form = new FormComposite( $this, $action );
+	public function create($action) {
+		$this->form = new FormComposite($this, $action);
 		return $this;
 	}
 
@@ -96,7 +96,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function errors() {
-		$this->collection['errors'] = new ErrorCollection( $this->labels() );
+		$this->collection['errors'] = new ErrorCollection($this->labels());
 		return $this;
 	}
 
@@ -109,10 +109,10 @@ 
 	 * @param array $data
 	 * @return WFV\Artisan\FormArtisan
 	 */
-	public function input( array $data = [] ) {
+	public function input(array $data = []) {
 		$input = $data[0];
 		$trim = $data[1];
-		$this->collection['input'] = new InputCollection( $input, $trim );
+		$this->collection['input'] = new InputCollection($input, $trim);
 		return $this;
 	}
 
@@ -124,7 +124,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function messages() {
-		$this->collection['messages'] = new MessageCollection( $this->config );
+		$this->collection['messages'] = new MessageCollection($this->config);
 		return $this;
 	}
 
@@ -137,10 +137,10 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function rules() {
-		foreach( $this->config as $field => $options ) {
-			$rules[ $field ] = $options['rules'];
+		foreach ($this->config as $field => $options) {
+			$rules[$field] = $options['rules'];
 		}
-		$this->collection['rules'] = new RuleCollection( $rules );
+		$this->collection['rules'] = new RuleCollection($rules);
 		return $this;
 	}
 
@@ -167,7 +167,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}

src/Validator.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use WFV\Contract\ValidateInterface;
 
@@ -40,7 +40,7 @@ 
 	 * @return bool
 	 */
 	public function is_valid() {
-		return empty( $this->errors );
+		return empty($this->errors);
 	}
 
 	/**
@@ -51,10 +51,10 @@ 
 	 * @param ValidateInterface $rule
 	 * @param string|array $value
 	 */
-	public function validate( ValidateInterface $rule, $field, $value ) {
-		$valid = $rule->validate( $value );
-		if( !$valid ){
-			$this->add_error( $field, $rule->template() );
+	public function validate(ValidateInterface $rule, $field, $value) {
+		$valid = $rule->validate($value);
+		if (!$valid) {
+			$this->add_error($field, $rule->template());
 		}
 	}
 
@@ -67,7 +67,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'];
 	}
 }