pryley / castor-framework

src/Validator.php

Spacing +114 added lines, -114 removed lines

@@ -69,16 +69,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function validate( $data, array $rules = [] )
+	public function validate($data, array $rules = [])
 	{
-		$this->normalizeData( $data );
-		$this->setRules( $rules );
+		$this->normalizeData($data);
+		$this->setRules($rules);
 
-		foreach( $this->rules as $attribute => $rules ) {
-			foreach( $rules as $rule ) {
-				$this->validateAttribute( $attribute, $rule );
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($attribute, $rule);
 
-				if( $this->shouldStopValidating( $attribute ))break;
+				if ($this->shouldStopValidating($attribute))break;
 			}
 		}
 
@@ -93,14 +93,14 @@ 
 	 *
 	 * @return void
 	 */
-	protected function addError( $attribute, $rule, array $parameters )
+	protected function addError($attribute, $rule, array $parameters)
 	{
-		$message = $this->getMessage( $attribute, $rule, $parameters );
+		$message = $this->getMessage($attribute, $rule, $parameters);
 
-		$this->errors[ $attribute ]['errors'][] = $message;
+		$this->errors[$attribute]['errors'][] = $message;
 
-		if( !isset( $this->errors[ $attribute ]['value'] )) {
-			$this->errors[ $attribute ]['value'] = $this->getValue( $attribute );
+		if (!isset($this->errors[$attribute]['value'])) {
+			$this->errors[$attribute]['value'] = $this->getValue($attribute);
 		}
 	}
 
@@ -112,11 +112,11 @@ 
 	 *
 	 * @return void
 	 */
-	protected function addFailure( $attribute, $rule, array $parameters )
+	protected function addFailure($attribute, $rule, array $parameters)
 	{
-		$this->addError( $attribute, $rule, $parameters );
+		$this->addError($attribute, $rule, $parameters);
 
-		$this->failedRules[ $attribute ][ $rule ] = $parameters;
+		$this->failedRules[$attribute][$rule] = $parameters;
 	}
 
 	/**
@@ -125,9 +125,9 @@ 
 	 * @param  string  $attribute
 	 * @return string
 	 */
-	protected function getAttributeType( $attribute )
+	protected function getAttributeType($attribute)
 	{
-		return $this->hasRule( $attribute, $this->numericRules )
+		return $this->hasRule($attribute, $this->numericRules)
 			? 'numeric'
 			: 'string';
 	}
@@ -140,15 +140,15 @@ 
 	 *
 	 * @return string|null
 	 */
-	protected function getMessage( $attribute, $rule, array $parameters )
+	protected function getMessage($attribute, $rule, array $parameters)
 	{
-		if( in_array( $rule, $this->sizeRules )) {
-			return $this->getSizeMessage( $attribute, $rule, $parameters );
+		if (in_array($rule, $this->sizeRules)) {
+			return $this->getSizeMessage($attribute, $rule, $parameters);
 		}
 
-		$lowerRule = $this->snakeCase( $rule );
+		$lowerRule = $this->snakeCase($rule);
 
-		return $this->translator( $lowerRule, $rule, $attribute, $parameters );
+		return $this->translator($lowerRule, $rule, $attribute, $parameters);
 	}
 
 	/**
@@ -159,17 +159,17 @@ 
 	 *
 	 * @return array|null
 	 */
-	protected function getRule( $attribute, $rules )
+	protected function getRule($attribute, $rules)
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
+		if (!array_key_exists($attribute, $this->rules))return;
 
 		$rules = (array) $rules;
 
-		foreach( $this->rules[ $attribute ] as $rule ) {
-			list( $rule, $parameters ) = $this->parseRule( $rule );
+		foreach ($this->rules[$attribute] as $rule) {
+			list($rule, $parameters) = $this->parseRule($rule);
 
-			if( in_array( $rule, $rules )) {
-				return [ $rule, $parameters ];
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
 			}
 		}
 	}
@@ -182,18 +182,18 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function getSize( $attribute, $value )
+	protected function getSize($attribute, $value)
 	{
-		$hasNumeric = $this->hasRule( $attribute, $this->numericRules );
+		$hasNumeric = $this->hasRule($attribute, $this->numericRules);
 
-		if( is_numeric( $value ) && $hasNumeric ) {
+		if (is_numeric($value) && $hasNumeric) {
 			return $value;
 		}
-		elseif( is_array( $value )) {
-			return count( $value );
+		elseif (is_array($value)) {
+			return count($value);
 		}
 
-		return mb_strlen( $value );
+		return mb_strlen($value);
 	}
 
 	/**
@@ -204,14 +204,14 @@ 
 	 *
 	 * @return string|null
 	 */
-	protected function getSizeMessage( $attribute, $rule, array $parameters )
+	protected function getSizeMessage($attribute, $rule, array $parameters)
 	{
-		$lowerRule = $this->snakeCase( $rule );
-		$type = $this->getAttributeType( $attribute );
+		$lowerRule = $this->snakeCase($rule);
+		$type = $this->getAttributeType($attribute);
 
 		$lowerRule .= ".{$type}";
 
-		return $this->translator( $lowerRule, $rule, $attribute, $parameters );
+		return $this->translator($lowerRule, $rule, $attribute, $parameters);
 	}
 
 	/**
@@ -221,10 +221,10 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function getValue( $attribute )
+	protected function getValue($attribute)
 	{
-		if( isset( $this->data[ $attribute ] )) {
-			return $this->data[ $attribute ];
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
 		}
 	}
 
@@ -236,9 +236,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function hasRule( $attribute, $rules )
+	protected function hasRule($attribute, $rules)
 	{
-		return !is_null( $this->getRule( $attribute, $rules ));
+		return !is_null($this->getRule($attribute, $rules));
 	}
 
 	/**
@@ -248,11 +248,11 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function normalizeData( $data )
+	protected function normalizeData($data)
 	{
 		// If an object was provided, get its public properties
-		if( is_object( $data )) {
-			$this->data = get_object_vars( $data );
+		if (is_object($data)) {
+			$this->data = get_object_vars($data);
 		}
 		else {
 			$this->data = $data;
@@ -269,13 +269,13 @@ 
 	 *
 	 * @return array
 	 */
-	protected function parseParameters( $rule, $parameter )
+	protected function parseParameters($rule, $parameter)
 	{
-		if( strtolower( $rule ) == 'regex' ) {
-			return [ $parameter ];
+		if (strtolower($rule) == 'regex') {
+			return [$parameter];
 		}
 
-		return str_getcsv( $parameter );
+		return str_getcsv($parameter);
 	}
 
 	/**
@@ -285,22 +285,22 @@ 
 	 *
 	 * @return array
 	 */
-	protected function parseRule( $rule )
+	protected function parseRule($rule)
 	{
 		$parameters = [];
 
 		// example: {rule}:{parameters}
-		if( strpos( $rule, ':' ) !== false ) {
-			list( $rule, $parameter ) = explode( ':', $rule, 2 );
+		if (strpos($rule, ':') !== false) {
+			list($rule, $parameter) = explode(':', $rule, 2);
 
 			// example: {parameter1,parameter2,...}
-			$parameters = $this->parseParameters( $rule, $parameter );
+			$parameters = $this->parseParameters($rule, $parameter);
 		}
 
-		$rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule )));
-		$rule = str_replace( ' ', '', $rule );
+		$rule = ucwords(str_replace(['-', '_'], ' ', trim($rule)));
+		$rule = str_replace(' ', '', $rule);
 
-		return [ $rule, $parameters ];
+		return [$rule, $parameters];
 	}
 
 	/**
@@ -310,9 +310,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function replaceBetween( $message, array $parameters )
+	protected function replaceBetween($message, array $parameters)
 	{
-		return str_replace([':min', ':max'], $parameters, $message );
+		return str_replace([':min', ':max'], $parameters, $message);
 	}
 
 	/**
@@ -322,9 +322,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function replaceMax( $message, array $parameters )
+	protected function replaceMax($message, array $parameters)
 	{
-		return str_replace( ':max', $parameters[0], $message );
+		return str_replace(':max', $parameters[0], $message);
 	}
 
 	/**
@@ -334,9 +334,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function replaceMin( $message, array $parameters )
+	protected function replaceMin($message, array $parameters)
 	{
-		return str_replace( ':min', $parameters[0], $message );
+		return str_replace(':min', $parameters[0], $message);
 	}
 
 	/**
@@ -348,10 +348,10 @@ 
 	 * @return void
 	 * @throws InvalidArgumentException
 	 */
-	protected function requireParameterCount( $count, array $parameters, $rule )
+	protected function requireParameterCount($count, array $parameters, $rule)
 	{
-		if( count( $parameters ) < $count ) {
-			throw new InvalidArgumentException( "Validation rule $rule requires at least $count parameters." );
+		if (count($parameters) < $count) {
+			throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters.");
 		}
 	}
 
@@ -360,10 +360,10 @@ 
 	 *
 	 * @return $this
 	 */
-	protected function setRules( array $rules )
+	protected function setRules(array $rules)
 	{
-		foreach( $rules as $key => $rule ) {
-			$rules[ $key ] = is_string( $rule ) ? explode( '|', $rule ) : $rule;
+		foreach ($rules as $key => $rule) {
+			$rules[$key] = is_string($rule) ? explode('|', $rule) : $rule;
 		}
 
 		$this->rules = $rules;
@@ -378,11 +378,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function shouldStopValidating( $attribute )
+	protected function shouldStopValidating($attribute)
 	{
-		return $this->hasRule( $attribute, $this->implicitRules )
-			&& isset( $this->failedRules[ $attribute ] )
-			&& array_intersect( array_keys( $this->failedRules[ $attribute ] ), $this->implicitRules );
+		return $this->hasRule($attribute, $this->implicitRules)
+			&& isset($this->failedRules[$attribute])
+			&& array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
 	}
 
 	/**
@@ -392,12 +392,12 @@ 
 	 *
 	 * @return string
 	 */
-	protected function snakeCase( $string )
+	protected function snakeCase($string)
 	{
-		if( !ctype_lower( $string )) {
-			$string = preg_replace( '/\s+/u', '', $string );
-			$string = preg_replace( '/(.)(?=[A-Z])/u', '$1_', $string );
-			$string = mb_strtolower( $string, 'UTF-8' );
+		if (!ctype_lower($string)) {
+			$string = preg_replace('/\s+/u', '', $string);
+			$string = preg_replace('/(.)(?=[A-Z])/u', '$1_', $string);
+			$string = mb_strtolower($string, 'UTF-8');
 		}
 
 		return $string;
@@ -412,20 +412,20 @@ 
 	 *
 	 * @return string|null
 	 */
-	protected function translator( $key, $rule, $attribute, array $parameters )
+	protected function translator($key, $rule, $attribute, array $parameters)
 	{
-		$strings = glsr_resolve( 'Strings' )->validation();
+		$strings = glsr_resolve('Strings')->validation();
 
-		$message = isset( $strings[ $key ] )
-			? $strings[ $key ]
+		$message = isset($strings[$key])
+			? $strings[$key]
 			: false;
 
-		if( !$message )return;
+		if (!$message)return;
 
-		$message = str_replace( ':attribute', $attribute, $message );
+		$message = str_replace(':attribute', $attribute, $message);
 
-		if( method_exists( $this, $replacer = "replace{$rule}" )) {
-			$message = $this->$replacer( $message, $parameters );
+		if (method_exists($this, $replacer = "replace{$rule}")) {
+			$message = $this->$replacer($message, $parameters);
 		}
 
 		return $message;
@@ -444,11 +444,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateAccepted( $attribute, $value )
+	protected function validateAccepted($attribute, $value)
 	{
 		$acceptable = ['yes', 'on', '1', 1, true, 'true'];
 
-		return $this->validateRequired( $attribute, $value ) && in_array( $value, $acceptable, true );
+		return $this->validateRequired($attribute, $value) && in_array($value, $acceptable, true);
 	}
 
 	/**
@@ -460,26 +460,26 @@ 
 	 * @return void
 	 * @throws BadMethodCallException
 	 */
-	protected function validateAttribute( $attribute, $rule )
+	protected function validateAttribute($attribute, $rule)
 	{
-		list( $rule, $parameters ) = $this->parseRule( $rule );
+		list($rule, $parameters) = $this->parseRule($rule);
 
-		if( $rule == '' )return;
+		if ($rule == '')return;
 
-		$value = $this->getValue( $attribute );
+		$value = $this->getValue($attribute);
 
 		// is the value filled or is the attribute required?
 		// - removed $validatable assignment
-		$this->validateRequired( $attribute, $value ) || in_array( $rule, $this->implicitRules );
+		$this->validateRequired($attribute, $value) || in_array($rule, $this->implicitRules);
 
 		$method = "validate{$rule}";
 
-		if( !method_exists( $this, $method )) {
-			throw new BadMethodCallException( "Method [$method] does not exist." );
+		if (!method_exists($this, $method)) {
+			throw new BadMethodCallException("Method [$method] does not exist.");
 		}
 
-		if( !$this->$method( $attribute, $value, $parameters )) {
-			$this->addFailure( $attribute, $rule, $parameters );
+		if (!$this->$method($attribute, $value, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
 		}
 	}
 
@@ -491,11 +491,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateBetween( $attribute, $value, array $parameters )
+	protected function validateBetween($attribute, $value, array $parameters)
 	{
-		$this->requireParameterCount( 2, $parameters, 'between' );
+		$this->requireParameterCount(2, $parameters, 'between');
 
-		$size = $this->getSize( $attribute, $value );
+		$size = $this->getSize($attribute, $value);
 
 		return $size >= $parameters[0] && $size <= $parameters[1];
 	}
@@ -508,9 +508,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateEmail( $attribute, $value )
+	protected function validateEmail($attribute, $value)
 	{
-		return filter_var( $value, FILTER_VALIDATE_EMAIL ) !== false;
+		return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
 	}
 
 	/**
@@ -521,11 +521,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateMax( $attribute, $value, array $parameters )
+	protected function validateMax($attribute, $value, array $parameters)
 	{
-		$this->requireParameterCount( 1, $parameters, 'max' );
+		$this->requireParameterCount(1, $parameters, 'max');
 
-		return $this->getSize( $attribute, $value ) <= $parameters[0];
+		return $this->getSize($attribute, $value) <= $parameters[0];
 	}
 
 	/**
@@ -536,11 +536,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateMin( $attribute, $value, array $parameters )
+	protected function validateMin($attribute, $value, array $parameters)
 	{
-		$this->requireParameterCount( 1, $parameters, 'min' );
+		$this->requireParameterCount(1, $parameters, 'min');
 
-		return $this->getSize( $attribute, $value ) >= $parameters[0];
+		return $this->getSize($attribute, $value) >= $parameters[0];
 	}
 
 	/**
@@ -551,9 +551,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateNumeric( $attribute, $value )
+	protected function validateNumeric($attribute, $value)
 	{
-		return is_numeric( $value );
+		return is_numeric($value);
 	}
 
 	/**
@@ -564,11 +564,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateRequired( $attribute, $value )
+	protected function validateRequired($attribute, $value)
 	{
-		return is_null( $value )
-			|| ( is_string( $value ) && trim( $value ) === '' )
-			|| ( is_array( $value ) && count( $value ) < 1 )
+		return is_null($value)
+			|| (is_string($value) && trim($value) === '')
+			|| (is_array($value) && count($value) < 1)
 			? false
 			: true;
 	}

Braces +14 added lines, -8 removed lines

@@ -78,7 +78,9 @@ 
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $attribute, $rule );
 
-				if( $this->shouldStopValidating( $attribute ))break;
+				if( $this->shouldStopValidating( $attribute )) {
+					break;
+				}
 			}
 		}
 
@@ -161,7 +163,9 @@ 
 	 */
 	protected function getRule( $attribute, $rules )
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
+		if( !array_key_exists( $attribute, $this->rules )) {
+			return;
+		}
 
 		$rules = (array) $rules;
 
@@ -188,8 +192,7 @@ 
 
 		if( is_numeric( $value ) && $hasNumeric ) {
 			return $value;
-		}
-		elseif( is_array( $value )) {
+		} elseif( is_array( $value )) {
 			return count( $value );
 		}
 
@@ -253,8 +256,7 @@ 
 		// If an object was provided, get its public properties
 		if( is_object( $data )) {
 			$this->data = get_object_vars( $data );
-		}
-		else {
+		} else {
 			$this->data = $data;
 		}
 
@@ -420,7 +422,9 @@ 
 			? $strings[ $key ]
 			: false;
 
-		if( !$message )return;
+		if( !$message ) {
+			return;
+		}
 
 		$message = str_replace( ':attribute', $attribute, $message );
 
@@ -464,7 +468,9 @@ 
 	{
 		list( $rule, $parameters ) = $this->parseRule( $rule );
 
-		if( $rule == '' )return;
+		if( $rule == '' ) {
+			return;
+		}
 
 		$value = $this->getValue( $attribute );