macder / wfv-validation

src/Contract/CollectionInterface.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Contract;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 /**
  *
@@ -12,12 +12,12 @@ 
 	/**
 	 * @return bool
 	 */
-	public function contains( $key = null, $value = null );
+	public function contains($key = null, $value = null);
 
 	/**
 	 * @return bool
 	 */
-	public function has( $key = null );
+	public function has($key = null);
 
 	/**
 	 * @return bool
@@ -27,7 +27,7 @@ 
 	/**
 	 * @return string|null
 	 */
-	public function escape( $key, callable $callback = null );
+	public function escape($key, callable $callback = null);
 
 	/**
 	 * @return

src/Abstraction/Collectable.php

Doc Comments +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
 	 * @access private
 	 *
 	 * @param array $array
-	 * @param string|array $callback
+	 * @param callable $callback
 	 * @return array
 	 */
 	protected function transform_array_leafs( array $array, $callback ) {
@@ -124,7 +124,7 @@ 
 	 * @since 0.10.0
 	 * @access private
 	 *
-	 * @param string|array $callback
+	 * @param callable $callback
 	 * @param string (optional) $input The input string
 	 * @return
 	 */

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Abstraction;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Contract\CollectionInterface;
 
@@ -29,11 +29,11 @@ 
 	 * @param string $value
 	 * @return bool
 	 */
-	public function contains( $key = null, $value = null ) {
-		if( $this->has( $key ) ) {
-			return ( is_array( $this->data[ $key ] ) )
-				? in_array( $value, $this->data[ $key ] )
-				: $this->data[ $key ] === $value;
+	public function contains($key = null, $value = null) {
+		if ($this->has($key)) {
+			return (is_array($this->data[$key]))
+				? in_array($value, $this->data[$key])
+				: $this->data[$key] === $value;
 		}
 		return false;
 	}
@@ -47,10 +47,10 @@ 
 	 * @param string|array (optional) $callback Context appropriate callable.
 	 * @return string|null
 	 */
-	public function escape( $key, callable $callback = null ) {
-		if( is_string( $key ) ) {
-			$callback = ( null === $callback ) ? 'esc_html' : $callback;
-			return ( true === $this->has( $key ) ) ? $this->call_func( $callback, $this->data[ $key ] ) : null;
+	public function escape($key, callable $callback = null) {
+		if (is_string($key)) {
+			$callback = (null === $callback) ? 'esc_html' : $callback;
+			return (true === $this->has($key)) ? $this->call_func($callback, $this->data[$key]) : null;
 		}
 		return null;
 	}
@@ -63,8 +63,8 @@ 
 	 * @param string $key
 	 * @return bool
 	 */
-	public function has( $key = null ) {
-		return array_key_exists( $key, $this->data );
+	public function has($key = null) {
+		return array_key_exists($key, $this->data);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 * @return bool
 	 */
 	public function is_populated() {
-		return count( $this->data ) > 0;
+		return count($this->data) > 0;
 	}
 
 	/**
@@ -88,11 +88,11 @@ 
 	 * @param callable $callback
 	 * @return array
 	 */
-	public function transform( $key = null, callable $callback ) {
+	public function transform($key = null, callable $callback) {
 		// WIP
-		if( true === $this->has( $key ) ) {
-			if( is_array( $this->data[ $key ] ) ) {
-				return $this->transform_array_leafs( $this->data[ $key ], $callback );
+		if (true === $this->has($key)) {
+			if (is_array($this->data[$key])) {
+				return $this->transform_array_leafs($this->data[$key], $callback);
 			}
 		}
 	}
@@ -109,9 +109,9 @@ 
 	 * @param string|array $callback
 	 * @return array
 	 */
-	protected function transform_array_leafs( array $array, $callback ) {
-		array_walk_recursive( $array, function( &$item ) use( $callback ) {
-			$item = $this->call_func( $callback, $item );
+	protected function transform_array_leafs(array $array, $callback) {
+		array_walk_recursive($array, function(&$item) use($callback) {
+			$item = $this->call_func($callback, $item);
 		} );
 		return $array;
 	}
@@ -126,16 +126,16 @@ 
 	 * @param string (optional) $input The input string
 	 * @return
 	 */
-	private function call_func( $callback, $input = null ) {
+	private function call_func($callback, $input = null) {
 		// WIP - simplify
-		if( is_array( $callback ) ) {
+		if (is_array($callback)) {
 			$method = $callback[0];
 			$args = $callback[1];
-			if ( $input ) {
-				array_unshift( $args, $input );
+			if ($input) {
+				array_unshift($args, $input);
 			}
-			return call_user_func_array( $method, $args );
+			return call_user_func_array($method, $args);
 		}
-		return $callback( $input );
+		return $callback($input);
 	}
 }

src/Collection/RuleCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	 * @access protected
 	 *
 	 * @param string $rule
-	 * @return bool
+	 * @return integer
 	 */
 	protected function string_has_params( $rule ) {
 		return strpos( $rule, ':' );

Spacing +46 added lines, -46 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 $form
 	 */
-	public function __construct( array $form ) {
-		$this->data = $this->parse_rules( $form );
+	public function __construct(array $form) {
+		$this->data = $this->parse_rules($form);
 	}
 
 
@@ -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,9 +59,9 @@ 
 	 * @param string $field
 	 * @return bool
 	 */
-	public function is_optional( $field ) {
-		if( $this->has( $field ) ){
-			return in_array('optional', $this->data[ $field ] );
+	public function is_optional($field) {
+		if ($this->has($field)) {
+			return in_array('optional', $this->data[$field]);
 		}
 		return false;
 	}
@@ -74,8 +74,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));
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_name( $rule ) {
-		return strstr( $rule, ':', true );
+	protected function extract_name($rule) {
+		return strstr($rule, ':', true);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 * @param string $rule
 	 * @return string
 	 */
-	protected function extract_params( $rule ) {
-		return ltrim( strstr($rule, ':'), ':');
+	protected function extract_params($rule) {
+		return ltrim(strstr($rule, ':'), ':');
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 * @param array $form
 	 * @return array
 	 */
-	protected function extract_rules( array $form ) {
-		foreach( $form as $field => $options ) {
-			$rules[ $field ] = $options['rules'];
+	protected function extract_rules(array $form) {
+		foreach ($form as $field => $options) {
+			$rules[$field] = $options['rules'];
 		}
 		return $rules;
 	}
@@ -129,11 +129,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;
 			}
@@ -151,8 +151,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]);
 	}
 
 	/**
@@ -165,22 +165,22 @@ 
 	 * @param array $form
 	 * @return array
 	 */
-	protected function parse_rules( array $form ) {
+	protected function parse_rules(array $form) {
 		// WIP - works, but confusing - simplify or breakdown into small methods
-		$rules = $this->extract_rules( $form );
+		$rules = $this->extract_rules($form);
 
 		$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;
 	}
@@ -195,14 +195,14 @@ 
 	 * @return array
 	 */
 	protected function remove_params() {
-		return array_map( function( $item ) {
-			foreach( $item as $index => $rule ) {
-				if( $rule !== 'optional' ) {
-					$rules[ $index ] = ( is_string( $rule ) ) ? $rule : $rule['rule'];
+		return array_map(function($item) {
+			foreach ($item as $index => $rule) {
+				if ($rule !== 'optional') {
+					$rules[$index] = (is_string($rule)) ? $rule : $rule['rule'];
 				}
 			}
 			return $rules;
-		}, $this->data );
+		}, $this->data);
 	}
 
 	/**
@@ -213,11 +213,11 @@ 
 	 *
 	 * @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);
 	}
 
 	/**
@@ -229,7 +229,7 @@ 
 	 * @param string $rule
 	 * @return bool
 	 */
-	protected function string_has_params( $rule ) {
-		return strpos( $rule, ':' );
+	protected function string_has_params($rule) {
+		return strpos($rule, ':');
 	}
 }

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/Collection/ErrorCollection.php

Spacing +18 added lines, -18 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 
@@ -26,7 +26,7 @@ 
 	 *
 	 * @param array $labels Human friendly labels for the fields
 	 */
-	function __construct( array $labels = [] ) {
+	function __construct(array $labels = []) {
 		$this->labels = $labels;
 	}
 
@@ -38,9 +38,9 @@ 
 	 * @param string $field
 	 * @return string|null
 	 */
-	public function first( $field ) {
-		return ( isset( $this->data[ $field ] ) )
-			? array_values( $this->data[ $field ] )[0]
+	public function first($field) {
+		return (isset($this->data[$field]))
+			? array_values($this->data[$field])[0]
 			: null;
 	}
 
@@ -52,9 +52,9 @@ 
 	 * @param string $field
 	 * @return array|null
 	 */
-	public function get( $field ) {
-		return ( isset( $this->data[ $field ] ) )
-			? $this->data[ $field ]
+	public function get($field) {
+		return (isset($this->data[$field]))
+			? $this->data[$field]
 			: null;
 	}
 
@@ -66,10 +66,10 @@ 
 	 *
 	 * @param array $errors
 	 */
-	public function set_errors( array $errors = [] ) {
-		$this->data = ( $this->is_populated() )
+	public function set_errors(array $errors = []) {
+		$this->data = ($this->is_populated())
 			? $this->data
-			: $this->with_labels( $errors );
+			: $this->with_labels($errors);
 	}
 
 	/**
@@ -82,9 +82,9 @@ 
 	 * @param string $field
 	 * @return string
 	 */
-	protected function label( $field ) {
-		return ( isset( $this->labels[ $field ] ) )
-			? $this->labels[ $field ]
+	protected function label($field) {
+		return (isset($this->labels[$field]))
+			? $this->labels[$field]
 			: $field;
 	}
 
@@ -97,11 +97,11 @@ 
 	 * @param array $errors
 	 * @return array
 	 */
-	protected function with_labels( $errors ) {
+	protected function with_labels($errors) {
 		$labeled = array();
-		foreach( $errors as $field => $messages ) {
-			$label = $this->label( $field );
-			$labeled[ $field ] = str_replace( '{label}', $label, $errors[ $field ] );
+		foreach ($errors as $field => $messages) {
+			$label = $this->label($field);
+			$labeled[$field] = str_replace('{label}', $label, $errors[$field]);
 		}
 		return $labeled;
 	}

src/Collection/InputCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,6 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @param array $data
 	 * @param bool $trim
 	 */
 	public function __construct( InspectionAgent $guard, $trim = true ) {
@@ -67,6 +66,7 @@ 
 	 * @since 0.11.0
 	 * @access protected
 	 *
+	 * @param boolean $trim
 	 */
 	protected function populate( $trim ) {
 		if( $this->guard->safe_submit() ) {

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 use WFV\Agent\InspectionAgent;
@@ -29,9 +29,9 @@ 
 	 * @param array $data
 	 * @param bool $trim
 	 */
-	public function __construct( InspectionAgent $guard, $trim = true ) {
+	public function __construct(InspectionAgent $guard, $trim = true) {
 		$this->guard = $guard;
-		$this->populate( $trim );
+		$this->populate($trim);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @param bool $neat With or without token and action attributes.
 	 * @return array
 	 */
-	public function get_array( $neat = true ) {
-		return ( $neat ) ? $this->neat_array() : $this->data;
+	public function get_array($neat = true) {
+		return ($neat) ? $this->neat_array() : $this->data;
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 */
 	protected function neat_array() {
 		$input = $this->data;
-		unset( $input[ $input['action'] .'_token'] );
-		unset( $input['action'] );
+		unset($input[$input['action'].'_token']);
+		unset($input['action']);
 		return $input;
 	}
 
@@ -68,12 +68,12 @@ 
 	 * @access protected
 	 *
 	 */
-	protected function populate( $trim ) {
-		if( $this->guard->safe_submit() ) {
-			$data = $this->transform_array_leafs( $_POST, 'stripslashes' );
+	protected function populate($trim) {
+		if ($this->guard->safe_submit()) {
+			$data = $this->transform_array_leafs($_POST, 'stripslashes');
 
-			$this->data = ( $trim )
-				? $this->transform_array_leafs( $data, 'trim' )
+			$this->data = ($trim)
+				? $this->transform_array_leafs($data, 'trim')
 				: $data;
 		}
 	}

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/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);
 	}
 }