macder / wfv-validation

src/Validator.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Collection\MessageCollection;
 use WFV\Contract\ValidateInterface;
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param
 	 */
-	public function __construct( MessageCollection $messages ) {
+	public function __construct(MessageCollection $messages) {
 		$this->messages = $messages;
 	}
 
@@ -61,7 +61,7 @@ 
 	 * @return bool
 	 */
 	public function is_valid() {
-		return empty( $this->errors );
+		return empty($this->errors);
 	}
 
 	/**
@@ -76,11 +76,11 @@ 
 	 * @param array (optional) $params
 	 * @return self
 	 */
-	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());
 		}
 		return $this;
 	}
@@ -94,10 +94,10 @@ 
 	 * @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;
 	}
 }

src/Agent/InspectionAgent.php

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Agent;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 
 /**
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param string $action
 	 */
-	public function __construct( $action ) {
+	public function __construct($action) {
 		$this->action = $action;
 	}
 
@@ -40,8 +40,8 @@ 
 	 * @return bool
 	 */
 	public function safe_submit() {
-		if( $this->submit_has_action() ) {
-			return ( $_POST['action'] === $this->action ) ? $this->nonce() : false;
+		if ($this->submit_has_action()) {
+			return ($_POST['action'] === $this->action) ? $this->nonce() : false;
 		}
 		return false;
 	}
@@ -54,7 +54,7 @@ 
 	 * @return bool
 	 */
 	private function submit_has_action() {
-		return isset( $_POST['action'] );
+		return isset($_POST['action']);
 	}
 
 	/**
@@ -66,8 +66,8 @@ 
 	 * @return bool
 	 */
 	private function nonce() {
-		$nonce = $_REQUEST[ $this->action.'_token' ];
-		return ( wp_verify_nonce( $nonce, $this->action ) ) ? true : false;
+		$nonce = $_REQUEST[$this->action.'_token'];
+		return (wp_verify_nonce($nonce, $this->action)) ? true : false;
 	}
 
 }

src/Artisan/FormArtisan.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Agent\InspectionAgent;
 use WFV\Contract\ArtisanInterface;
@@ -60,7 +60,7 @@ 
 	 *
 	 * @param array $config
 	 */
-	public function __construct( array $config ) {
+	public function __construct(array $config) {
 		$this->config = $config;
 	}
 
@@ -83,8 +83,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;
 	}
 
@@ -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 @@ 
 	 * @param InspectionAgent $guard
 	 * @return WFV\Artisan\FormArtisan
 	 */
-	public function input( InspectionAgent $guard ) {
-		$this->collection['input'] = new InputCollection( $guard );
+	public function input(InspectionAgent $guard) {
+		$this->collection['input'] = new InputCollection($guard);
 		return $this;
 	}
 
@@ -125,10 +125,10 @@ 
 	 */
 	public function rules() {
 		$rules = array();
-		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;
 	}
 
@@ -141,7 +141,7 @@ 
 	 * @return WFV\Artisan\FormArtisan
 	 */
 	public function validator() {
-		$this->validator = new Validator( new MessageCollection( $this->config ) );
+		$this->validator = new Validator(new MessageCollection($this->config));
 		return $this;
 	}
 
@@ -155,7 +155,7 @@ 
 	 * @return array
 	 */
 	protected function labels() {
-		return array_map( function( $item ) {
+		return array_map(function($item) {
 			return $item['label'];
 		}, $this->config);
 	}

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\Agent\InspectionAgent;
 use WFV\Artisan\Director;
 use WFV\Artisan\FormArtisan;

Spacing +16 added lines, -16 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.11.2' );
-define( 'WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7' );
-define( 'WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define('WFV_VALIDATE_VERSION', '0.11.2');
+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\Agent\InspectionAgent;
@@ -33,19 +33,19 @@ 
  * @param array $form Form arguments
  * @param bool $trim Trim whitespace from beginning and end of string
  */
-function wfv_create( $action, array &$form, $trim = true ) {
-	$guard = new InspectionAgent( $action );
+function wfv_create($action, array &$form, $trim = true) {
+	$guard = new InspectionAgent($action);
 
-	$builder = new FormArtisan( $form );
-	$form = ( new Director( $action ) )
-		->with( 'input', $guard )
-		->with( 'rules' )
-		->with( 'errors' )
-		->with( 'factory' )
-		->with( 'validator' )
-		->compose( $builder );
+	$builder = new FormArtisan($form);
+	$form = (new Director($action))
+		->with('input', $guard)
+		->with('rules')
+		->with('errors')
+		->with('factory')
+		->with('validator')
+		->compose($builder);
 
-	if( $form->input()->is_populated() ) {
+	if ($form->input()->is_populated()) {
 		$form->validate();
 	}
 }

src/RuleFactory.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Rules;
 
@@ -28,12 +28,12 @@ 
 	 * @param string $rule
 	 * @return ValidateInterface|bool
 	 */
-	public function get( $rule ) {
-		if ( !isset( $this->pool[ $rule ] ) ) {
-			$class = $this->class_name( $rule );
-			$this->pool[ $rule ] = new $class();
+	public function get($rule) {
+		if (!isset($this->pool[$rule])) {
+			$class = $this->class_name($rule);
+			$this->pool[$rule] = new $class();
 		}
-		return $this->pool[ $rule ];
+		return $this->pool[$rule];
 	}
 
 	/**
@@ -45,8 +45,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\Rules\\'.$name;
 	}
 }

src/Rules/Boolean.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,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()->boolVal() )->validate( $input )
-			: $v->boolVal()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->boolVal())->validate($input)
+			: $v->boolVal()->validate($input);
 	}
 }

src/Rules/AlphaDash.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,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/Rules/Same.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Rules;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Rules\AbstractRule;
 
@@ -32,7 +32,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];
@@ -40,6 +40,6 @@ 
 
 		$v = $this->validator->create();
 
-		return $v->keyValue( $other_field, 'equals', $field )->validate( $_POST );
+		return $v->keyValue($other_field, 'equals', $field)->validate($_POST);
 	}
 }

src/Rules/AlphaNum.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,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()->alnum() )->validate( $input )
-			: $v->alnum()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->alnum())->validate($input)
+			: $v->alnum()->validate($input);
 	}
 }