aristath / kirki

core/class-kirki-control.php

Spacing +3 added lines, -3 removed lines

@@ -68,8 +68,8 @@ 
 		$class_name = 'WP_Customize_Control';
 
 		// Get the classname from the array of control classnames.
-		if ( array_key_exists( $args['type'], self::$control_types ) ) {
-			$class_name = self::$control_types[ $args['type'] ];
+		if ( array_key_exists( $args[ 'type' ], self::$control_types ) ) {
+			$class_name = self::$control_types[ $args[ 'type' ] ];
 		}
 		return $class_name;
 	}
@@ -86,7 +86,7 @@ 
 		$class_name = $this->get_control_class_name( $args );
 
 		// Add the control.
-		$this->wp_customize->add_control( new $class_name( $this->wp_customize, $args['settings'], $args ) );
+		$this->wp_customize->add_control( new $class_name( $this->wp_customize, $args[ 'settings' ], $args ) );
 
 	}
 

core/class-kirki-util.php

Spacing +21 added lines, -21 removed lines

@@ -43,7 +43,7 @@ 
 		$plugins = get_plugins();
 		$_plugin = '';
 		foreach ( $plugins as $plugin => $args ) {
-			if ( ! $is_plugin && isset( $args['Name'] ) && ( 'Kirki' === $args['Name'] || 'Kirki Toolkit' === $args['Name'] ) ) {
+			if ( ! $is_plugin && isset( $args[ 'Name' ] ) && ( 'Kirki' === $args[ 'Name' ] || 'Kirki Toolkit' === $args[ 'Name' ] ) ) {
 				$is_plugin = true;
 				$_plugin   = $plugin;
 			}
@@ -80,23 +80,23 @@ 
 		foreach ( Kirki::$fields as $field ) {
 
 			// Check if we have variables for this field.
-			if ( isset( $field['variables'] ) && $field['variables'] && ! empty( $field['variables'] ) ) {
+			if ( isset( $field[ 'variables' ] ) && $field[ 'variables' ] && ! empty( $field[ 'variables' ] ) ) {
 
 				// Loop through the array of variables.
-				foreach ( $field['variables'] as $field_variable ) {
+				foreach ( $field[ 'variables' ] as $field_variable ) {
 
 					// Is the variable ['name'] defined? If yes, then we can proceed.
-					if ( isset( $field_variable['name'] ) ) {
+					if ( isset( $field_variable[ 'name' ] ) ) {
 
 						// Do we have a callback function defined? If not then set $variable_callback to false.
-						$variable_callback = ( isset( $field_variable['callback'] ) && is_callable( $field_variable['callback'] ) ) ? $field_variable['callback'] : false;
+						$variable_callback = ( isset( $field_variable[ 'callback' ] ) && is_callable( $field_variable[ 'callback' ] ) ) ? $field_variable[ 'callback' ] : false;
 
 						// If we have a variable_callback defined then get the value of the option
 						// and run it through the callback function.
 						// If no callback is defined (false) then just get the value.
-						$variables[ $field_variable['name'] ] = Kirki_Values::get_value( $field['settings'] );
+						$variables[ $field_variable[ 'name' ] ] = Kirki_Values::get_value( $field[ 'settings' ] );
 						if ( $variable_callback ) {
-							$variables[ $field_variable['name'] ] = call_user_func( $field_variable['callback'], Kirki_Values::get_value( $field['settings'] ) );
+							$variables[ $field_variable[ 'name' ] ] = call_user_func( $field_variable[ 'callback' ], Kirki_Values::get_value( $field[ 'settings' ] ) );
 						}
 					}
 				}
@@ -123,31 +123,31 @@ 
 		if (
 			self::is_plugin() ||
 			false === strpos( $url, 'wordpress.org' ) || (
-				! isset( $request['body'] ) ||
-				! isset( $request['body']['plugins'] ) ||
-				! isset( $request['body']['translations'] ) ||
-				! isset( $request['body']['locale'] ) ||
-				! isset( $request['body']['all'] )
+				! isset( $request[ 'body' ] ) ||
+				! isset( $request[ 'body' ][ 'plugins' ] ) ||
+				! isset( $request[ 'body' ][ 'translations' ] ) ||
+				! isset( $request[ 'body' ][ 'locale' ] ) ||
+				! isset( $request[ 'body' ][ 'all' ] )
 			)
 		) {
 			return $request;
 		}
 
-		$plugins = json_decode( $request['body']['plugins'], true );
-		if ( ! isset( $plugins['plugins'] ) ) {
+		$plugins = json_decode( $request[ 'body' ][ 'plugins' ], true );
+		if ( ! isset( $plugins[ 'plugins' ] ) ) {
 			return $request;
 		}
 		$exists = false;
-		foreach ( $plugins['plugins'] as $plugin ) {
-			if ( isset( $plugin['Name'] ) && 'Kirki Toolkit' === $plugin['Name'] ) {
+		foreach ( $plugins[ 'plugins' ] as $plugin ) {
+			if ( isset( $plugin[ 'Name' ] ) && 'Kirki Toolkit' === $plugin[ 'Name' ] ) {
 				$exists = true;
 			}
 		}
 		// Inject data.
 		if ( ! $exists && defined( 'KIRKI_PLUGIN_FILE' ) ) {
-			$plugins['plugins']['kirki/kirki.php'] = get_plugin_data( KIRKI_PLUGIN_FILE );
+			$plugins[ 'plugins' ][ 'kirki/kirki.php' ] = get_plugin_data( KIRKI_PLUGIN_FILE );
 		}
-		$request['body']['plugins'] = wp_json_encode( $plugins );
+		$request[ 'body' ][ 'plugins' ] = wp_json_encode( $plugins );
 		return $request;
 	}
 
@@ -167,7 +167,7 @@ 
 		// We only need the major version.
 		if ( 'major' === $context ) {
 			$version_parts = explode( '.', $wp_version );
-			return $version_parts[0];
+			return $version_parts[ 0 ];
 		}
 
 		return $wp_version;
@@ -190,7 +190,7 @@ 
 		// We only need the major version.
 		if ( 'major' === $context ) {
 			$version_parts = explode( '.', $wp_version );
-			return absint( $version_parts[0] );
+			return absint( $version_parts[ 0 ] );
 		}
 
 		// If we got this far, we want the full monty.
@@ -198,7 +198,7 @@ 
 		if ( false !== strpos( $wp_version, '-' ) ) {
 			// We're on a dev version.
 			$version_parts = explode( '-', $wp_version );
-			return floatval( $version_parts[0] );
+			return floatval( $version_parts[ 0 ] );
 		}
 		return floatval( $wp_version );
 	}

field/class-kirki-field-url.php

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 		if ( ! is_array( $this->choices ) ) {
 			$this->choices = array();
 		}
-		$this->choices['element'] = 'input';
-		$this->choices['type']    = 'text';
+		$this->choices[ 'element' ] = 'input';
+		$this->choices[ 'type' ]    = 'text';
 	}
 
 	/**

modules/gutenberg/class-kirki-modules-gutenberg.php

Spacing +3 added lines, -3 removed lines

@@ -168,7 +168,7 @@ 
 		$styles = $this->get_styles();
 
 		if ( ! empty( $styles ) ) {
-			$settings['styles'][] = array( 'css' => $styles );
+			$settings[ 'styles' ][ ] = array( 'css' => $styles );
 		}
 
 		return $settings;
@@ -220,11 +220,11 @@ 
 		}
 
 		if ( ! empty( $args ) ) {
-			if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) {
+			if ( isset( $args[ 'disable_output' ] ) && true === $args[ 'disable_output' ] ) {
 				return true;
 			}
 
-			if ( ! isset( $args['gutenberg_support'] ) || true !== $args['gutenberg_support'] ) {
+			if ( ! isset( $args[ 'gutenberg_support' ] ) || true !== $args[ 'gutenberg_support' ] ) {
 				return true;
 			}
 		}

modules/css/class-kirki-output.php

Spacing +32 added lines, -32 removed lines

@@ -81,13 +81,13 @@ 
 	 * @return string|array
 	 */
 	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;
 	}
@@ -100,22 +100,22 @@ 
 	 * @return string|array
 	 */
 	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 );
@@ -131,14 +131,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':
@@ -198,8 +198,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 );
@@ -211,7 +211,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'] ] ) { // 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;
 						}
 					}
@@ -232,10 +232,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 );
@@ -243,10 +243,10 @@ 
 			if ( is_admin() && ! is_customize_preview() ) {
 
 				// Check if this is an admin style.
-				if ( ! isset( $output['context'] ) || ! in_array( 'editor', $output['context'] ) ) {
+				if ( ! isset( $output[ 'context' ] ) || ! in_array( 'editor', $output[ 'context' ] ) ) {
 					continue;
 				}
-			} elseif ( isset( $output['context'] ) && ! in_array( 'front', $output['context'] ) ) {
+			} elseif ( isset( $output[ 'context' ] ) && ! in_array( 'front', $output[ 'context' ] ) ) {
 
 				// Check if this is a frontend style.
 				continue;
@@ -265,13 +265,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
@@ -280,15 +280,15 @@ 
 			'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;
 		}
 		if ( is_string( $value ) || is_numeric( $value ) ) {
-			$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' ];
 		}
 	}
 
@@ -327,8 +327,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;
 	}

modules/css-vars/class-kirki-modules-css-vars.php

Spacing +8 added lines, -8 removed lines

@@ -86,15 +86,15 @@ 
 		// Get an array of all fields.
 		$fields = Kirki::$fields;
 		foreach ( $fields as $id => $args ) {
-			if ( ! isset( $args['css_vars'] ) || empty( $args['css_vars'] ) ) {
+			if ( ! isset( $args[ 'css_vars' ] ) || empty( $args[ 'css_vars' ] ) ) {
 				continue;
 			}
-			$val = Kirki_Values::get_value( $args['kirki_config'], $id );
-			foreach ( $args['css_vars'] as $css_var ) {
-				if ( isset( $css_var[2] ) && is_array( $val ) && isset( $val[ $css_var[2] ] ) ) {
-					$this->vars[ $css_var[0] ] = str_replace( '$', $val[ $css_var[2] ], $css_var[1] );
+			$val = Kirki_Values::get_value( $args[ 'kirki_config' ], $id );
+			foreach ( $args[ 'css_vars' ] as $css_var ) {
+				if ( isset( $css_var[ 2 ] ) && is_array( $val ) && isset( $val[ $css_var[ 2 ] ] ) ) {
+					$this->vars[ $css_var[ 0 ] ] = str_replace( '$', $val[ $css_var[ 2 ] ], $css_var[ 1 ] );
 				} else {
-					$this->vars[ $css_var[0] ] = str_replace( '$', $val, $css_var[1] );
+					$this->vars[ $css_var[ 0 ] ] = str_replace( '$', $val, $css_var[ 1 ] );
 				}
 			}
 		}
@@ -147,8 +147,8 @@ 
 		$fields = Kirki::$fields;
 		$data   = array();
 		foreach ( $fields as $field ) {
-			if ( isset( $field['transport'] ) && 'postMessage' === $field['transport'] && isset( $field['css_vars'] ) && ! empty( $field['css_vars'] ) ) {
-				$data[] = $field;
+			if ( isset( $field[ 'transport' ] ) && 'postMessage' === $field[ 'transport' ] && isset( $field[ 'css_vars' ] ) && ! empty( $field[ 'css_vars' ] ) ) {
+				$data[ ] = $field;
 			}
 		}
 		wp_localize_script( 'kirki_auto_css_vars', 'kirkiCssVarFields', $data );

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

Spacing +87 added lines, -87 removed lines

@@ -74,7 +74,7 @@ 
 		wp_enqueue_script( 'kirki_auto_postmessage', trailingslashit( Kirki::$url ) . 'modules/postmessage/postmessage.js', array( 'jquery', 'customize-preview' ), KIRKI_VERSION, true );
 		$fields = Kirki::$fields;
 		foreach ( $fields as $field ) {
-			if ( isset( $field['transport'] ) && 'postMessage' === $field['transport'] && isset( $field['js_vars'] ) && ! empty( $field['js_vars'] ) && is_array( $field['js_vars'] ) && isset( $field['settings'] ) ) {
+			if ( isset( $field[ 'transport' ] ) && 'postMessage' === $field[ 'transport' ] && isset( $field[ 'js_vars' ] ) && ! empty( $field[ 'js_vars' ] ) && is_array( $field[ 'js_vars' ] ) && isset( $field[ 'settings' ] ) ) {
 				$this->script .= $this->script( $field );
 			}
 		}
@@ -90,11 +90,11 @@ 
 	 * @param array $args The arguments.
 	 */
 	protected function script( $args ) {
-		$script = 'wp.customize(\'' . $args['settings'] . '\',function(value){value.bind(function(newval){';
+		$script = 'wp.customize(\'' . $args[ 'settings' ] . '\',function(value){value.bind(function(newval){';
 
 		$add_css = false;
-		foreach ( $args['js_vars'] as $js_var ) {
-			if ( ! isset( $js_var['function'] ) || 'html' !== $js_var['function'] ) {
+		foreach ( $args[ 'js_vars' ] as $js_var ) {
+			if ( ! isset( $js_var[ 'function' ] ) || 'html' !== $js_var[ 'function' ] ) {
 				$add_css = true;
 			}
 		}
@@ -103,7 +103,7 @@ 
 
 			// append unique style tag if not exist
 			// The style ID.
-			$style_id = 'kirki-postmessage-' . str_replace( array( '[', ']' ), '', $args['settings'] );
+			$style_id = 'kirki-postmessage-' . str_replace( array( '[', ']' ), '', $args[ 'settings' ] );
 			$script  .= 'if(null===document.getElementById(\'' . $style_id . '\')||\'undefined\'===typeof document.getElementById(\'' . $style_id . '\')){jQuery(\'head\').append(\'<style id="' . $style_id . '"></style>\');}';
 		}
 
@@ -115,48 +115,48 @@ 
 		);
 
 		// Loop through the js_vars and generate the script.
-		foreach ( $args['js_vars'] as $key => $js_var ) {
+		foreach ( $args[ 'js_vars' ] as $key => $js_var ) {
 
 			// Skip styles if "exclude" is defined and value is excluded.
-			if ( isset( $js_var['exclude'] ) ) {
-				$js_var['exclude'] = (array) $js_var['exclude'];
+			if ( isset( $js_var[ 'exclude' ] ) ) {
+				$js_var[ 'exclude' ] = (array) $js_var[ 'exclude' ];
 				$script           .= 'exclude=false;';
-				foreach ( $js_var['exclude'] as $exclussion ) {
+				foreach ( $js_var[ 'exclude' ] as $exclussion ) {
 					$script .= "if(newval=='{$exclussion}'||(''==='{$exclussion}'&&_.isObject(newval)&&_.isEmpty(newval))){exclude=true;}";
 				}
 			}
-			if ( isset( $js_var['element'] ) ) {
+			if ( isset( $js_var[ 'element' ] ) ) {
 
 				// Array to string.
-				if ( is_array( $js_var['element'] ) ) {
-					$js_var['element'] = implode( ',', $js_var['element'] );
+				if ( is_array( $js_var[ 'element' ] ) ) {
+					$js_var[ 'element' ] = implode( ',', $js_var[ 'element' ] );
 				}
 
 				// Replace single quotes with double quotes to avoid issues with the compiled JS.
-				$js_var['element'] = str_replace( '\'', '"', $js_var['element'] );
+				$js_var[ 'element' ] = str_replace( '\'', '"', $js_var[ 'element' ] );
 			}
-			if ( isset( $js_var['function'] ) && 'html' === $js_var['function'] ) {
+			if ( isset( $js_var[ 'function' ] ) && 'html' === $js_var[ 'function' ] ) {
 				$script .= $this->script_html_var( $js_var );
 				continue;
 			}
-			$js_var['index_key'] = $key;
+			$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   = '';
-		foreach ( $field['scripts'] as $script_array ) {
-			$combo_extra_script .= $script_array['script'];
-			$combo_css_script   .= ( 'css' !== $combo_css_script ) ? $script_array['css'] : '';
+		foreach ( $field[ 'scripts' ] as $script_array ) {
+			$combo_extra_script .= $script_array[ 'script' ];
+			$combo_css_script   .= ( 'css' !== $combo_css_script ) ? $script_array[ 'css' ] : '';
 		}
 		$text = ( 'css' === $combo_css_script ) ? 'css' : '\'' . $combo_css_script . '\'';
 
 		$script .= $combo_extra_script . "var cssContent={$text};";
-		if ( isset( $js_var['exclude'] ) ) {
+		if ( isset( $js_var[ 'exclude' ] ) ) {
 			$script .= 'if(true===exclude){cssContent="";}';
 		}
 		if ( $add_css ) {
@@ -174,18 +174,18 @@ 
 	 * @param array $args  The arguments for this js_var.
 	 */
 	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'] ) {
+		if ( isset( $args[ 'value_pattern' ] ) && '' !== $args[ 'value_pattern' ] ) {
 			$script .= $this->value_pattern_replacements( 'newval', $args );
 		}
 
-		if ( isset( $args['attr'] ) ) {
-			$script .= "jQuery('{$args['element']}').attr('{$args['attr']}',newval);";
+		if ( isset( $args[ 'attr' ] ) ) {
+			$script .= "jQuery('{$args[ 'element' ]}').attr('{$args[ 'attr' ]}',newval);";
 			return $script;
 		}
-		$script .= "jQuery('{$args['element']}').html(newval);";
+		$script .= "jQuery('{$args[ 'element' ]}').html(newval);";
 		return $script;
 	}
 
@@ -200,34 +200,34 @@ 
 		$script          = '';
 		$property_script = '';
 
-		$value_key        = 'newval' . $args['index_key'];
+		$value_key        = 'newval' . $args[ 'index_key' ];
 		$property_script .= $value_key . '=newval;';
 
 		$args = $this->get_args( $args );
 
 		// Apply callback to the value if a callback is defined.
-		if ( ! empty( $args['js_callback'] ) && is_array( $args['js_callback'] ) && isset( $args['js_callback'][0] ) && ! empty( $args['js_callback'][0] ) ) {
-			$script .= $value_key . '=' . $args['js_callback'][0] . '(' . $value_key . ',' . $args['js_callback'][1] . ');';
+		if ( ! empty( $args[ 'js_callback' ] ) && is_array( $args[ 'js_callback' ] ) && isset( $args[ 'js_callback' ][ 0 ] ) && ! empty( $args[ 'js_callback' ][ 0 ] ) ) {
+			$script .= $value_key . '=' . $args[ 'js_callback' ][ 0 ] . '(' . $value_key . ',' . $args[ 'js_callback' ][ 1 ] . ');';
 		}
 
 		// Apply the value_pattern.
-		if ( '' !== $args['value_pattern'] ) {
+		if ( '' !== $args[ 'value_pattern' ] ) {
 			$script .= $this->value_pattern_replacements( $value_key, $args );
 		}
 
 		// Tweak to add url() for background-images.
-		if ( 'background-image' === $args['property'] && ( ! isset( $args['value_pattern'] ) || false === strpos( $args['value_pattern'], 'gradient' ) ) ) {
+		if ( 'background-image' === $args[ 'property' ] && ( ! isset( $args[ 'value_pattern' ] ) || false === strpos( $args[ 'value_pattern' ], 'gradient' ) ) ) {
 			$script .= 'if(-1===' . $value_key . '.indexOf(\'url(\')){' . $value_key . '=\'url("\'+' . $value_key . '+\'")\';}';
 		}
 
 		// Apply prefix.
 		$value = $value_key;
-		if ( '' !== $args['prefix'] ) {
-			$value = "'" . $args['prefix'] . "'+" . $value_key;
+		if ( '' !== $args[ 'prefix' ] ) {
+			$value = "'" . $args[ 'prefix' ] . "'+" . $value_key;
 		}
-		$css = $args['element'] . '{' . $args['property'] . ':\'+' . $value . '+\'' . $args['units'] . $args['suffix'] . ';}';
-		if ( isset( $args['media_query'] ) ) {
-			$css = $args['media_query'] . '{' . $css . '}';
+		$css = $args[ 'element' ] . '{' . $args[ 'property' ] . ':\'+' . $value . '+\'' . $args[ 'units' ] . $args[ 'suffix' ] . ';}';
+		if ( isset( $args[ 'media_query' ] ) ) {
+			$css = $args[ 'media_query' ] . '{' . $css . '}';
 		}
 		return array(
 			'script' => $property_script . $script,
@@ -243,42 +243,42 @@ 
 	 * @param array $args  The arguments for this js_var.
 	 */
 	protected function script_var_array( $args ) {
-		$script          = ( 0 === $args['index_key'] ) ? 'css=\'\';' : '';
+		$script          = ( 0 === $args[ 'index_key' ] ) ? 'css=\'\';' : '';
 		$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'];
+		$value_key        = 'newval' . $args[ 'index_key' ];
 		$property_script .= $value_key . '=newval;';
 
 		$args = $this->get_args( $args );
 
 		// Apply callback to the value if a callback is defined.
-		if ( ! empty( $args['js_callback'] ) && is_array( $args['js_callback'] ) && isset( $args['js_callback'][0] ) && ! empty( $args['js_callback'][0] ) ) {
-			$script .= $value_key . '=' . $args['js_callback'][0] . '(' . $value_key . ',' . $args['js_callback'][1] . ');';
+		if ( ! empty( $args[ 'js_callback' ] ) && is_array( $args[ 'js_callback' ] ) && isset( $args[ 'js_callback' ][ 0 ] ) && ! empty( $args[ 'js_callback' ][ 0 ] ) ) {
+			$script .= $value_key . '=' . $args[ 'js_callback' ][ 0 ] . '(' . $value_key . ',' . $args[ 'js_callback' ][ 1 ] . ');';
 		}
 		$script .= '_.each(' . $value_key . ', function(subValue,subKey){';
 
 		// Apply the value_pattern.
-		if ( '' !== $args['value_pattern'] ) {
+		if ( '' !== $args[ 'value_pattern' ] ) {
 			$script .= $this->value_pattern_replacements( 'subValue', $args );
 		}
 
 		// Tweak to add url() for background-images.
 		if ( '' === $choice || 'background-image' === $choice ) {
-			$script .= 'if(\'background-image\'===\'' . $args['property'] . '\'||\'background-image\'===subKey){if(-1===subValue.indexOf(\'url(\')){subValue=\'url("\'+subValue+\'")\';}}';
+			$script .= 'if(\'background-image\'===\'' . $args[ 'property' ] . '\'||\'background-image\'===subKey){if(-1===subValue.indexOf(\'url(\')){subValue=\'url("\'+subValue+\'")\';}}';
 		}
 
 		// Apply prefix.
 		$value = $value_key;
-		if ( '' !== $args['prefix'] ) {
-			$value = '\'' . $args['prefix'] . '\'+subValue';
+		if ( '' !== $args[ 'prefix' ] ) {
+			$value = '\'' . $args[ 'prefix' ] . '\'+subValue';
 		}
 
 		// Mostly used for padding, margin & position properties.
 		$direction_script  = 'if(_.contains([\'top\',\'bottom\',\'left\',\'right\'],subKey)){';
-		$direction_script .= 'css+=\'' . $args['element'] . '{' . $args['property'] . '-\'+subKey+\':\'+subValue+\'' . $args['units'] . $args['suffix'] . ';}\';}';
+		$direction_script .= 'css+=\'' . $args[ 'element' ] . '{' . $args[ 'property' ] . '-\'+subKey+\':\'+subValue+\'' . $args[ 'units' ] . $args[ 'suffix' ] . ';}\';}';
 
 		// Allows us to apply this just for a specific choice in the array of the values.
 		if ( '' !== $choice ) {
@@ -287,18 +287,18 @@ 
 			// The script.
 			$script .= 'if(\'' . $choice . '\'===subKey){';
 			$script .= ( $choice_is_direction ) ? $direction_script . 'else{' : '';
-			$script .= 'css+=\'' . $args['element'] . '{' . $args['property'] . ':\'+subValue+\';}\';';
+			$script .= 'css+=\'' . $args[ 'element' ] . '{' . $args[ 'property' ] . ':\'+subValue+\';}\';';
 			$script .= ( $choice_is_direction ) ? '}' : '';
 			$script .= '}';
 		} else {
 
 			// This is where most object-based fields will go.
-			$script .= $direction_script . 'else{css+=\'' . $args['element'] . '{\'+subKey+\':\'+subValue+\'' . $args['units'] . $args['suffix'] . ';}\';}';
+			$script .= $direction_script . 'else{css+=\'' . $args[ 'element' ] . '{\'+subKey+\':\'+subValue+\'' . $args[ 'units' ] . $args[ 'suffix' ] . ';}\';}';
 		}
 		$script .= '});';
 
-		if ( isset( $args['media_query'] ) ) {
-			$script .= 'css=\'' . $args['media_query'] . '{\'+css+\'}\';';
+		if ( isset( $args[ 'media_query' ] ) ) {
+			$script .= 'css=\'' . $args[ 'media_query' ] . '{\'+css+\'}\';';
 		}
 
 		return array(
@@ -326,7 +326,7 @@ 
 		$webfont_loader = 'sc=\'a\';jQuery(\'head\').append(sc.replace(\'a\',\'<\')+\'script>if(!_.isUndefined(WebFont)&&fontFamily){WebFont.load({google:{families:["\'+fontFamily.replace( /\"/g, \'&quot;\' )+\':\'+variant+\':cyrillic,cyrillic-ext,devanagari,greek,greek-ext,khmer,latin,latin-ext,vietnamese,hebrew,arabic,bengali,gujarati,tamil,telugu,thai"]}});}\'+sc.replace(\'a\',\'<\')+\'/script>\');';
 
 		// Add the css.
-		$css_build_array  = array(
+		$css_build_array = array(
 			'font-family'     => 'fontFamily',
 			'font-size'       => 'fontSize',
 			'line-height'     => 'lineHeight',
@@ -339,41 +339,41 @@ 
 			'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'] ) {
+			if ( $choice_condition && $property !== $args[ 'choice' ] ) {
 				continue;
 			}
 			// Fixes https://github.com/aristath/kirki/issues/1436.
-			if ( ! isset( $field['default'] ) || (
-				( 'font-family' === $property && ! isset( $field['default']['font-family'] ) ) ||
-				( 'font-size' === $property && ! isset( $field['default']['font-size'] ) ) ||
-				( 'line-height' === $property && ! isset( $field['default']['line-height'] ) ) ||
-				( 'letter-spacing' === $property && ! isset( $field['default']['letter-spacing'] ) ) ||
-				( 'word-spacing' === $property && ! isset( $field['default']['word-spacing'] ) ) ||
-				( 'text-align' === $property && ! isset( $field['default']['text-align'] ) ) ||
-				( 'text-transform' === $property && ! isset( $field['default']['text-transform'] ) ) ||
-				( 'text-decoration' === $property && ! isset( $field['default']['text-decoration'] ) ) ||
-				( 'color' === $property && ! isset( $field['default']['color'] ) ) ||
-				( 'font-weight' === $property && ! isset( $field['default']['variant'] ) && ! isset( $field['default']['font-weight'] ) ) ||
-				( 'font-style' === $property && ! isset( $field['default']['variant'] ) && ! isset( $field['default']['font-style'] ) )
+			if ( ! isset( $field[ 'default' ] ) || (
+				( 'font-family' === $property && ! isset( $field[ 'default' ][ 'font-family' ] ) ) ||
+				( 'font-size' === $property && ! isset( $field[ 'default' ][ 'font-size' ] ) ) ||
+				( 'line-height' === $property && ! isset( $field[ 'default' ][ 'line-height' ] ) ) ||
+				( 'letter-spacing' === $property && ! isset( $field[ 'default' ][ 'letter-spacing' ] ) ) ||
+				( 'word-spacing' === $property && ! isset( $field[ 'default' ][ 'word-spacing' ] ) ) ||
+				( 'text-align' === $property && ! isset( $field[ 'default' ][ 'text-align' ] ) ) ||
+				( 'text-transform' === $property && ! isset( $field[ 'default' ][ 'text-transform' ] ) ) ||
+				( 'text-decoration' === $property && ! isset( $field[ 'default' ][ 'text-decoration' ] ) ) ||
+				( 'color' === $property && ! isset( $field[ 'default' ][ 'color' ] ) ) ||
+				( 'font-weight' === $property && ! isset( $field[ 'default' ][ 'variant' ] ) && ! isset( $field[ 'default' ][ 'font-weight' ] ) ) ||
+				( 'font-style' === $property && ! isset( $field[ 'default' ][ 'variant' ] ) && ! isset( $field[ 'default' ][ 'font-style' ] ) )
 				) ) {
 				continue;
 			}
-			$script .= ( $choice_condition && 'font-family' === $args['choice'] ) ? $webfont_loader : '';
+			$script .= ( $choice_condition && 'font-family' === $args[ 'choice' ] ) ? $webfont_loader : '';
 
-			if ( 'font-family' === $property || ( isset( $args['choice'] ) && 'font-family' === $args['choice'] ) ) {
+			if ( 'font-family' === $property || ( isset( $args[ 'choice' ] ) && 'font-family' === $args[ 'choice' ] ) ) {
 				$css .= 'fontFamilyCSS=fontFamily;if(0<fontFamily.indexOf(\' \')&&-1===fontFamily.indexOf(\'"\')){fontFamilyCSS=\'"\'+fontFamily+\'"\';}';
 				$var  = 'fontFamilyCSS';
 			}
-			$var  = ( ( empty( $args['prefix'] ) ) ? '' : '\'' . $args['prefix'] . '\'+' ) . $var . ( ( empty( $args['units'] ) ) ? '' : '+\'' . $args['units'] . '\'' ) . ( ( empty( $args['suffix'] ) ) ? '' : '+\'' . $args['suffix'] . '\'' );
-			$css .= 'css+=(\'\'!==' . $var . ')?\'' . $args['element'] . '\'+\'{' . $property . ':\'+' . $var . '+\';}\':\'\';';
+			$var  = ( ( empty( $args[ 'prefix' ] ) ) ? '' : '\'' . $args[ 'prefix' ] . '\'+' ) . $var . ( ( empty( $args[ 'units' ] ) ) ? '' : '+\'' . $args[ 'units' ] . '\'' ) . ( ( empty( $args[ 'suffix' ] ) ) ? '' : '+\'' . $args[ 'suffix' ] . '\'' );
+			$css .= 'css+=(\'\'!==' . $var . ')?\'' . $args[ 'element' ] . '\'+\'{' . $property . ':\'+' . $var . '+\';}\':\'\';';
 		}
 
 		$script .= $css;
-		if ( isset( $args['media_query'] ) ) {
-			$script .= 'css=\'' . $args['media_query'] . '{\'+css+\'}\';';
+		if ( isset( $args[ 'media_query' ] ) ) {
+			$script .= 'css=\'' . $args[ 'media_query' ] . '{\'+css+\'}\';';
 		}
 		return array(
 			'script' => $script,
@@ -391,8 +391,8 @@ 
 	protected function script_var_image( $args ) {
 		$return = $this->script_var( $args );
 		return array(
-			'script' => 'newval=(!_.isUndefined(newval.url))?newval.url:newval;' . $return['script'],
-			'css'    => $return['css'],
+			'script' => 'newval=(!_.isUndefined(newval.url))?newval.url:newval;' . $return[ 'script' ],
+			'css'    => $return[ 'css' ],
 		);
 	}
 
@@ -406,8 +406,8 @@ 
 	 */
 	private function before_script( $args ) {
 		$script = '';
-		if ( isset( $args['type'] ) ) {
-			switch ( $args['type'] ) {
+		if ( isset( $args[ 'type' ] ) ) {
+			switch ( $args[ 'type' ] ) {
 				case 'kirki-typography':
 					$script .= 'fontFamily=(_.isUndefined(newval[\'font-family\']))?\'\':newval[\'font-family\'];variant=(_.isUndefined(newval.variant))?\'400\':newval.variant;fontSize=(_.isUndefined(newval[\'font-size\']))?\'\':newval[\'font-size\'];lineHeight=(_.isUndefined(newval[\'line-height\']))?\'\':newval[\'line-height\'];letterSpacing=(_.isUndefined(newval[\'letter-spacing\']))?\'\':newval[\'letter-spacing\'];wordSpacing=(_.isUndefined(newval[\'word-spacing\']))?\'\':newval[\'word-spacing\'];textAlign=(_.isUndefined(newval[\'text-align\']))?\'\':newval[\'text-align\'];textTransform=(_.isUndefined(newval[\'text-transform\']))?\'\':newval[\'text-transform\'];textDecoration=(_.isUndefined(newval[\'text-decoration\']))?\'\':newval[\'text-decoration\'];color=(_.isUndefined(newval.color))?\'\':newval.color;fw=(!_.isString(newval.variant))?\'400\':newval.variant.match(/\d/g);fontWeight=(!_.isObject(fw))?400:fw.join(\'\');fontStyle=(variant&&-1!==variant.indexOf(\'italic\'))?\'italic\':\'normal\';css=\'\';';
 					break;
@@ -440,17 +440,17 @@ 
 		);
 
 		// Element should be a string.
-		if ( is_array( $args['element'] ) ) {
-			$args['element'] = implode( ',', $args['element'] );
+		if ( is_array( $args[ 'element' ] ) ) {
+			$args[ 'element' ] = implode( ',', $args[ 'element' ] );
 		}
 
 		// Make sure arguments that are passed-on to callbacks are strings.
-		if ( is_array( $args['js_callback'] ) && isset( $args['js_callback'][1] ) && is_array( $args['js_callback'][1] ) ) {
-			$args['js_callback'][1] = wp_json_encode( $args['js_callback'][1] );
+		if ( is_array( $args[ 'js_callback' ] ) && isset( $args[ 'js_callback' ][ 1 ] ) && is_array( $args[ 'js_callback' ][ 1 ] ) ) {
+			$args[ 'js_callback' ][ 1 ] = wp_json_encode( $args[ 'js_callback' ][ 1 ] );
 		}
 
-		if ( ! isset( $args['js_callback'][1] ) ) {
-			$args['js_callback'][1] = '';
+		if ( ! isset( $args[ 'js_callback' ][ 1 ] ) ) {
+			$args[ 'js_callback' ][ 1 ] = '';
 		}
 		return $args;
 	}
@@ -467,15 +467,15 @@ 
 	private function value_pattern_replacements( $value, $js_vars ) {
 		$script = '';
 		$alias  = $value;
-		if ( ! isset( $js_vars['value_pattern'] ) ) {
+		if ( ! isset( $js_vars[ 'value_pattern' ] ) ) {
 			return $value;
 		}
-		$value = $js_vars['value_pattern'];
-		if ( isset( $js_vars['pattern_replace'] ) ) {
+		$value = $js_vars[ 'value_pattern' ];
+		if ( isset( $js_vars[ 'pattern_replace' ] ) ) {
 			$script .= 'settings=window.wp.customize.get();';
-			foreach ( $js_vars['pattern_replace'] as $search => $replace ) {
+			foreach ( $js_vars[ 'pattern_replace' ] as $search => $replace ) {
 				$replace = '\'+settings["' . $replace . '"]+\'';
-				$value   = str_replace( $search, $replace, $js_vars['value_pattern'] );
+				$value   = str_replace( $search, $replace, $js_vars[ 'value_pattern' ] );
 				$value   = trim( $value, '+' );
 			}
 		}
@@ -494,7 +494,7 @@ 
 	 * @return string|array A callable function or method.
 	 */
 	protected function get_callback( $args ) {
-		switch ( $args['type'] ) {
+		switch ( $args[ 'type' ] ) {
 			case 'kirki-background':
 			case 'kirki-dimensions':
 			case 'kirki-multicolor':

controls/php/class-kirki-control-code.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 			parent::to_json();
 
 			// Required.
-			$this->json['required'] = $this->required;
+			$this->json[ 'required' ] = $this->required;
 		}
 	}
 }

class-kirki-autoload.php

Spacing +9 added lines, -9 removed lines

@@ -89,25 +89,25 @@ 
 		$name_parts = explode( '_', str_replace( 'Kirki_', '', $class_name ) );
 
 		// Handle modules loading.
-		if ( isset( $name_parts[0] ) && 'Modules' === $name_parts[0] ) {
+		if ( isset( $name_parts[ 0 ] ) && 'Modules' === $name_parts[ 0 ] ) {
 			$path    = dirname( __FILE__ ) . '/modules/';
 			$path   .= strtolower( str_replace( '_', '-', str_replace( 'Kirki_Modules_', '', $class_name ) ) ) . '/';
-			$paths[] = $path . $filename;
+			$paths[ ] = $path . $filename;
 		} elseif ( 'Kirki_Fonts' === $class_name ) {
-			$paths[] = dirname( __FILE__ ) . '/modules/webfonts/class-kirki-fonts.php';
+			$paths[ ] = dirname( __FILE__ ) . '/modules/webfonts/class-kirki-fonts.php';
 		}
 
-		if ( isset( $name_parts[0] ) ) {
+		if ( isset( $name_parts[ 0 ] ) ) {
 
 			// Handle controls loading.
-			if ( 'Control' === $name_parts[0] || 'Settings' === $name_parts[0] ) {
+			if ( 'Control' === $name_parts[ 0 ] || 'Settings' === $name_parts[ 0 ] ) {
 				$path    = dirname( __FILE__ ) . '/controls/php/';
-				$paths[] = $path . $filename;
+				$paths[ ] = $path . $filename;
 			}
 		}
 
-		$paths[] = dirname( __FILE__ ) . '/core/' . $filename;
-		$paths[] = dirname( __FILE__ ) . '/lib/' . $filename;
+		$paths[ ] = dirname( __FILE__ ) . '/core/' . $filename;
+		$paths[ ] = dirname( __FILE__ ) . '/lib/' . $filename;
 
 		$substr   = str_replace( 'Kirki_', '', $class_name );
 		$exploded = explode( '_', $substr );
@@ -115,7 +115,7 @@ 
 
 		$previous_path = '';
 		for ( $i = 0; $i < $levels; $i++ ) {
-			$paths[]        = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
+			$paths[ ]        = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
 			$previous_path .= strtolower( $exploded[ $i ] ) . '/';
 		}
 		return $paths;