pryley / castor-framework

src/Services/Validator.php

Doc Comments +1 added lines, -1 removed lines

@@ -557,7 +557,7 @@
 	/**
 	 * Validate that a required attribute exists.
 	 *
-	 * @param mixed $value
+	 * @param string $value
 	 *
 	 * @return bool
 	 */

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( $rule, $attribute );
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($rule, $attribute);
 
-				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( $value, $attribute )
+	protected function validateAccepted($value, $attribute)
 	{
 		$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( $rule, $attribute )
+	protected function validateAttribute($rule, $attribute)
 	{
-		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( $value, $attribute, $parameters )) {
-			$this->addFailure( $attribute, $rule, $parameters );
+		if (!$this->$method($value, $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
 		}
 	}
 
@@ -491,11 +491,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateBetween( $value, $attribute, array $parameters )
+	protected function validateBetween($value, $attribute, 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];
 	}
@@ -507,9 +507,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateEmail( $value )
+	protected function validateEmail($value)
 	{
-		return filter_var( $value, FILTER_VALIDATE_EMAIL ) !== false;
+		return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
 	}
 
 	/**
@@ -520,11 +520,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateMax( $value, $attribute, array $parameters )
+	protected function validateMax($value, $attribute, 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];
 	}
 
 	/**
@@ -535,11 +535,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateMin( $value, $attribute, array $parameters )
+	protected function validateMin($value, $attribute, 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];
 	}
 
 	/**
@@ -549,9 +549,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateNumeric( $value )
+	protected function validateNumeric($value)
 	{
-		return is_numeric( $value );
+		return is_numeric($value);
 	}
 
 	/**
@@ -561,12 +561,12 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateRequired( $value )
+	protected function validateRequired($value)
 	{
-		if( is_string( $value )) {
-			$value = trim( $value );
+		if (is_string($value)) {
+			$value = trim($value);
 		}
-		return is_null( $value ) || empty( $value )
+		return is_null($value) || empty($value)
 			? false
 			: true;
 	}

Braces +14 added lines, -8 removed lines

@@ -78,7 +78,9 @@ 
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $rule, $attribute );
 
-				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 );
 

src/Services/Normalizer.php

Spacing +52 added lines, -52 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	protected $args;
 
-	public function __construct( array $args = [] )
+	public function __construct(array $args = [])
 	{
 		$this->args = $args;
 	}
@@ -64,11 +64,11 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function form( array $args = [], $implode = false )
+	public function form(array $args = [], $implode = false)
 	{
-		$attributes = $this->parseAttributes( self::FORM_ATTRIBUTES, $args );
+		$attributes = $this->parseAttributes(self::FORM_ATTRIBUTES, $args);
 
-		return $this->maybeImplode( $attributes, $implode );
+		return $this->maybeImplode($attributes, $implode);
 	}
 
 	/**
@@ -76,13 +76,13 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function input( array $args = [], $implode = false )
+	public function input(array $args = [], $implode = false)
 	{
 		$this->filterInputType();
 
-		$attributes = $this->parseAttributes( self::INPUT_ATTRIBUTES, $args );
+		$attributes = $this->parseAttributes(self::INPUT_ATTRIBUTES, $args);
 
-		return $this->maybeImplode( $attributes, $implode );
+		return $this->maybeImplode($attributes, $implode);
 	}
 
 	/**
@@ -92,24 +92,24 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function maybeImplode( array $attributes, $implode = true )
+	public function maybeImplode(array $attributes, $implode = true)
 	{
-		if( !$implode || $implode !== 'implode' ) {
+		if (!$implode || $implode !== 'implode') {
 			return $attributes;
 		}
 		$results = [];
-		foreach( $attributes as $key => $value ) {
+		foreach ($attributes as $key => $value) {
 			// if data attributes, use single quotes in case of json encoded values
-			$quotes = false !== stripos( $key, 'data-' ) ? "'" : '"';
-			if( is_array( $value )) {
-				$value = json_encode( $value );
+			$quotes = false !== stripos($key, 'data-') ? "'" : '"';
+			if (is_array($value)) {
+				$value = json_encode($value);
 				$quotes = "'";
 			}
-			$results[] = is_string( $key )
-				? sprintf( '%1$s=%3$s%2$s%3$s', $key, $value, $quotes )
+			$results[] = is_string($key)
+				? sprintf('%1$s=%3$s%2$s%3$s', $key, $value, $quotes)
 				: $value;
 		}
-		return implode( ' ', $results );
+		return implode(' ', $results);
 	}
 
 	/**
@@ -117,11 +117,11 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function select( array $args = [], $implode = false )
+	public function select(array $args = [], $implode = false)
 	{
-		$attributes = $this->parseAttributes( self::SELECT_ATTRIBUTES, $args );
+		$attributes = $this->parseAttributes(self::SELECT_ATTRIBUTES, $args);
 
-		return $this->maybeImplode( $attributes, $implode );
+		return $this->maybeImplode($attributes, $implode);
 	}
 
 	/**
@@ -129,11 +129,11 @@ 
 	 *
 	 * @return array|string
 	 */
-	public function textarea( array $args = [], $implode = false )
+	public function textarea(array $args = [], $implode = false)
 	{
-		$attributes = $this->parseAttributes( self::TEXTAREA_ATTRIBUTES, $args );
+		$attributes = $this->parseAttributes(self::TEXTAREA_ATTRIBUTES, $args);
 
-		return $this->maybeImplode( $attributes, $implode );
+		return $this->maybeImplode($attributes, $implode);
 	}
 
 	/**
@@ -142,31 +142,31 @@ 
 	 *
 	 * @return array
 	 */
-	protected function filterAttributes( array $attributeKeys )
+	protected function filterAttributes(array $attributeKeys)
 	{
-		$filtered = array_intersect_key( $this->args, array_flip( $attributeKeys ));
+		$filtered = array_intersect_key($this->args, array_flip($attributeKeys));
 
 		// normalize truthy boolean attributes
-		foreach( $filtered as $key => $value ) {
-			if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ))continue;
+		foreach ($filtered as $key => $value) {
+			if (!in_array($key, self::BOOLEAN_ATTRIBUTES))continue;
 
-			if( $value !== false ) {
-				$filtered[ $key ] = '';
+			if ($value !== false) {
+				$filtered[$key] = '';
 				continue;
 			}
 
-			unset( $filtered[ $key ] );
+			unset($filtered[$key]);
 		}
 
-		$filteredKeys = array_filter( array_keys( $filtered ), function( $key ) use ( $filtered ) {
+		$filteredKeys = array_filter(array_keys($filtered), function($key) use ($filtered) {
 			return !(
-				empty( $filtered[ $key ] )
-				&& !is_numeric( $filtered[ $key ] )
-				&& !in_array( $key, self::BOOLEAN_ATTRIBUTES )
+				empty($filtered[$key])
+				&& !is_numeric($filtered[$key])
+				&& !in_array($key, self::BOOLEAN_ATTRIBUTES)
 			);
 		});
 
-		return array_intersect_key( $filtered, array_flip( $filteredKeys ));
+		return array_intersect_key($filtered, array_flip($filteredKeys));
 	}
 
 	/**
@@ -174,34 +174,34 @@ 
 	 */
 	protected function filterGlobalAttributes()
 	{
-		$global = $this->filterAttributes( self::GLOBAL_ATTRIBUTES );
+		$global = $this->filterAttributes(self::GLOBAL_ATTRIBUTES);
 
 		$wildcards = [];
 
-		foreach( self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard ) {
+		foreach (self::GLOBAL_WILDCARD_ATTRIBUTES as $wildcard) {
 
-			foreach( $this->args as $key => $value ) {
+			foreach ($this->args as $key => $value) {
 
-				$length = strlen( $wildcard );
-				$result = substr( $key, 0, $length) === $wildcard;
+				$length = strlen($wildcard);
+				$result = substr($key, 0, $length) === $wildcard;
 
-				if( $result ) {
+				if ($result) {
 					// only allow data attributes to have an empty value
-					if( $wildcard != 'data-' && empty( $value ))continue;
+					if ($wildcard != 'data-' && empty($value))continue;
 
-					if( is_array( $value )) {
+					if (is_array($value)) {
 
-						if( $wildcard != 'data-' )continue;
+						if ($wildcard != 'data-')continue;
 
-						$value = json_encode( $value );
+						$value = json_encode($value);
 					}
 
-					$wildcards[ $key ] = $value;
+					$wildcards[$key] = $value;
 				}
 			}
 		}
 
-		return array_merge( $global, $wildcards );
+		return array_merge($global, $wildcards);
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 */
 	protected function filterInputType()
 	{
-		if( !isset( $this->args['type'] ) || !in_array( $this->args['type'], $this->inputTypes )) {
+		if (!isset($this->args['type']) || !in_array($this->args['type'], $this->inputTypes)) {
 			$this->args['type'] = 'text';
 		}
 	}
@@ -217,15 +217,15 @@ 
 	/**
 	 * @return array
 	 */
-	protected function parseAttributes( array $attributes, array $args = [] )
+	protected function parseAttributes(array $attributes, array $args = [])
 	{
-		if( !empty( $args )) {
-			$this->args = array_change_key_case( $args );
+		if (!empty($args)) {
+			$this->args = array_change_key_case($args);
 		}
 
 		$global = $this->filterGlobalAttributes();
-		$local  = $this->filterAttributes( $attributes );
+		$local  = $this->filterAttributes($attributes);
 
-		return array_merge( $global, $local );
+		return array_merge($global, $local);
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -148,7 +148,9 @@ 
 
 		// normalize truthy boolean attributes
 		foreach( $filtered as $key => $value ) {
-			if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ))continue;
+			if( !in_array( $key, self::BOOLEAN_ATTRIBUTES )) {
+				continue;
+			}
 
 			if( $value !== false ) {
 				$filtered[ $key ] = '';
@@ -187,11 +189,15 @@ 
 
 				if( $result ) {
 					// only allow data attributes to have an empty value
-					if( $wildcard != 'data-' && empty( $value ))continue;
+					if( $wildcard != 'data-' && empty( $value )) {
+						continue;
+					}
 
 					if( is_array( $value )) {
 
-						if( $wildcard != 'data-' )continue;
+						if( $wildcard != 'data-' ) {
+							continue;
+						}
 
 						$value = json_encode( $value );
 					}

src/Helpers/Render.php

Spacing +34 added lines, -34 removed lines

@@ -14,7 +14,7 @@ 
 	public $theme;
 	public $utility;
 
-	public function __construct( Media $media, PostMeta $postmeta, Theme $theme, Utility $utility )
+	public function __construct(Media $media, PostMeta $postmeta, Theme $theme, Utility $utility)
 	{
 		$this->media    = $media;
 		$this->postmeta = $postmeta;
@@ -22,88 +22,88 @@ 
 		$this->utility  = $utility;
 	}
 
-	public function blockquote( $metaKey = false, array $attributes = [] )
+	public function blockquote($metaKey = false, array $attributes = [])
 	{
-		if( $value = $this->postmeta->get( $metaKey )) {
-			$this->utility->printTag( 'blockquote', wp_strip_all_tags( $value ), $attributes );
+		if ($value = $this->postmeta->get($metaKey)) {
+			$this->utility->printTag('blockquote', wp_strip_all_tags($value), $attributes);
 		}
 	}
 
-	public function button( $postId = 0, $title = false )
+	public function button($postId = 0, $title = false)
 	{
-		$post = get_post( $postId );
+		$post = get_post($postId);
 
-		if( !$postId || !$post )return;
-		if( !$title ) {
+		if (!$postId || !$post)return;
+		if (!$title) {
 			$title = $post->post_title;
 		}
-		printf( '<a href="%s" class="button"><span>%s</span></a>',
-			get_permalink( $post->ID ),
+		printf('<a href="%s" class="button"><span>%s</span></a>',
+			get_permalink($post->ID),
 			$title
 		);
 	}
 
-	public function buttons( $postIds = [] )
+	public function buttons($postIds = [])
 	{
-		foreach( (array) $postIds as $postId ) {
-			$this->button( $postId );
+		foreach ((array) $postIds as $postId) {
+			$this->button($postId);
 		}
 	}
 
-	public function content( $metaKey = false )
+	public function content($metaKey = false)
 	{
 		$content = $metaKey
-			? $this->postmeta->get( $metaKey )
+			? $this->postmeta->get($metaKey)
 			: get_the_content();
 
-		echo str_replace( ']]>', ']]&gt;', apply_filters( 'the_content', $content ));
+		echo str_replace(']]>', ']]&gt;', apply_filters('the_content', $content));
 	}
 
-	public function featured( $args = [] )
+	public function featured($args = [])
 	{
-		$args = wp_parse_args( $args, [
+		$args = wp_parse_args($args, [
 			'class' => 'featured',
 			'image' => get_post_thumbnail_id(),
 			'video' => 'featured_video',
 		]);
-		$featuredHtml = $this->media->video( wp_parse_args( $args, [
+		$featuredHtml = $this->media->video(wp_parse_args($args, [
 			'url' => $args['video'],
 		]));
-		if( empty( $featuredHtml ) && $featuredImage = $this->media->getImage( $args['image'] )) {
-			$featuredHtml = sprintf( '<div class="featured-image"><img src="%s" alt="%s"></div><figcaption>%s</figcaption>',
+		if (empty($featuredHtml) && $featuredImage = $this->media->getImage($args['image'])) {
+			$featuredHtml = sprintf('<div class="featured-image"><img src="%s" alt="%s"></div><figcaption>%s</figcaption>',
 				$featuredImage->large['url'],
 				$featuredImage->alt,
 				$featuredImage->caption
 			);
 		}
-		if( !empty( $featuredHtml )) {
-			printf( '<figure class="%s">%s</figure>', $args['class'], $featuredHtml );
+		if (!empty($featuredHtml)) {
+			printf('<figure class="%s">%s</figure>', $args['class'], $featuredHtml);
 		}
 	}
 
-	public function field( $name, array $args = [] )
+	public function field($name, array $args = [])
 	{
 	}
 
-	public function form( $name, array $args = [] )
+	public function form($name, array $args = [])
 	{
 	}
 
-	public function gallery( array $args = [] )
+	public function gallery(array $args = [])
 	{
-		echo $this->media->gallery( $args );
+		echo $this->media->gallery($args);
 	}
 
-	public function title( $metaKey = false, array $attributes = [] )
+	public function title($metaKey = false, array $attributes = [])
 	{
-		$tag = apply_filters( 'castor/render/title/tag', 'h2' );
+		$tag = apply_filters('castor/render/title/tag', 'h2');
 		$value = $metaKey
-			? $this->postmeta->get( $metaKey )
+			? $this->postmeta->get($metaKey)
 			: $this->theme->pageTitle();
 
-		if( !$value )return;
+		if (!$value)return;
 
-		$this->utility->printTag( $tag, wp_strip_all_tags( $value ), $attributes );
+		$this->utility->printTag($tag, wp_strip_all_tags($value), $attributes);
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function video( $args )
+	public function video($args)
 	{
-		echo $this->media->video( $args );
+		echo $this->media->video($args);
 	}
 }