macder / wfv-validation

src/Abstraction/Composable.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Abstraction;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 /**
  *
@@ -36,8 +36,8 @@ 
 	 * @param string $name
 	 * @param class $collection
 	 */
-	protected function add_collection( $name, $collection ) {
-		$this->collection[ $name ] = $collection;
+	protected function add_collection($name, $collection) {
+		$this->collection[$name] = $collection;
 	}
 
 	/**
@@ -48,8 +48,8 @@ 
 	 *
 	 * @param string $component Key indentifier.
 	 */
-	protected function utilize( $component ) {
-		return $this->collection[ $component ];
+	protected function utilize($component) {
+		return $this->collection[$component];
 	}
 
 	/**
@@ -60,9 +60,9 @@ 
 	 *
 	 * @param array $collections
 	 */
-	protected function install( array $collections ) {
-		foreach( $collections as $name => $collection ) {
-			$this->add_collection( $name, $collection );
+	protected function install(array $collections) {
+		foreach ($collections as $name => $collection) {
+			$this->add_collection($name, $collection);
 		}
 	}
 }

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/Contract/ArtisanInterface.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Contract;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 /**
  *
@@ -13,7 +13,7 @@ 
 	/**
 	 * @return
 	 */
-	public function create( $action );
+	public function create($action);
 
 	/**
 	 * @return

src/Collection/InputCollection.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Collectable;
 
@@ -20,9 +20,9 @@ 
 	 * @param array $data
 	 * @param bool $trim
 	 */
-	public function __construct( array $data = array(), $trim ) {
-		$data = $this->transform_array_leafs( $data, 'stripslashes' );
-		$this->data = ( $trim ) ? $this->transform_array_leafs( $data, 'trim' ) : $data;
+	public function __construct(array $data = array(), $trim) {
+		$data = $this->transform_array_leafs($data, 'stripslashes');
+		$this->data = ($trim) ? $this->transform_array_leafs($data, 'trim') : $data;
 	}
 
 	/**
@@ -33,8 +33,8 @@ 
 	 * @param bool $tokens With or without token and action attributes.
 	 * @return array
 	 */
-	public function get_array( $tokens = true ) {
-		return ( $tokens ) ? $this->data : $this->neat_array();
+	public function get_array($tokens = true) {
+		return ($tokens) ? $this->data : $this->neat_array();
 	}
 
 	/**
@@ -47,8 +47,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;
 	}
 }

src/Artisan/Director.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Artisan;
-defined( 'ABSPATH' ) || die( 'envois' );
+defined('ABSPATH') || die('envois');
 
 use WFV\Contract\ArtisanInterface;
 
@@ -46,7 +46,7 @@ 
    *
    * @param string (optional) $identity
    */
-  public function __construct( $identity = null ) {
+  public function __construct($identity = null) {
     $this->entity = $identity;
   }
 
@@ -59,8 +59,8 @@ 
    * @param mixed $characteristic
    * @return self
    */
-  public function describe( $attribute, $characteristic ) {
-    $this->scribe[ $attribute ] = $characteristic;
+  public function describe($attribute, $characteristic) {
+    $this->scribe[$attribute] = $characteristic;
     return $this;
   }
 
@@ -72,10 +72,10 @@ 
    * @param ArtisanInterface $artisan
    * @return Composite
    */
-  public function compose( ArtisanInterface $artisan ) {
-    $this->orchestrate( $this->aspect, $artisan );
+  public function compose(ArtisanInterface $artisan) {
+    $this->orchestrate($this->aspect, $artisan);
     return $artisan
-      ->create( $this->entity )
+      ->create($this->entity)
       ->actualize();
   }
 
@@ -88,8 +88,8 @@ 
    * @param string|array (optional) $attributes
    * @return self
    */
-  public function with( $quality, $attributes = null ) {
-    $this->aspect[ $quality ] = $attributes;
+  public function with($quality, $attributes = null) {
+    $this->aspect[$quality] = $attributes;
     return $this;
   }
 
@@ -102,9 +102,9 @@ 
    * @param array $aspect
    * @param ArtisanInterface $artisan
    */
-  private function orchestrate( array $aspect, ArtisanInterface &$artisan ) {
-    foreach( $aspect as $component => $params ) {
-      $artisan->$component( $params );
+  private function orchestrate(array $aspect, ArtisanInterface&$artisan) {
+    foreach ($aspect as $component => $params) {
+      $artisan->$component($params);
     }
   }
 }

src/Agent/InspectionAgent.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Agent;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 
 /**
@@ -35,9 +35,9 @@ 
 	 *
 	 * @param string $action
 	 */
-	public function __construct( $action ) {
+	public function __construct($action) {
 		$this->action = $action;
-		$this->token = wp_create_nonce( $action );
+		$this->token = wp_create_nonce($action);
 	}
 
 	/**
@@ -50,8 +50,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;
 	}
@@ -64,7 +64,7 @@ 
 	 * @return bool
 	 */
 	private function submit_has_action() {
-		return isset( $_POST['action'] );
+		return isset($_POST['action']);
 	}
 
 	/**
@@ -76,8 +76,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/Abstraction/Collectable.php

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/FormComposite.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use WFV\Abstraction\Composable;
 use WFV\Artisan\FormArtisan;
-use WFV\Contract\ValidateInterface;
 use WFV\Factory\ValidatorFactory;
 
 /**

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Abstraction\Composable;
 use WFV\Artisan\FormArtisan;
@@ -31,9 +31,9 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( FormArtisan $builder, $action ) {
+	public function __construct(FormArtisan $builder, $action) {
 		$this->alias = $action;
-		$this->install( $builder->collection );
+		$this->install($builder->collection);
 		$this->validator = $builder->validator;
 	}
 
@@ -46,8 +46,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);
 	}
 
 	/**
@@ -61,8 +61,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;
 	}
 
@@ -100,10 +100,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;
 	}
 
@@ -127,8 +127,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);
 	}
 
 	/**
@@ -140,9 +140,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.'">';
 	}
 
 	/**
@@ -153,17 +153,17 @@ 
 	 * @param ValidatorFactory $factory
 	 * @return self
 	 */
-	public function validate( ValidatorFactory $factory ) {
+	public function validate(ValidatorFactory $factory) {
 		$rule_collection = $this->utilize('rules');
-		$rules = $rule_collection->get_array( true );
+		$rules = $rule_collection->get_array(true);
 
-		foreach( $rules as $field => $ruleset ) {
-			$input = $this->field_value( $field );
-			$optional = $rule_collection->is_optional( $field );
+		foreach ($rules as $field => $ruleset) {
+			$input = $this->field_value($field);
+			$optional = $rule_collection->is_optional($field);
 
-			foreach( $ruleset as $index => $rule ) {
-				$params = $rule_collection->get_params( $field, $index );
-				$this->validator->validate( $factory->get( $rule ), $field, $input, $optional, $params );
+			foreach ($ruleset as $index => $rule) {
+				$params = $rule_collection->get_params($field, $index);
+				$this->validator->validate($factory->get($rule), $field, $input, $optional, $params);
 			}
 		}
 		return $this;
@@ -178,11 +178,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;
 	}
@@ -198,8 +198,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;
 	}
 
 	/**
@@ -210,8 +210,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/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);
 }