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

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Collection;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 use WFV\Abstraction\Collectable;
 /**
  *
@@ -16,8 +16,8 @@ 
 	 *
 	 * @param array $form Config array
 	 */
-	public function __construct( array $form ) {
-		$this->set_messages( $form );
+	public function __construct(array $form) {
+		$this->set_messages($form);
 	}
 
 	/**
@@ -40,9 +40,9 @@ 
 	 * @param string $rule
 	 * @return array|null
 	 */
-	public function get_msg( $field, $rule ) {
-		return ( isset( $this->data[ $field ][ $rule ] ) )
-			? $this->data[ $field ][ $rule ]
+	public function get_msg($field, $rule) {
+		return (isset($this->data[$field][$rule]))
+			? $this->data[$field][$rule]
 			: null;
 	}
 
@@ -56,9 +56,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);
 		});
 	}
 
@@ -70,10 +70,10 @@ 
 	 *
 	 * @param array
 	 */
-	protected function make_array( array $filtered ) {
+	protected function make_array(array $filtered) {
 		$messages = array();
-		foreach( $filtered as $field => $options ) {
-			$messages[ $field ] = $options['messages'];
+		foreach ($filtered as $field => $options) {
+			$messages[$field] = $options['messages'];
 		}
 		return $messages;
 	}
@@ -86,8 +86,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/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/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;
 	}
 
 }