macder / wfv-validation

src/Artisan/FormArtisan.php

Doc Comments +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
 	 * @since 0.10.0
 	 *
 	 * @param string $action
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function create( $action ) {
 		$this->form = new FormComposite( $this, $action );
@@ -93,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 +107,7 @@ 
 	 * @since 0.10.0
 	 *
 	 * @param array $data
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function input( array $data = [] ) {
 		$input = $data[0];
@@ -121,7 +121,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function messages() {
 		$this->collection['messages'] = new MessageCollection( $this->config );
@@ -134,7 +134,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function rules() {
 		foreach( $this->config as $field => $options ) {
@@ -150,7 +150,7 @@ 
 	 *
 	 * @since 0.11.0
 	 *
-	 * @return WFV\Artisan\FormArtisan
+	 * @return FormArtisan
 	 */
 	public function validator() {
 		$this->validator = new Validator();

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use WFV\Collection\InputCollection;
 use WFV\Collection\MessageCollection;
 use WFV\Collection\RuleCollection;
-
 use WFV\FormComposite;
 use WFV\Validator;
 

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/Validators/AbstractValidator.php

Doc Comments -1 removed lines

@@ -110,7 +110,6 @@
 	 *
 	 * @since 0.11.0
 	 *
-	 * @param string|array $input
 	 * @return bool
 	 */
 	public function validate( $value ) {

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Validators;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 
 use \Respect\Validation\Validator as RespectValidator;
 use \Respect\Validation\Exceptions\NestedValidationException;
@@ -46,7 +46,7 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	abstract protected function set_policy( $optional = false );
+	abstract protected function set_policy($optional = false);
 
 	/**
 	 *
@@ -54,11 +54,11 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	function __construct( $field ) {
+	function __construct($field) {
 		$this->validator = new RespectValidator();
 		$this->field = $field;
 		$args = func_get_args();
-		$this->params = ( isset( $args[1] ) ) ? $args[1] : null;
+		$this->params = (isset($args[1])) ? $args[1] : null;
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 *
 	 * @param
 	 */
-	public function set_message( $message ) {
+	public function set_message($message) {
 		$this->template['message'] = $message;
 	}
 
@@ -113,8 +113,8 @@ 
 	 * @param string|array $input
 	 * @return bool
 	 */
-	public function validate( $value ) {
-		$is_valid = $this->validator->validate( $value );
+	public function validate($value) {
+		$is_valid = $this->validator->validate($value);
 		return $is_valid;
 	}
 }

wfv-validate.php

Spacing +29 added lines, -29 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or 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/Collection/MessageCollection.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) or die();
+defined('ABSPATH') or die();
 use WFV\Abstraction\Collectable;
 /**
  *
@@ -16,8 +16,8 @@ 
 	 *
 	 * @param array $form Config array
 	 */
-	function __construct( array $form ) {
-		$this->set_messages( $form );
+	function __construct(array $form) {
+		$this->set_messages($form);
 	}
 
 	/**
@@ -41,9 +41,9 @@ 
 	 * @param array $form
 	 * @return array
 	 */
-	protected function filter_config( array $form ) {
-		return array_filter( $form, function( $item ) {
-			return array_key_exists('messages', $item );
+	protected function filter_config(array $form) {
+		return array_filter($form, function($item) {
+			return array_key_exists('messages', $item);
 		});
 	}
 
@@ -55,9 +55,9 @@ 
 	 *
 	 * @param array
 	 */
-	protected function make_array( array $filtered ) {
-		foreach( $filtered as $field => $options ) {
-			$messages[ $field ] = $options['messages'];
+	protected function make_array(array $filtered) {
+		foreach ($filtered as $field => $options) {
+			$messages[$field] = $options['messages'];
 		}
 		return $messages;
 	}
@@ -70,8 +70,8 @@ 
 	 *
 	 * @param array $form
 	 */
-	protected function set_messages( array $form ) {
-		$filtered = $this->filter_config( $form );
-		$this->data = $this->make_array( $filtered );
+	protected function set_messages(array $form) {
+		$filtered = $this->filter_config($form);
+		$this->data = $this->make_array($filtered);
 	}
 }

src/Validators/Required.php

Spacing +2 added lines, -2 removed lines

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

Spacing +5 added lines, -5 removed lines

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