aristath / kirki

modules/postmessage/class-kirki-modules-postmessage.php

Spacing +5 added lines, -5 removed lines

@@ -142,10 +142,10 @@ 
 			$js_var['index_key'] = $key;
 			$callback = $this->get_callback( $args );
 			if ( is_callable( $callback ) ) {
-				$field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) );
+				$field['scripts'][$key] = call_user_func_array( $callback, array( $js_var, $args ) );
 				continue;
 			}
-			$field['scripts'][ $key ] = $this->script_var( $js_var );
+			$field['scripts'][$key] = $this->script_var( $js_var );
 		}
 		$combo_extra_script = '';
 		$combo_css_script   = '';
@@ -177,7 +177,7 @@ 
 	 */
 	protected function script_html_var( $args ) {
 
-		$script  = ( isset( $args['choice'] ) ) ? "newval=newval['{$args['choice']}'];" : '';
+		$script = ( isset( $args['choice'] ) ) ? "newval=newval['{$args['choice']}'];" : '';
 
 		// Apply the value_pattern.
 		if ( isset( $args['value_pattern'] ) && '' !== $args['value_pattern'] ) {
@@ -251,7 +251,7 @@ 
 		$property_script = '';
 
 		// Define choice.
-		$choice  = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : '';
+		$choice = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : '';
 
 		$value_key = 'newval' . $args['index_key'];
 		$property_script .= $value_key . '=newval;';
@@ -344,7 +344,7 @@ 
 			'font-weight'    => 'fontWeight',
 			'font-style'     => 'fontStyle',
 		);
-		$choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) );
+		$choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[$args['choice']] ) );
 		$script .= ( ! $choice_condition ) ? $webfont_loader : '';
 		foreach ( $css_build_array as $property => $var ) {
 			if ( $choice_condition && $property !== $args['choice'] ) {

modules/css/class-kirki-output.php

Spacing +15 added lines, -15 removed lines

@@ -101,16 +101,16 @@ 
 			}
 			if ( is_array( $value ) ) {
 				foreach ( array_keys( $value ) as $value_k ) {
-					if ( ! is_string( $value[ $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'] );
+							$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 );
@@ -140,16 +140,16 @@ 
 						if ( is_array( $options ) ) {
 							if ( $option_name ) {
 								$subkey = str_replace( array( $option_name, '[', ']' ), '', $replace );
-								$replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : '';
+								$replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : '';
 								break;
 							}
-							$replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : '';
+							$replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : '';
 							break;
 						}
 						$replacement = get_option( $replace );
 						break;
 					case 'site_option':
-						$replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace );
+						$replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace );
 						break;
 					case 'user_meta':
 						$user_id = get_current_user_id();
@@ -164,10 +164,10 @@ 
 				$replacement = ( false === $replacement ) ? '' : $replacement;
 				if ( is_array( $value ) ) {
 					foreach ( $value as $k => $v ) {
-						if ( isset( $value[ $v ] ) ) {
-							$value[ $k ] = str_replace( $search, $replacement, $value[ $v ] );
+						if ( isset( $value[$v] ) ) {
+							$value[$k] = str_replace( $search, $replacement, $value[$v] );
 						} else {
-							$value[ $k ] = str_replace( $search, $replacement, $v );
+							$value[$k] = str_replace( $search, $replacement, $v );
 						}
 					}
 					return $value;
@@ -210,7 +210,7 @@ 
 						}
 						// If 'choice' is defined check for sub-values too.
 						// Fixes https://github.com/aristath/kirki/issues/1416.
-						if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) {
+						if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude == $value[$output['choice']] ) {
 							$skip = true;
 						}
 					}
@@ -268,13 +268,13 @@ 
 			'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 ( 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'];
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 			)
 		);
 		if ( array_key_exists( $property, $properties ) ) {
-			$classname = $properties[ $property ];
+			$classname = $properties[$property];
 			$obj = new $classname( $property, $value );
 			return $obj->get_value();
 		}

core/class-kirki-field.php

Spacing +18 added lines, -18 removed lines

@@ -257,13 +257,13 @@ 
 
 		// Get the config arguments, and merge them with the defaults.
 		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
-		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) {
-			$config_defaults = Kirki::$config[ $this->kirki_config ];
+		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) {
+			$config_defaults = Kirki::$config[$this->kirki_config];
 		}
 		$config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array();
 		foreach ( $config_defaults as $key => $value ) {
-			if ( isset( $defaults[ $key ] ) && ! empty( $value ) && $value !== $defaults[ $key ] ) {
-				$defaults[ $key ] = $value;
+			if ( isset( $defaults[$key] ) && ! empty( $value ) && $value !== $defaults[$key] ) {
+				$defaults[$key] = $value;
 			}
 		}
 
@@ -308,11 +308,11 @@ 
 		// Get all arguments with their values.
 		$args = get_object_vars( $this );
 		foreach ( array_keys( $args ) as $key ) {
-			$args[ $key ] = $this->$key;
+			$args[$key] = $this->$key;
 		}
 
 		// Add the field to the static $fields variable properly indexed.
-		Kirki::$fields[ $this->settings ] = $args;
+		Kirki::$fields[$this->settings] = $args;
 
 	}
 
@@ -407,7 +407,7 @@ 
 			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
 				/* translators: %1$s represents the field ID where the error occurs. */
 				_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
-				unset( $this->partial_refresh[ $id ] );
+				unset( $this->partial_refresh[$id] );
 				continue;
 			}
 		}
@@ -435,10 +435,10 @@ 
 		}
 		$settings = array();
 		foreach ( $this->settings as $setting_key => $setting_value ) {
-			$settings[ $setting_key ] = $setting_value;
+			$settings[$setting_key] = $setting_value;
 			// If we're using serialized options then we need to spice this up.
 			if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) {
-				$settings[ $setting_key ] = "{$this->option_name}[{$setting_value}]";
+				$settings[$setting_key] = "{$this->option_name}[{$setting_value}]";
 			}
 		}
 		$this->settings = $settings;
@@ -550,27 +550,27 @@ 
 		}
 		foreach ( $this->output as $key => $output ) {
 			if ( empty( $output ) || ! isset( $output['element'] ) ) {
-				unset( $this->output[ $key ] );
+				unset( $this->output[$key] );
 				continue;
 			}
 			if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) {
-				$this->output[ $key ]['sanitize_callback'] = $output['callback'];
+				$this->output[$key]['sanitize_callback'] = $output['callback'];
 			}
 			// Convert element arrays to strings.
 			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
-				$this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] );
-				sort( $this->output[ $key ]['element'] );
+				$this->output[$key]['element'] = array_unique( $this->output[$key]['element'] );
+				sort( $this->output[$key]['element'] );
 
 				// Trim each element in the array.
-				foreach ( $this->output[ $key ]['element'] as $index => $element ) {
-					$this->output[ $key ]['element'][ $index ] = trim( $element );
+				foreach ( $this->output[$key]['element'] as $index => $element ) {
+					$this->output[$key]['element'][$index] = trim( $element );
 				}
-				$this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] );
+				$this->output[$key]['element'] = implode( ',', $this->output[$key]['element'] );
 			}
 
 			// Fix for https://github.com/aristath/kirki/issues/1659#issuecomment-346229751.
-			$this->output[ $key ]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ]['element'] );
-			$this->output[ $key ]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ]['element'] ) );
+			$this->output[$key]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[$key]['element'] );
+			$this->output[$key]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[$key]['element'] ) );
 		}
 	}