macder / wfv-validation

src/FormComposite.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 defined( 'ABSPATH' ) || die();
 
 use WFV\Artisan\FormArtisan;
-use WFV\Contract\FormInterface;
-use WFV\Contract\ValidateInterface;
 use WFV\Factory\ValidatorFactory;
 
 /**

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\Artisan\FormArtisan;
 use WFV\Contract\FormInterface;
@@ -49,7 +49,7 @@ 
 	 * @param ArtisanInterface $builder
 	 * @param string $action
 	 */
-	public function __construct( FormArtisan $builder, $action ) {
+	public function __construct(FormArtisan $builder, $action) {
 		$this->alias = $action;
 		$this->collection = $builder->collection;
 		$this->validator = $builder->validator;
@@ -66,10 +66,10 @@ 
 	 */
 	protected function 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;
 	}
 
@@ -81,17 +81,17 @@ 
 	 * @param ValidatorFactory $factory
 	 * @return self
 	 */
-	protected function validate( ValidatorFactory $factory ) {
+	protected 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->valid();
@@ -106,11 +106,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;
 	}
@@ -126,8 +126,8 @@ 
 	 * @param string (optional) $value
 	 * @return string|null
 	 */
-	protected function string_or_null( $response, $field = null, $value = null ) {
-		return ( $this->utilize('input')->contains( $field, $value ) ) ? $response : null;
+	protected function string_or_null($response, $field = null, $value = null) {
+		return ($this->utilize('input')->contains($field, $value)) ? $response : null;
 	}
 
 	/**
@@ -138,9 +138,9 @@ 
 	 *
 	 * @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);
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 *
 	 * @param string $component Key indentifier.
 	 */
-	protected function utilize( $component ) {
-		return $this->collection[ $component ];
+	protected function utilize($component) {
+		return $this->collection[$component];
 	}
 }

Doc Comments +4 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
 	 *
 	 * @since 0.10.0
 	 *
-	 * @param ArtisanInterface $builder
+	 * @param FormArtisan $builder
 	 * @param string $action
 	 */
 	public function __construct( FormArtisan $builder, $action ) {
@@ -79,7 +79,7 @@ 
 	 * @since 0.11.0
 	 *
 	 * @param ValidatorFactory $factory
-	 * @return self
+	 * @return boolean
 	 */
 	protected function validate( ValidatorFactory $factory ) {
 		$rule_collection = $this->utilize('rules');
@@ -124,6 +124,8 @@ 
 	 * @param string $response
 	 * @param string (optional) $field
 	 * @param string (optional) $value
+	 * @param string $field
+	 * @param string $value
 	 * @return string|null
 	 */
 	protected function string_or_null( $response, $field = null, $value = null ) {

src/Client.php

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 use WFV\FormComposite;
 use WFV\Contract\FormInterface;
@@ -28,7 +28,7 @@ 
 	 *
 	 * @param FormComposite $form
 	 */
-	public function __construct( FormComposite $form ) {
+	public function __construct(FormComposite $form) {
 		$this->form = $form;
 	}
 
@@ -41,8 +41,8 @@ 
 	 * @param string $value Value to compare against.
 	 * @return string|null
 	 */
-	public function checked_if( $field = null, $value = null ) {
-		echo $this->form->string_or_null( 'checked', $field, $value );
+	public function checked_if($field = null, $value = null) {
+		echo $this->form->string_or_null('checked', $field, $value);
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param callable (optional) $callback
 	 * @return string
 	 */
-	public function display( $field = null, callable $callback = null ) {
-		echo $input = $this->form->utilize('input')->escape( $field );
+	public function display($field = null, callable $callback = null) {
+		echo $input = $this->form->utilize('input')->escape($field);
 		return $input;
 	}
 
@@ -104,8 +104,8 @@ 
 	 * @param string $value Value to compare against.
 	 * @return string|null
 	 */
-	public function selected_if( $field = null, $value = null ) {
-		return $this->form->string_or_null( 'selected', $field, $value );
+	public function selected_if($field = null, $value = null) {
+		return $this->form->string_or_null('selected', $field, $value);
 	}
 
 	/**
@@ -117,9 +117,9 @@ 
 	 */
 	public function token_fields() {
 		// TODO - Move markup into something - perhaps a renderable interface?
-		$token_name = $this->form->alias . '_token';
-		echo $nonce_field = wp_nonce_field( $this->form->alias, $token_name, false, false );
-		echo $action_field = '<input type="hidden" name="action" value="'. $this->form->alias .'">';
+		$token_name = $this->form->alias.'_token';
+		echo $nonce_field = wp_nonce_field($this->form->alias, $token_name, false, false);
+		echo $action_field = '<input type="hidden" name="action" value="'.$this->form->alias.'">';
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 * @since 0.11.0
 	 *
 	 */
-	public function is_valid( $factory ) {
-		return $this->form->validate( $factory );
+	public function is_valid($factory) {
+		return $this->form->validate($factory);
 	}
 
 }

src/Contract/FormInterface.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 namespace WFV\Contract;
-defined( 'ABSPATH' ) || die();
+defined('ABSPATH') || die();
 
 
 /**
@@ -14,12 +14,12 @@ 
 	/**
 	 * @return
 	 */
-	public function checked_if( $field = null, $value = null );
+	public function checked_if($field = null, $value = null);
 
 	/**
 	 * @return
 	 */
-	public function display( $field = null, callable $callback = null );
+	public function display($field = null, callable $callback = null);
 
 	/**
 	 * @return
@@ -39,7 +39,7 @@ 
 	/**
 	 * @return
 	 */
-	public function selected_if( $field = null, $value = null );
+	public function selected_if($field = null, $value = null);
 
 	/**
 	 * @return
@@ -49,6 +49,6 @@ 
 	/**
 	 * @return
 	 */
-	public function is_valid( $factory );
+	public function is_valid($factory);
 
 }

wfv-validate.php

Spacing +22 added lines, -22 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,12 +11,12 @@ 
 License URI: https://github.com/macder/wp-form-validation/blob/master/LICENSE
 */
 
-define( 'WFV_VALIDATE_VERSION', '0.11.0' );
-define( 'WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7' );
-define( 'WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'WFV_VALIDATE__ACTION_POST', 'validate_form' );
+define('WFV_VALIDATE_VERSION', '0.11.0');
+define('WFV_VALIDATE__MINIMUM_WP_VERSION', '3.7');
+define('WFV_VALIDATE__PLUGIN_DIR', plugin_dir_path(__FILE__));
+define('WFV_VALIDATE__ACTION_POST', 'validate_form');
 
-require_once WFV_VALIDATE__PLUGIN_DIR . '/vendor/autoload.php';
+require_once WFV_VALIDATE__PLUGIN_DIR.'/vendor/autoload.php';
 
 use WFV\Client;
 use WFV\Agent\InspectionAgent;
@@ -34,21 +34,21 @@ 
  * @param array $form Form arguments
  * @param bool $trim Trim whitespace from beginning and end of string
  */
-function wfv_create( $action, array &$form, $trim = true ) {
-	$inspect = new InspectionAgent( $action );
-	$input = ( true === $inspect->safe_submit() ) ? $_POST : array();
+function wfv_create($action, array &$form, $trim = true) {
+	$inspect = new InspectionAgent($action);
+	$input = (true === $inspect->safe_submit()) ? $_POST : array();
 
-	$builder = new FormArtisan( $form );
-	$form = new Client( ( new Director( $action ) )
-		->with( 'input', [ $input, $trim ] )
-		->with( 'rules' )
-		->with( 'errors' )
-		->with( 'validator' )
-		->compose( $builder )
+	$builder = new FormArtisan($form);
+	$form = new Client((new Director($action))
+		->with('input', [$input, $trim])
+		->with('rules')
+		->with('errors')
+		->with('validator')
+		->compose($builder)
 	);
 
-	if( $input ) {
-		wfv_validate( $form );
+	if ($input) {
+		wfv_validate($form);
 	}
 }
 
@@ -60,8 +60,8 @@ 
  * @param FormComposite $form
  * @return bool
  */
-function wfv_validate( FormInterface $form ) {
-	$factory = ( new ValidatorFactory() )
-		->add( $form->rules()->unique() );
-	return $form->is_valid( $factory );
+function wfv_validate(FormInterface $form) {
+	$factory = (new ValidatorFactory())
+		->add($form->rules()->unique());
+	return $form->is_valid($factory);
 }