macder / wfv-validation

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

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

src/Factory/ValidatorFactory.php

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Factory;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Validators;
 
@@ -27,11 +27,11 @@ 
 	 *
 	 * @param array $rules
 	 */
-	public function add( $rules ) {
-		foreach( $rules as $rule ) {
-			if ( !isset( $this->pool[ $rule ] ) ) {
-				$class = $this->class_name( $rule );
-				$this->pool[ $rule ] = new $class();
+	public function add($rules) {
+		foreach ($rules as $rule) {
+			if (!isset($this->pool[$rule])) {
+				$class = $this->class_name($rule);
+				$this->pool[$rule] = new $class();
 			}
 		}
 		return $this;
@@ -45,8 +45,8 @@ 
 	 * @param string $rule
 	 * @return ValidateInterface|bool
 	 */
-	public function get( $rule ) {
-		return ( isset( $this->pool[ $rule ] )) ? $this->pool[ $rule ] : false;
+	public function get($rule) {
+		return (isset($this->pool[$rule])) ? $this->pool[$rule] : false;
 	}
 
 	/**
@@ -58,8 +58,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/Collection/RuleCollection.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 
@@ -18,8 +18,8 @@ 
 	 *
 	 * @param array $rules
 	 */
-	public function __construct( array $rules ) {
-		$this->data = $this->parse_rules( $rules );
+	public function __construct(array $rules) {
+		$this->data = $this->parse_rules($rules);
 	}
 
 
@@ -32,8 +32,8 @@ 
 	 * @param bool (optional) $flat
 	 * @return array
 	 */
-	public function get_array( $flat = false ) {
-		return ( $flat ) ? $this->remove_params() : $this->data;
+	public function get_array($flat = false) {
+		return ($flat) ? $this->remove_params() : $this->data;
 	}
 
 	/**
@@ -45,9 +45,9 @@ 
 	 * @param int $index
 	 * @return array|bool
 	 */
-	public function get_params( $field, $index ) {
-		return ( $this-> has_params( $field, $index ) )
-			? $this->data[ $field ][ $index ]['params']
+	public function get_params($field, $index) {
+		return ($this-> has_params($field, $index))
+			? $this->data[$field][$index]['params']
 			: false;
 	}
 
@@ -59,8 +59,8 @@ 
 	 * @param string $field
 	 * @return bool
 	 */
-	public function is_optional( $field ) {
-		return in_array('optional', $this->data[ $field ] );
+	public function is_optional($field) {
+		return in_array('optional', $this->data[$field]);
 	}
 
 	/**
@@ -71,8 +71,8 @@ 
 	 * @return array
 	 */
 	public function unique() {
-		$flat = $this->flatten( $this->remove_params() );
-		return array_values( array_unique( $flat ) );
+		$flat = $this->flatten($this->remove_params());
+		return array_values(array_unique($flat));
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_name( $rule ) {
-		return strstr( $rule, ':', true );
+	protected function extract_name($rule) {
+		return strstr($rule, ':', true);
 	}
 
 	/**
@@ -97,8 +97,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_params( $rule ) {
-		return ltrim( strstr($rule, ':'), ':');
+	protected function extract_params($rule) {
+		return ltrim(strstr($rule, ':'), ':');
 	}
 
 	/**
@@ -110,11 +110,11 @@ 
 	 * @param array $array
 	 * @return array
 	 */
-	protected function flatten( array $array ) {
+	protected function flatten(array $array) {
 		$flat = array();
-		foreach( $array as $rule ) {
-			if( is_array( $rule ) ){
-				$flat = array_merge( $flat, $this->flatten( $rule ) );
+		foreach ($array as $rule) {
+			if (is_array($rule)) {
+				$flat = array_merge($flat, $this->flatten($rule));
 			} else {
 				$flat[] = $rule;
 			}
@@ -132,8 +132,8 @@ 
 	 * @param int $index
 	 * @return bool
 	 */
-	protected function has_params( $field, $index ) {
-		return is_array( $this->data[ $field ][ $index ] );
+	protected function has_params($field, $index) {
+		return is_array($this->data[$field][$index]);
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function string_has_params( $rule ) {
-		return strpos( $rule, ':' );
+	protected function string_has_params($rule) {
+		return strpos($rule, ':');
 	}
 
 	/**
@@ -159,20 +159,20 @@ 
 	 * @param array $rules
 	 * @return array
 	 */
-	protected function parse_rules( array $rules ) {
+	protected function parse_rules(array $rules) {
 		// WIP - works, but confusing - simplify or breakdown into small methods
 		$parsed = array();
-		$this->split_rules( $rules );
-		foreach( $rules as $field => $ruleset ) {
-			$parsed[ $field ] = array_map( function( $rule ) {
-				if ( $this->string_has_params( $rule ) ) {
+		$this->split_rules($rules);
+		foreach ($rules as $field => $ruleset) {
+			$parsed[$field] = array_map(function($rule) {
+				if ($this->string_has_params($rule)) {
 					return array(
-						'rule' => $this->extract_name( $rule ),
-						'params' => explode( ',', $this->extract_params( $rule ) )
+						'rule' => $this->extract_name($rule),
+						'params' => explode(',', $this->extract_params($rule))
 					);
 				}
 				return $rule;
-			}, $ruleset );
+			}, $ruleset);
 		}
 		return $parsed;
 	}
@@ -187,14 +187,14 @@ 
 	 * @return array
 	 */
 	protected function remove_params() {
-		return array_map( function( $item ) {
-			foreach( $item as $rule ) {
-				if( $rule !== 'optional' ) {
-					$rules[] = ( is_string( $rule ) ) ? $rule : $rule['rule'];
+		return array_map(function($item) {
+			foreach ($item as $rule) {
+				if ($rule !== 'optional') {
+					$rules[] = (is_string($rule)) ? $rule : $rule['rule'];
 				}
 			}
 			return $rules;
-		}, $this->data );
+		}, $this->data);
 	}
 
 	/**
@@ -205,10 +205,10 @@ 
 	 *
 	 * @param array $rules
 	 */
-	protected function split_rules( array &$rules ) {
+	protected function split_rules(array &$rules) {
 		// perhaps the $rules array structure should be validated here?...
-		$rules = array_map( function( $item ) {
-			return explode( '|', $item );
-		}, $rules );
+		$rules = array_map(function($item) {
+			return explode('|', $item);
+		}, $rules);
 	}
 }

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);
 	}
 
 	/**
@@ -75,11 +75,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());
 		}
 	}
 
@@ -92,10 +92,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/Validators/Min.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,15 +32,15 @@ 
 	 * @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];
 		$min_value = $params[0];
 
 		$v = $this->validator->create();
 
-		return ( $optional )
-			? $v->optional( $v->create()->min( $min_value ) )->validate( $input )
-			: $v->min( $min_value )->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->min($min_value))->validate($input)
+			: $v->min($min_value)->validate($input);
 	}
 }

src/Validators/Numeric.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,11 +32,11 @@ 
 	 * @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()->numeric() )->validate( $input )
-			: $v->numeric()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->numeric())->validate($input)
+			: $v->numeric()->validate($input);
 	}
 }

src/Validators/Alpha.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,11 +32,11 @@ 
 	 * @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/Ip.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,11 +32,11 @@ 
 	 * @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()->ip() )->validate( $input )
-			: $v->ip()->validate( $input );
+		return ($optional)
+			? $v->optional($v->create()->ip())->validate($input)
+			: $v->ip()->validate($input);
 	}
 }