pryley / castor-framework

src/Services/Validator.php

Spacing +112 added lines, -112 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;
@@ -443,11 +443,11 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateAccepted( $value )
+	protected function validateAccepted($value)
 	{
 		$acceptable = ['yes', 'on', '1', 1, true, 'true'];
 
-		return $this->validateRequired( $value ) && in_array( $value, $acceptable, true );
+		return $this->validateRequired($value) && in_array($value, $acceptable, true);
 	}
 
 	/**
@@ -459,20 +459,20 @@ 
 	 * @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;
 
 		$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( $this->getValue( $attribute ), $attribute, $parameters )) {
-			$this->addFailure( $attribute, $rule, $parameters );
+		if (!$this->$method($this->getValue($attribute), $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
 		}
 	}
 
@@ -484,11 +484,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];
 	}
@@ -500,9 +500,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;
 	}
 
 	/**
@@ -513,11 +513,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];
 	}
 
 	/**
@@ -528,11 +528,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];
 	}
 
 	/**
@@ -542,9 +542,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function validateNumeric( $value )
+	protected function validateNumeric($value)
 	{
-		return is_numeric( $value );
+		return is_numeric($value);
 	}
 
 	/**
@@ -554,12 +554,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;
 	}

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'], self::INPUT_TYPES )) {
+		if (!isset($this->args['type']) || !in_array($this->args['type'], self::INPUT_TYPES)) {
 			$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);
 	}
 }

src/Forms/Form.php

Spacing +40 added lines, -40 removed lines

@@ -33,7 +33,7 @@ 
 	 */
 	protected $normalize;
 
-	public function __construct( Field $field, Normalizer $normalize )
+	public function __construct(Field $field, Normalizer $normalize)
 	{
 		$this->args         = [];
 		$this->dependencies = [];
@@ -48,15 +48,15 @@ 
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function __get( $property )
+	public function __get($property)
 	{
-		switch( $property ) {
+		switch ($property) {
 			case 'args':
 			case 'dependencies':
 			case 'fields':
 				return $this->$property;
 		}
-		throw new Exception( sprintf( 'Invalid %s property: %s', __CLASS__, $property ));
+		throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
 	}
 
 	/**
@@ -66,16 +66,16 @@ 
 	 * @return void
 	 * @throws Exception
 	 */
-	public function __set( $property, $value )
+	public function __set($property, $value)
 	{
-		switch( $property ) {
+		switch ($property) {
 			case 'args':
 			case 'dependencies':
 			case 'fields':
 				$this->$property = $value;
 				break;
 			default:
-				throw new Exception( sprintf( 'Invalid %s property: %s', __CLASS__, $property ));
+				throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
 		}
 	}
 
@@ -84,13 +84,13 @@ 
 	 *
 	 * @return Form
 	 */
-	public function addField( array $args = [] )
+	public function addField(array $args = [])
 	{
-		$field = $this->field->normalize( $args );
+		$field = $this->field->normalize($args);
 
-		if( $field->args['render'] !== false ) {
+		if ($field->args['render'] !== false) {
 			$this->dependencies = array_unique(
-				array_merge( $field->dependencies, $this->dependencies )
+				array_merge($field->dependencies, $this->dependencies)
 			);
 			$this->fields[] = $field;
 		}
@@ -103,7 +103,7 @@ 
 	 *
 	 * @return Form
 	 */
-	public function normalize( array $args = [] )
+	public function normalize(array $args = [])
 	{
 		$defaults = [
 			'action'     => '',
@@ -113,12 +113,12 @@ 
 			'enctype'    => 'multipart/form-data',
 			'method'     => 'post',
 			'nonce'      => '',
-			'submit'     => __( 'Submit', 'site-reviews' ),
+			'submit'     => __('Submit', 'site-reviews'),
 		];
 
-		$this->args = array_merge( $defaults, $args );
+		$this->args = array_merge($defaults, $args);
 
-		$attributes = $this->normalize->form( $this->args, 'implode' );
+		$attributes = $this->normalize->form($this->args, 'implode');
 
 		$this->args['attributes'] = $attributes;
 
@@ -132,15 +132,15 @@ 
 	 *
 	 * @return string|void
 	 */
-	public function render( $print = true )
+	public function render($print = true)
 	{
-		$rendered = sprintf( '<form %s>%s%s</form>',
+		$rendered = sprintf('<form %s>%s%s</form>',
 			$this->args['attributes'],
 			$this->generateFields(),
 			$this->generateSubmitButton()
 		);
 
-		if( !!$print && $print !== 'return' ) {
+		if (!!$print && $print !== 'return') {
 			echo $rendered;
 		}
 
@@ -169,7 +169,7 @@ 
 	{
 		$hiddenFields = '';
 
-		$fields = array_reduce( $this->fields, function( $carry, $formField ) use ( &$hiddenFields ) {
+		$fields = array_reduce($this->fields, function($carry, $formField) use (&$hiddenFields) {
 
 			$stringLegend    = '<legend class="screen-reader-text"><span>%s</span></legend>';
 			$stringFieldset  = '<fieldset%s>%s%s</fieldset>';
@@ -185,30 +185,30 @@ 
 			$rendered = $field->render();
 
 			// render hidden inputs outside the table
-			if( $field->args['type'] === 'hidden' ) {
+			if ($field->args['type'] === 'hidden') {
 				$hiddenFields .= $rendered;
 				return $carry;
 			}
 
-			$hiddenClass = $this->isFieldHidden( $formField ) ? 'hidden' : '';
+			$hiddenClass = $this->isFieldHidden($formField) ? 'hidden' : '';
 
-			if( $multi ) {
-				if( $depends = $formField->getDataDepends() ) {
-					$depends = sprintf( ' data-depends=\'%s\'', json_encode( $depends ));
+			if ($multi) {
+				if ($depends = $formField->getDataDepends()) {
+					$depends = sprintf(' data-depends=\'%s\'', json_encode($depends));
 				}
 
-				$legend = $label ? sprintf( $stringLegend, $label ) : '';
-				$rendered = sprintf( $stringFieldset, $depends, $legend, $rendered );
+				$legend = $label ? sprintf($stringLegend, $label) : '';
+				$rendered = sprintf($stringFieldset, $depends, $legend, $rendered);
 			}
 
 			$renderedField = $field->outside
-				? sprintf( $outsideRendered, $rendered )
-				: sprintf( $stringRendered, $hiddenClass, $label, $rendered );
+				? sprintf($outsideRendered, $rendered)
+				: sprintf($stringRendered, $hiddenClass, $label, $rendered);
 
 			return $carry . $renderedField;
 		});
 
-		return sprintf( '<table class="form-table"><tbody>%s</tbody></table>%s', $fields, $hiddenFields );
+		return sprintf('<table class="form-table"><tbody>%s</tbody></table>%s', $fields, $hiddenFields);
 	}
 
 	/**
@@ -220,19 +220,19 @@ 
 	{
 		$args = $this->args['submit'];
 
-		is_array( $args ) ?: $args = ['text' => $args ];
+		is_array($args) ?: $args = ['text' => $args];
 
 		$args = shortcode_atts([
-			'text' => __( 'Save Changes', 'site-reviews' ),
+			'text' => __('Save Changes', 'site-reviews'),
 			'type' => 'primary',
 			'name' => 'submit',
 			'wrap' => true,
 			'other_attributes' => null,
-		], $args );
+		], $args);
 
-		if( is_admin() ) {
+		if (is_admin()) {
 			ob_start();
-			submit_button( $args['text'], $args['type'], $args['name'], $args['wrap'], $args['other_attributes'] );
+			submit_button($args['text'], $args['type'], $args['name'], $args['wrap'], $args['other_attributes']);
 			return ob_get_clean();
 		}
 	}
@@ -242,15 +242,15 @@ 
 	 *
 	 * @return bool|null
 	 */
-	protected function isFieldHidden( $field )
+	protected function isFieldHidden($field)
 	{
-		if( !( $dependsOn = $field->getDataDepends() ))return;
+		if (!($dependsOn = $field->getDataDepends()))return;
 
-		foreach( $this->fields as $formField ) {
-			if( $dependsOn['name'] !== $formField->args['name'] )continue;
+		foreach ($this->fields as $formField) {
+			if ($dependsOn['name'] !== $formField->args['name'])continue;
 
-			if( is_array( $dependsOn['value'] )) {
-				return !in_array( $formField->args['value'], $dependsOn['value'] );
+			if (is_array($dependsOn['value'])) {
+				return !in_array($formField->args['value'], $dependsOn['value']);
 			}
 
 			return $dependsOn['value'] != $formField->args['value'];

Braces +6 added lines, -2 removed lines

@@ -244,10 +244,14 @@
 	 */
 	protected function isFieldHidden( $field )
 	{
-		if( !( $dependsOn = $field->getDataDepends() ))return;
+		if( !( $dependsOn = $field->getDataDepends() )) {
+			return;
+		}
 
 		foreach( $this->fields as $formField ) {
-			if( $dependsOn['name'] !== $formField->args['name'] )continue;
+			if( $dependsOn['name'] !== $formField->args['name'] ) {
+				continue;
+			}
 
 			if( is_array( $dependsOn['value'] )) {
 				return !in_array( $formField->args['value'], $dependsOn['value'] );

src/Forms/Fields/Base.php

Spacing +69 added lines, -69 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	protected $element;
 
-	public function __construct( array $args = [] )
+	public function __construct(array $args = [])
 	{
 		$this->args = $args;
 	}
@@ -49,9 +49,9 @@ 
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function __get( $property )
+	public function __get($property)
 	{
-		switch( $property ) {
+		switch ($property) {
 			case 'args':
 			case 'dependencies':
 			case 'element':
@@ -59,7 +59,7 @@ 
 			case 'outside':
 				return $this->$property;
 		}
-		throw new Exception( sprintf( 'Invalid %s property: %s', __CLASS__, $property ));
+		throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
 	}
 
 	/**
@@ -69,13 +69,13 @@ 
 	 *
 	 * @return null|string
 	 */
-	public function generateDescription( $paragraph = true )
+	public function generateDescription($paragraph = true)
 	{
-		if( !isset( $this->args['desc'] ) || !$this->args['desc'] )return;
+		if (!isset($this->args['desc']) || !$this->args['desc'])return;
 
-		$tag = ( !!$paragraph || $paragraph == 'p' ) ? 'p' : 'span';
+		$tag = (!!$paragraph || $paragraph == 'p') ? 'p' : 'span';
 
-		return sprintf( '<%1$s class="description">%2$s</%1$s>', $tag, $this->args['desc'] );
+		return sprintf('<%1$s class="description">%2$s</%1$s>', $tag, $this->args['desc']);
 	}
 
 	/**
@@ -85,13 +85,13 @@ 
 	 */
 	public function generateLabel()
 	{
-		if( empty( $this->args['label'] ))return;
+		if (empty($this->args['label']))return;
 
 		$for = !!$this->args['id']
 			? " for=\"{$this->args['id']}\""
 			: '';
 
-		return sprintf( '<label%s>%s</label>', $for, $this->args['label'] );
+		return sprintf('<label%s>%s</label>', $for, $this->args['label']);
 	}
 
 	/**
@@ -108,11 +108,11 @@ 
 	 *
 	 * @return string
 	 */
-	protected function camelCase( $value )
+	protected function camelCase($value)
 	{
-		$value = ucwords( str_replace( ['-', '_'], ' ', $value ));
+		$value = ucwords(str_replace(['-', '_'], ' ', $value));
 
-		return lcfirst( str_replace( ' ', '', $value ));
+		return lcfirst(str_replace(' ', '', $value));
 	}
 
 	/**
@@ -120,9 +120,9 @@ 
 	 *
 	 * @return array
 	 */
-	protected function implodeAttributes( $defaults = [] )
+	protected function implodeAttributes($defaults = [])
 	{
-		return $this->normalize( $defaults, 'implode' );
+		return $this->normalize($defaults, 'implode');
 	}
 
 	/**
@@ -130,24 +130,24 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected function implodeOptions( $method = 'select_option', $default = null )
+	protected function implodeOptions($method = 'select_option', $default = null)
 	{
 		$this->args['default'] ?: $this->args['default'] = $default;
 
-		$method = $this->camelCase( $method );
+		$method = $this->camelCase($method);
 
-		$method = method_exists( $this, $method )
+		$method = method_exists($this, $method)
 			? $method
 			: 'selectOption';
 
 		$i = 0;
 
-		if( $method === 'singleInput' ) {
+		if ($method === 'singleInput') {
 
-			if( !isset( $this->args['options'] ) || empty( $this->args['options'] ))return;
+			if (!isset($this->args['options']) || empty($this->args['options']))return;
 
 			// hack to make sure unset single checkbox values start at 1 instead of 0
-			if( key( $this->args['options'] ) === 0 ) {
+			if (key($this->args['options']) === 0) {
 				$options = ['1' => $this->args['options'][0]];
 				$this->args['options'] = $options;
 			}
@@ -155,8 +155,8 @@ 
 			return $this->singleInput();
 		}
 
-		return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) use ( &$i, $method ) {
-			return $carry .= $this->$method( $key, $i++ );
+		return array_reduce(array_keys($this->args['options']), function($carry, $key) use (&$i, $method) {
+			return $carry .= $this->$method($key, $i++);
 		});
 	}
 
@@ -167,15 +167,15 @@ 
 	 *
 	 * @return array
 	 */
-	protected function normalize( array $defaults = [], $implode = false )
+	protected function normalize(array $defaults = [], $implode = false)
 	{
-		$args = $this->mergeAttributesWith( $defaults );
+		$args = $this->mergeAttributesWith($defaults);
 
 		$normalize = new Normalize;
 
-		return ( $this->element && method_exists( $normalize, $this->element ))
-			? $normalize->{$this->element}( $args, $implode )
-			: ( !!$implode ? '' : [] );
+		return ($this->element && method_exists($normalize, $this->element))
+			? $normalize->{$this->element}($args, $implode)
+			: (!!$implode ? '' : []);
 	}
 
 	/**
@@ -183,18 +183,18 @@ 
 	 *
 	 * @return array
 	 */
-	protected function mergeAttributesWith( array $defaults )
+	protected function mergeAttributesWith(array $defaults)
 	{
 		// similar to array_merge except overwrite empty values
-		foreach( $defaults as $key => $value ) {
-			if( isset( $this->args[ $key ] ) && !empty( $this->args[ $key ] ))continue;
-			$this->args[ $key ] = $value;
+		foreach ($defaults as $key => $value) {
+			if (isset($this->args[$key]) && !empty($this->args[$key]))continue;
+			$this->args[$key] = $value;
 		}
 
 		$attributes = $this->args['attributes'];
 
 		// prioritize $attributes over $this->args, don't worry about duplicates
-		return array_merge( $this->args, $attributes );
+		return array_merge($this->args, $attributes);
 	}
 
 	/**
@@ -206,22 +206,22 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected function multiInput( $optionKey, $number, $type = 'radio' )
+	protected function multiInput($optionKey, $number, $type = 'radio')
 	{
-		$args = $this->multiInputArgs( $type, $optionKey, $number );
+		$args = $this->multiInputArgs($type, $optionKey, $number);
 
-		if( !$args )return;
+		if (!$args)return;
 
 		$attributes = '';
 
-		foreach( $args['attributes'] as $key => $val ) {
-			$attributes .= sprintf( '%s="%s" ', $key, $val );
+		foreach ($args['attributes'] as $key => $val) {
+			$attributes .= sprintf('%s="%s" ', $key, $val);
 		}
 
-		return sprintf( '<li><label for="%s"><input %s%s/> %s</label></li>',
+		return sprintf('<li><label for="%s"><input %s%s/> %s</label></li>',
 			$args['attributes']['id'],
 			$attributes,
-			checked( $args['value'], $args['attributes']['value'], false ),
+			checked($args['value'], $args['attributes']['value'], false),
 			$args['label']
 		);
 	}
@@ -235,7 +235,7 @@ 
 	 *
 	 * @return array|null
 	 */
-	protected function multiInputArgs( $type, $optionName, $number )
+	protected function multiInputArgs($type, $optionName, $number)
 	{
 		$defaults = [
 			'class' => '',
@@ -246,39 +246,39 @@ 
 
 		$args = [];
 
-		$value = $this->args['options'][ $optionName ];
+		$value = $this->args['options'][$optionName];
 
-		if( is_array( $value )) {
+		if (is_array($value)) {
 			$args = $value;
 		}
 
-		if( is_string( $value )) {
+		if (is_string($value)) {
 			$label = $value;
 		}
 
-		isset( $args['name'] ) ?: $args['name'] = $optionName;
-		isset( $args['value'] ) ?: $args['value'] = $optionName;
+		isset($args['name']) ?: $args['name'] = $optionName;
+		isset($args['value']) ?: $args['value'] = $optionName;
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		if( !isset( $label ) || $args['name'] === '' )return;
+		if (!isset($label) || $args['name'] === '')return;
 
 		$args['id']   = $this->args['id'] . "-{$number}";
-		$args['name'] = $this->args['name'] . ( $type === 'checkbox' && $this->multi ? '[]' : '' );
+		$args['name'] = $this->args['name'] . ($type === 'checkbox' && $this->multi ? '[]' : '');
 
-		$args = array_filter( $args, function( $value ) {
+		$args = array_filter($args, function($value) {
 			return $value !== '';
 		});
 
-		if( is_array( $this->args['value'] )) {
-			if( in_array( $args['value'], $this->args['value'] )) {
+		if (is_array($this->args['value'])) {
+			if (in_array($args['value'], $this->args['value'])) {
 				$this->args['default'] = $args['value'];
 			}
 		}
-		else if( $this->args['value'] ) {
+		else if ($this->args['value']) {
 			$this->args['default'] = $this->args['value'];
 		}
-		else if( $type == 'radio' && !$this->args['default'] ) {
+		else if ($type == 'radio' && !$this->args['default']) {
 			$this->args['default'] = 0;
 		}
 
@@ -297,9 +297,9 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected function multiInputCheckbox( $optionKey, $number )
+	protected function multiInputCheckbox($optionKey, $number)
 	{
-		return $this->multiInput( $optionKey, $number, 'checkbox' );
+		return $this->multiInput($optionKey, $number, 'checkbox');
 	}
 
 	/**
@@ -309,12 +309,12 @@ 
 	 *
 	 * @return string
 	 */
-	protected function selectOption( $optionKey )
+	protected function selectOption($optionKey)
 	{
-		return sprintf( '<option value="%s"%s>%s</option>',
+		return sprintf('<option value="%s"%s>%s</option>',
 			$optionKey,
-			selected( $this->args['value'], $optionKey, false ),
-			$this->args['options'][ $optionKey ]
+			selected($this->args['value'], $optionKey, false),
+			$this->args['options'][$optionKey]
 		);
 	}
 
@@ -325,27 +325,27 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected function singleInput( $type = 'checkbox' )
+	protected function singleInput($type = 'checkbox')
 	{
-		$optionKey = key( $this->args['options'] );
+		$optionKey = key($this->args['options']);
 
-		$args = $this->multiInputArgs( $type, $optionKey, 1 );
+		$args = $this->multiInputArgs($type, $optionKey, 1);
 
-		if( !$args )return;
+		if (!$args)return;
 
 		$atts = $this->normalize();
-		$atts = wp_parse_args( $args['attributes'], $atts );
+		$atts = wp_parse_args($args['attributes'], $atts);
 
 		$attributes = '';
 
-		foreach( $atts as $key => $val ) {
-			$attributes .= sprintf( '%s="%s" ', $key, $val );
+		foreach ($atts as $key => $val) {
+			$attributes .= sprintf('%s="%s" ', $key, $val);
 		}
 
-		return sprintf( '<label for="%s"><input %s%s/> %s</label>',
+		return sprintf('<label for="%s"><input %s%s/> %s</label>',
 			$atts['id'],
 			$attributes,
-			checked( $args['value'], $atts['value'], false ),
+			checked($args['value'], $atts['value'], false),
 			$args['label']
 		);
 	}

src/Forms/Field.php

Spacing +65 added lines, -65 removed lines

@@ -26,14 +26,14 @@ 
 	 * @return mixed
 	 * @throws Exception
 	 */
-	public function __get( $property )
+	public function __get($property)
 	{
-		switch( $property ) {
+		switch ($property) {
 			case 'args':
 			case 'dependencies':
 				return $this->$property;
 		}
-		throw new Exception( sprintf( 'Invalid %s property: %s', __CLASS__, $property ));
+		throw new Exception(sprintf('Invalid %s property: %s', __CLASS__, $property));
 	}
 
 
@@ -42,19 +42,19 @@ 
 	 *
 	 * @return mixed GeminiLabs\SiteReviews\Html\Fields\*
 	 */
-	public function getField( array $args = [] )
+	public function getField(array $args = [])
 	{
-		if( empty( $args )) {
+		if (empty($args)) {
 			$args = $this->args;
 		}
 
-		$className = sprintf( 'GeminiLabs\Castor\Forms\Fields\%s', ucfirst( $args['type'] ));
+		$className = sprintf('GeminiLabs\Castor\Forms\Fields\%s', ucfirst($args['type']));
 
-		if( !class_exists( $className )) {
-			throw new ReflectionException( "Class does not exist: {$className}" );
+		if (!class_exists($className)) {
+			throw new ReflectionException("Class does not exist: {$className}");
 		}
 
-		return (new $className( $args ));
+		return (new $className($args));
 	}
 
 	/**
@@ -62,7 +62,7 @@ 
 	 *
 	 * @return $this
 	 */
-	public function normalize( array $args = [] )
+	public function normalize(array $args = [])
 	{
 		$defaults = [
 			'after'       => '',
@@ -86,23 +86,23 @@ 
 			'value'       => '',
 		];
 
-		$args = $atts = wp_parse_args( $args, $defaults );
+		$args = $atts = wp_parse_args($args, $defaults);
 
-		$args['attributes'] = $this->parseAttributes( $atts );
-		$args['id']         = $this->parseId( $atts );
-		$args['inline']     = $this->parseInline( $atts );
-		$args['type']       = $this->parseType( $atts );
-		$args['name']       = $this->parseName( $atts );
+		$args['attributes'] = $this->parseAttributes($atts);
+		$args['id']         = $this->parseId($atts);
+		$args['inline']     = $this->parseInline($atts);
+		$args['type']       = $this->parseType($atts);
+		$args['name']       = $this->parseName($atts);
 		$args['options']    = (array) $atts['options']; // make sure this is always an array
 		$args['path']       = $atts['name'];
-		$args['prefix']     = $this->parsePrefix( $atts );
-		$args['value']      = $this->parseValue( $atts );
+		$args['prefix']     = $this->parsePrefix($atts);
+		$args['value']      = $this->parseValue($atts);
 
 		$this->args = $args;
-		$this->dependencies = $this->getField( $args )->dependencies;
+		$this->dependencies = $this->getField($args)->dependencies;
 
 		$this->setDataDepends();
-		$this->checkForErrors( $atts );
+		$this->checkForErrors($atts);
 
 		return $this;
 	}
@@ -114,9 +114,9 @@ 
 	 *
 	 * @return string|void
 	 */
-	public function render( $print = true )
+	public function render($print = true)
 	{
-		if( $this->args['render'] === false )return;
+		if ($this->args['render'] === false)return;
 
 		$field = $this->getField();
 
@@ -125,16 +125,16 @@ 
 
 		$renderedString = '%s';
 
-		if( ( isset( $field->args['required'] ) && $field->args['required'] )
-			|| ( isset( $field->args['attributes']['required'] ) || in_array( 'required', $field->args['attributes'] )) ) {
+		if ((isset($field->args['required']) && $field->args['required'])
+			|| (isset($field->args['attributes']['required']) || in_array('required', $field->args['attributes']))) {
 			$class .= ' glsr-required';
 		}
 
-		if( $field->args['type'] !== 'hidden' ) {
-			$renderedString = sprintf( '<div class="%s">%%s</div>', $class );
+		if ($field->args['type'] !== 'hidden') {
+			$renderedString = sprintf('<div class="%s">%%s</div>', $class);
 		}
 
-		$rendered = sprintf( $renderedString,
+		$rendered = sprintf($renderedString,
 			$this->args['before'] .
 			$field->generateLabel() .
 			$field->render() .
@@ -142,9 +142,9 @@ 
 			$this->args['errors']
 		);
 
-		$rendered = apply_filters( 'castor/rendered/field', $rendered, $field->args['type'] );
+		$rendered = apply_filters('castor/rendered/field', $rendered, $field->args['type']);
 
-		if( !!$print && $print !== 'return' ) {
+		if (!!$print && $print !== 'return') {
 			echo $rendered;
 		}
 
@@ -168,22 +168,22 @@ 
 	 *
 	 * @return void
 	 */
-	protected function checkForErrors( array $atts )
+	protected function checkForErrors(array $atts)
 	{
 		$args = $this->args;
 
-		if( !array_key_exists( $atts['name'], $args['errors'] )) {
+		if (!array_key_exists($atts['name'], $args['errors'])) {
 			$this->args['errors'] = ''; // set to an empty string
 			return;
 		}
 
-		$field_errors = $args['errors'][ $atts['name'] ];
+		$field_errors = $args['errors'][$atts['name']];
 
-		$errors = array_reduce( $field_errors['errors'], function( $carry, $error ) {
-			return $carry . sprintf( '<span>%s</span> ', $error );
+		$errors = array_reduce($field_errors['errors'], function($carry, $error) {
+			return $carry . sprintf('<span>%s</span> ', $error);
 		});
 
-		$this->args['errors'] = sprintf( '<span class="glsr-field-errors">%s</span>', $errors );
+		$this->args['errors'] = sprintf('<span class="glsr-field-errors">%s</span>', $errors);
 	}
 
 	/**
@@ -191,19 +191,19 @@ 
 	 *
 	 * @return array
 	 */
-	protected function parseAttributes( array $args )
+	protected function parseAttributes(array $args)
 	{
-		if( empty( $args['attributes'] )) {
+		if (empty($args['attributes'])) {
 			return [];
 		}
 
 		$attributes = (array) $args['attributes'];
 
-		foreach( $attributes as $key => $value ) {
-			if( is_string( $key ))continue;
-			unset( $attributes[ $key ] );
-			if( !isset( $attributes[ $value ] )) {
-				$attributes[ $value ] = '';
+		foreach ($attributes as $key => $value) {
+			if (is_string($key))continue;
+			unset($attributes[$key]);
+			if (!isset($attributes[$value])) {
+				$attributes[$value] = '';
 			}
 		}
 
@@ -215,13 +215,13 @@ 
 	 *
 	 * @return null|string
 	 */
-	protected function parseId( array $args )
+	protected function parseId(array $args)
 	{
-		if( isset( $args['id'] ) && !$args['id'] )return;
+		if (isset($args['id']) && !$args['id'])return;
 
 		!$args['suffix'] ?: $args['suffix'] = "-{$args['suffix']}";
 
-		return str_replace( ['[]','[',']','.'], ['','-','','-'], $this->parseName( $args ) . $args['suffix'] );
+		return str_replace(['[]', '[', ']', '.'], ['', '-', '', '-'], $this->parseName($args) . $args['suffix']);
 	}
 
 	/**
@@ -229,9 +229,9 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function parseInline( array $args )
+	protected function parseInline(array $args)
 	{
-		return false !== stripos( $args['type'], '_inline' )
+		return false !== stripos($args['type'], '_inline')
 			? true
 			: $args['inline'];
 	}
@@ -241,20 +241,20 @@ 
 	 *
 	 * @return string
 	 */
-	protected function parseName( array $args )
+	protected function parseName(array $args)
 	{
 		$name   = $args['name'];
-		$prefix = $this->parsePrefix( $args );
+		$prefix = $this->parsePrefix($args);
 
-		if( $prefix === false ) {
+		if ($prefix === false) {
 			return $name;
 		}
 
-		$paths = explode( '.', $name );
+		$paths = explode('.', $name);
 
-		return array_reduce( $paths, function( $result, $value ) {
+		return array_reduce($paths, function($result, $value) {
 			return $result .= "[$value]";
-		}, $prefix );
+		}, $prefix);
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 	 *
 	 * @return string|false
 	 */
-	protected function parsePrefix( array $args )
+	protected function parsePrefix(array $args)
 	{
 		return $args['prefix'];
 	}
@@ -272,12 +272,12 @@ 
 	 *
 	 * @return string
 	 */
-	protected function parseType( array $args )
+	protected function parseType(array $args)
 	{
 		$type = $args['type'];
 
-		return false !== stripos( $type, '_inline' )
-			? str_replace( '_inline', '', $type )
+		return false !== stripos($type, '_inline')
+			? str_replace('_inline', '', $type)
 			: $type;
 	}
 
@@ -286,18 +286,18 @@ 
 	 *
 	 * @return string
 	 */
-	protected function parseValue( array $args )
+	protected function parseValue(array $args)
 	{
 		$default = $args['default'];
 		$name    = $args['name'];
 		$prefix  = $args['prefix'];
 		$value   = $args['value'];
 
-		if( $default == ':placeholder' ) {
+		if ($default == ':placeholder') {
 			$default = '';
 		}
 
-		return ( !empty( $value ) || !$name || $prefix === false )
+		return (!empty($value) || !$name || $prefix === false)
 			? $value
 			: $default;
 	}
@@ -329,15 +329,15 @@ 
 	 */
 	protected function setDataDepends()
 	{
-		if( !( $depends = $this->args['depends'] ))return;
+		if (!($depends = $this->args['depends']))return;
 
 		$name  = $depends;
 		$value = true;
 
-		if( is_array( $depends )) {
-			reset( $depends );
-			$name  = key( $depends );
-			$value = $depends[ $name ];
+		if (is_array($depends)) {
+			reset($depends);
+			$name  = key($depends);
+			$value = $depends[$name];
 		}
 
 		$name = $this->parseName([

Braces +12 added lines, -4 removed lines

@@ -116,7 +116,9 @@ 
 	 */
 	public function render( $print = true )
 	{
-		if( $this->args['render'] === false )return;
+		if( $this->args['render'] === false ) {
+			return;
+		}
 
 		$field = $this->getField();
 
@@ -200,7 +202,9 @@ 
 		$attributes = (array) $args['attributes'];
 
 		foreach( $attributes as $key => $value ) {
-			if( is_string( $key ))continue;
+			if( is_string( $key )) {
+				continue;
+			}
 			unset( $attributes[ $key ] );
 			if( !isset( $attributes[ $value ] )) {
 				$attributes[ $value ] = '';
@@ -217,7 +221,9 @@ 
 	 */
 	protected function parseId( array $args )
 	{
-		if( isset( $args['id'] ) && !$args['id'] )return;
+		if( isset( $args['id'] ) && !$args['id'] ) {
+			return;
+		}
 
 		!$args['suffix'] ?: $args['suffix'] = "-{$args['suffix']}";
 
@@ -329,7 +335,9 @@ 
 	 */
 	protected function setDataDepends()
 	{
-		if( !( $depends = $this->args['depends'] ))return;
+		if( !( $depends = $this->args['depends'] )) {
+			return;
+		}
 
 		$name  = $depends;
 		$value = true;