aristath / kirki

modules/css/class-kirki-output.php

Spacing +30 added lines, -30 removed lines

@@ -83,13 +83,13 @@ 
 	 */
 	protected function apply_sanitize_callback( $output, $value ) {
 
-		if ( isset( $output['sanitize_callback'] ) && null !== $output['sanitize_callback'] ) {
+		if ( isset( $output[ 'sanitize_callback' ] ) && null !== $output[ 'sanitize_callback' ] ) {
 
 			// If the sanitize_callback is invalid, return the value.
-			if ( ! is_callable( $output['sanitize_callback'] ) ) {
+			if ( ! is_callable( $output[ 'sanitize_callback' ] ) ) {
 				return $value;
 			}
-			return call_user_func( $output['sanitize_callback'], $this->value );
+			return call_user_func( $output[ 'sanitize_callback' ], $this->value );
 		}
 
 		return $value;
@@ -105,22 +105,22 @@ 
 	 */
 	protected function apply_value_pattern( $output, $value ) {
 
-		if ( isset( $output['value_pattern'] ) && ! empty( $output['value_pattern'] ) && is_string( $output['value_pattern'] ) ) {
+		if ( isset( $output[ 'value_pattern' ] ) && ! empty( $output[ 'value_pattern' ] ) && is_string( $output[ 'value_pattern' ] ) ) {
 			if ( ! is_array( $value ) ) {
-				$value = str_replace( '$', $value, $output['value_pattern'] );
+				$value = str_replace( '$', $value, $output[ 'value_pattern' ] );
 			}
 			if ( is_array( $value ) ) {
 				foreach ( array_keys( $value ) as $value_k ) {
 					if ( ! is_string( $value[ $value_k ] ) ) {
 						continue;
 					}
-					if ( isset( $output['choice'] ) ) {
-						if ( $output['choice'] === $value_k ) {
-							$value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] );
+					if ( isset( $output[ 'choice' ] ) ) {
+						if ( $output[ 'choice' ] === $value_k ) {
+							$value[ $output[ 'choice' ] ] = str_replace( '$', $value[ $output[ 'choice' ] ], $output[ 'value_pattern' ] );
 						}
 						continue;
 					}
-					$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] );
+					$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output[ 'value_pattern' ] );
 				}
 			}
 			$value = $this->apply_pattern_replace( $output, $value );
@@ -136,14 +136,14 @@ 
 	 * @return string|array
 	 */
 	protected function apply_pattern_replace( $output, $value ) {
-		if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) {
+		if ( isset( $output[ 'pattern_replace' ] ) && is_array( $output[ 'pattern_replace' ] ) ) {
 			$option_type = ( '' !== Kirki::get_config_param( $this->config_id, 'option_type' ) ) ? Kirki::get_config_param( $this->config_id, 'option_type' ) : 'theme_mod';
 			$option_name = Kirki::get_config_param( $this->config_id, 'option_name' );
 			$options     = array();
 			if ( $option_name ) {
 				$options = ( 'site_option' === $option_type ) ? get_site_option( $option_name ) : get_option( $option_name );
 			}
-			foreach ( $output['pattern_replace'] as $search => $replace ) {
+			foreach ( $output[ 'pattern_replace' ] as $search => $replace ) {
 				$replacement = '';
 				switch ( $option_type ) {
 					case 'option':
@@ -204,8 +204,8 @@ 
 			}
 
 			// No need to proceed this if the current value is the same as in the "exclude" value.
-			if ( isset( $output['exclude'] ) && is_array( $output['exclude'] ) ) {
-				foreach ( $output['exclude'] as $exclude ) {
+			if ( isset( $output[ 'exclude' ] ) && is_array( $output[ 'exclude' ] ) ) {
+				foreach ( $output[ 'exclude' ] as $exclude ) {
 					if ( is_array( $value ) ) {
 						if ( is_array( $exclude ) ) {
 							$diff1 = array_diff( $value, $exclude );
@@ -218,7 +218,7 @@ 
 						// If 'choice' is defined check for sub-values too.
 						// Fixes https://github.com/aristath/kirki/issues/1416.
 						// @codingStandardsIgnoreLine WordPress.PHP.StrictComparisons.LooseComparison
-						if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+						if ( isset( $output[ 'choice' ] ) && isset( $value[ $output[ 'choice' ] ] ) && $exclude == $value[ $output[ 'choice' ] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
 							$skip = true;
 						}
 					}
@@ -239,10 +239,10 @@ 
 			// Apply any value patterns defined.
 			$value = $this->apply_value_pattern( $output, $value );
 
-			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
-				$output['element'] = array_unique( $output['element'] );
-				sort( $output['element'] );
-				$output['element'] = implode( ',', $output['element'] );
+			if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) {
+				$output[ 'element' ] = array_unique( $output[ 'element' ] );
+				sort( $output[ 'element' ] );
+				$output[ 'element' ] = implode( ',', $output[ 'element' ] );
 			}
 
 			$value = $this->process_value( $value, $output );
@@ -260,13 +260,13 @@ 
 	 * @return null
 	 */
 	protected function process_output( $output, $value ) {
-		if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) {
+		if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) {
 			return;
 		}
-		$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
-		$output['prefix']      = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';
-		$output['units']       = ( isset( $output['units'] ) ) ? $output['units'] : '';
-		$output['suffix']      = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
+		$output[ 'media_query' ] = ( isset( $output[ 'media_query' ] ) ) ? $output[ 'media_query' ] : 'global';
+		$output[ 'prefix' ]      = ( isset( $output[ 'prefix' ] ) ) ? $output[ 'prefix' ] : '';
+		$output[ 'units' ]       = ( isset( $output[ 'units' ] ) ) ? $output[ 'units' ] : '';
+		$output[ 'suffix' ]      = ( isset( $output[ 'suffix' ] ) ) ? $output[ 'suffix' ] : '';
 
 		// Properties that can accept multiple values.
 		// Useful for example for gradients where all browsers use the "background-image" property
@@ -275,14 +275,14 @@ 
 			'background-image',
 			'background',
 		);
-		if ( in_array( $output['property'], $accepts_multiple, true ) ) {
-			if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ];
+		if ( in_array( $output[ 'property' ], $accepts_multiple, true ) ) {
+			if ( isset( $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] ) && ! is_array( $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] ) ) {
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = (array) $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ];
 			}
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
+			$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ][ ] = $output[ 'prefix' ] . $value . $output[ 'units' ] . $output[ 'suffix' ];
 			return;
 		}
-		$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
+		$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value ) . $output[ 'units' ] . $output[ 'suffix' ];
 	}
 
 	/**
@@ -320,8 +320,8 @@ 
 	 * @return string|array
 	 */
 	protected function process_value( $value, $output ) {
-		if ( isset( $output['property'] ) ) {
-			return $this->process_property_value( $output['property'], $value );
+		if ( isset( $output[ 'property' ] ) ) {
+			return $this->process_property_value( $output[ 'property' ], $value );
 		}
 		return $value;
 	}

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
 						// If 'choice' is defined check for sub-values too.
 						// Fixes https://github.com/aristath/kirki/issues/1416.
 						// @codingStandardsIgnoreLine WordPress.PHP.StrictComparisons.LooseComparison
-						if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+						if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) {
+// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
 							$skip = true;
 						}
 					}