aristath / kirki

field/class-kirki-field-image.php

Spacing +11 added lines, -11 removed lines

@@ -60,14 +60,14 @@ 
 		if ( ! is_array( $this->choices ) ) {
 			$this->choices = (array) $this->choices;
 		}
-		if ( ! isset( $this->choices['save_as'] ) ) {
-			$this->choices['save_as'] = 'url';
+		if ( ! isset( $this->choices[ 'save_as' ] ) ) {
+			$this->choices[ 'save_as' ] = 'url';
 		}
-		if ( ! isset( $this->choices['labels'] ) ) {
-			$this->choices['labels'] = array();
+		if ( ! isset( $this->choices[ 'labels' ] ) ) {
+			$this->choices[ 'labels' ] = array();
 		}
 		$this->set_button_labels();
-		$this->choices['labels'] = wp_parse_args( $this->choices['labels'], $this->button_labels );
+		$this->choices[ 'labels' ] = wp_parse_args( $this->choices[ 'labels' ], $this->button_labels );
 	}
 
 	/**
@@ -93,15 +93,15 @@ 
 	 */
 	public function sanitize( $value ) {
 
-		if ( isset( $this->choices['save_as'] ) && 'array' === $this->choices['save_as'] ) {
+		if ( isset( $this->choices[ 'save_as' ] ) && 'array' === $this->choices[ 'save_as' ] ) {
 			return array(
-				'id'     => ( isset( $value['id'] ) && '' !== $value['id'] ) ? (int) $value['id'] : '',
-				'url'    => ( isset( $value['url'] ) && '' !== $value['url'] ) ? esc_url_raw( $value['url'] ) : '',
-				'width'  => ( isset( $value['width'] ) && '' !== $value['width'] ) ? (int) $value['width'] : '',
-				'height' => ( isset( $value['height'] ) && '' !== $value['height'] ) ? (int) $value['height'] : '',
+				'id'     => ( isset( $value[ 'id' ] ) && '' !== $value[ 'id' ] ) ? (int) $value[ 'id' ] : '',
+				'url'    => ( isset( $value[ 'url' ] ) && '' !== $value[ 'url' ] ) ? esc_url_raw( $value[ 'url' ] ) : '',
+				'width'  => ( isset( $value[ 'width' ] ) && '' !== $value[ 'width' ] ) ? (int) $value[ 'width' ] : '',
+				'height' => ( isset( $value[ 'height' ] ) && '' !== $value[ 'height' ] ) ? (int) $value[ 'height' ] : '',
 			);
 		}
-		if ( isset( $this->choices['save_as'] ) && 'id' === $this->choices['save_as'] ) {
+		if ( isset( $this->choices[ 'save_as' ] ) && 'id' === $this->choices[ 'save_as' ] ) {
 			return absint( $value );
 		}
 		if ( is_string( $value ) ) {

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

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['required'] = $this->required;
+		$this->json[ 'required' ] = $this->required;
 	}
 }

controls/php/class-kirki-control-cropped-image.php

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['required'] = $this->required;
+		$this->json[ 'required' ] = $this->required;
 	}
 }

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

Spacing +12 added lines, -12 removed lines

@@ -35,23 +35,23 @@ 
 	public function to_json() {
 		parent::to_json();
 
-		if ( is_array( $this->json['value'] ) ) {
-			foreach ( array_keys( $this->json['value'] ) as $key ) {
-				if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][ $key ] ) ) {
-					unset( $this->json['value'][ $key ] );
+		if ( is_array( $this->json[ 'value' ] ) ) {
+			foreach ( array_keys( $this->json[ 'value' ] ) as $key ) {
+				if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json[ 'default' ][ $key ] ) ) {
+					unset( $this->json[ 'value' ][ $key ] );
 				}
 				// Fix for https://wordpress.org/support/topic/white-font-after-updateing-to-3-0-16.
-				if ( ! isset( $this->json['default'][ $key ] ) ) {
-					unset( $this->json['value'][ $key ] );
+				if ( ! isset( $this->json[ 'default' ][ $key ] ) ) {
+					unset( $this->json[ 'value' ][ $key ] );
 				}
 				// Fix for https://github.com/aristath/kirki/issues/1405.
-				if ( isset( $this->json['default'][ $key ] ) && false === $this->json['default'][ $key ] ) {
-					unset( $this->json['value'][ $key ] );
+				if ( isset( $this->json[ 'default' ][ $key ] ) && false === $this->json[ 'default' ][ $key ] ) {
+					unset( $this->json[ 'value' ][ $key ] );
 				}
 			}
 		}
 
-		$this->json['show_variants'] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
+		$this->json[ 'show_variants' ] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
 	}
 
 	/**
@@ -238,12 +238,12 @@ 
 		$final_variants = array();
 		foreach ( $variants as $variant ) {
 			if ( is_string( $variant ) ) {
-				$final_variants[] = array(
+				$final_variants[ ] = array(
 					'id'    => $variant,
 					'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant,
 				);
-			} elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) {
-				$final_variants[] = $variant;
+			} elseif ( is_array( $variant ) && isset( $variant[ 'id' ] ) && isset( $variant[ 'label' ] ) ) {
+				$final_variants[ ] = $variant;
 			}
 		}
 		return $final_variants;

modules/webfonts/class-kirki-fonts.php

Spacing +5 added lines, -5 removed lines

@@ -137,11 +137,11 @@
 
 		$google_fonts = array();
 		if ( is_array( $fonts ) ) {
-			foreach ( $fonts['items'] as $font ) {
-				$google_fonts[ $font['family'] ] = array(
-					'label'    => $font['family'],
-					'variants' => $font['variants'],
-					'category' => $font['category'],
+			foreach ( $fonts[ 'items' ] as $font ) {
+				$google_fonts[ $font[ 'family' ] ] = array(
+					'label'    => $font[ 'family' ],
+					'variants' => $font[ 'variants' ],
+					'category' => $font[ 'category' ],
 				);
 			}
 		}

modules/webfonts/class-kirki-fonts-google.php

Spacing +22 added lines, -22 removed lines

@@ -59,7 +59,7 @@ 
 		$config = apply_filters( 'kirki_config', array() );
 
 		// If we have set $config['disable_google_fonts'] to true then do not proceed any further.
-		if ( isset( $config['disable_google_fonts'] ) && true === $config['disable_google_fonts'] ) {
+		if ( isset( $config[ 'disable_google_fonts' ] ) && true === $config[ 'disable_google_fonts' ] ) {
 			return;
 		}
 
@@ -95,53 +95,53 @@ 
 	public function generate_google_font( $args ) {
 
 		// Process typography fields.
-		if ( isset( $args['type'] ) && 'kirki-typography' === $args['type'] ) {
+		if ( isset( $args[ 'type' ] ) && 'kirki-typography' === $args[ 'type' ] ) {
 
 			// Get the value.
 			$value = Kirki_Values::get_sanitized_field_value( $args );
 
 			// If we don't have a font-family then we can skip this.
-			if ( ! isset( $value['font-family'] ) ) {
+			if ( ! isset( $value[ 'font-family' ] ) ) {
 				return;
 			}
 
 			// If not a google-font, then we can skip this.
-			if ( ! Kirki_Fonts::is_google_font( $value['font-family'] ) ) {
+			if ( ! Kirki_Fonts::is_google_font( $value[ 'font-family' ] ) ) {
 				return;
 			}
 
 			// Set a default value for variants.
-			if ( ! isset( $value['variant'] ) ) {
-				$value['variant'] = 'regular';
+			if ( ! isset( $value[ 'variant' ] ) ) {
+				$value[ 'variant' ] = 'regular';
 			}
 
 			// Add the requested google-font.
-			if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) {
-				$this->fonts[ $value['font-family'] ] = array();
+			if ( ! isset( $this->fonts[ $value[ 'font-family' ] ] ) ) {
+				$this->fonts[ $value[ 'font-family' ] ] = array();
 			}
-			if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) {
-				$this->fonts[ $value['font-family'] ][] = $value['variant'];
+			if ( ! in_array( $value[ 'variant' ], $this->fonts[ $value[ 'font-family' ] ], true ) ) {
+				$this->fonts[ $value[ 'font-family' ] ][ ] = $value[ 'variant' ];
 			}
 			// Are we force-loading all variants?
 			if ( true === self::$force_load_all_variants ) {
 				$all_variants               = Kirki_Fonts::get_all_variants();
-				$args['choices']['variant'] = array_keys( $all_variants );
+				$args[ 'choices' ][ 'variant' ] = array_keys( $all_variants );
 			}
 
-			if ( ! empty( $args['choices']['variant'] ) && is_array( $args['choices']['variant'] ) ) {
-				foreach ( $args['choices']['variant'] as $extra_variant ) {
-					$this->fonts[ $value['font-family'] ][] = $extra_variant;
+			if ( ! empty( $args[ 'choices' ][ 'variant' ] ) && is_array( $args[ 'choices' ][ 'variant' ] ) ) {
+				foreach ( $args[ 'choices' ][ 'variant' ] as $extra_variant ) {
+					$this->fonts[ $value[ 'font-family' ] ][ ] = $extra_variant;
 				}
 			}
 			return;
 		}
 
 		// Process non-typography fields.
-		if ( isset( $args['output'] ) && is_array( $args['output'] ) ) {
-			foreach ( $args['output'] as $output ) {
+		if ( isset( $args[ 'output' ] ) && is_array( $args[ 'output' ] ) ) {
+			foreach ( $args[ 'output' ] as $output ) {
 
 				// If we don't have a typography-related output argument we can skip this.
-				if ( ! isset( $output['property'] ) || ! in_array( $output['property'], array( 'font-family', 'font-weight' ), true ) ) {
+				if ( ! isset( $output[ 'property' ] ) || ! in_array( $output[ 'property' ], array( 'font-family', 'font-weight' ), true ) ) {
 					continue;
 				}
 
@@ -149,14 +149,14 @@ 
 				$value = Kirki_Values::get_sanitized_field_value( $args );
 
 				if ( is_string( $value ) ) {
-					if ( 'font-family' === $output['property'] ) {
+					if ( 'font-family' === $output[ 'property' ] ) {
 						if ( ! array_key_exists( $value, $this->fonts ) ) {
 							$this->fonts[ $value ] = array();
 						}
-					} elseif ( 'font-weight' === $output['property'] ) {
+					} elseif ( 'font-weight' === $output[ 'property' ] ) {
 						foreach ( $this->fonts as $font => $variants ) {
 							if ( ! in_array( $value, $variants, true ) ) {
-								$this->fonts[ $font ][] = $value;
+								$this->fonts[ $font ][ ] = $value;
 							}
 						}
 					}
@@ -188,8 +188,8 @@ 
 
 			// Get all valid font variants for this font.
 			$font_variants = array();
-			if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
-				$font_variants = $this->google_fonts[ $font ]['variants'];
+			if ( isset( $this->google_fonts[ $font ][ 'variants' ] ) ) {
+				$font_variants = $this->google_fonts[ $font ][ 'variants' ];
 			}
 			foreach ( $variants as $variant ) {
 

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 );
 			}
 		}
@@ -92,11 +92,11 @@ 
 	 */
 	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;
 			}
 		}
@@ -105,7 +105,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>\');}';
 		}
 
@@ -116,46 +116,46 @@ 
 			'scripts' => array(),
 		);
 		// 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 @@ 
 	 */
 	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,
@@ -244,60 +244,60 @@ 
 	 */
 	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 ) {
 			$choice_is_direction = ( false !== strpos( $choice, 'top' ) || false !== strpos( $choice, 'bottom' ) || false !== strpos( $choice, 'left' ) || false !== strpos( $choice, 'right' ) );
 			// 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' ],
 		);
 	}
 
@@ -408,8 +408,8 @@ 
 
 		$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;
@@ -442,17 +442,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;
 
@@ -470,15 +470,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, '+' );
 			}
 		}
@@ -498,7 +498,7 @@ 
 	 */
 	protected function get_callback( $args ) {
 
-		switch ( $args['type'] ) {
+		switch ( $args[ 'type' ] ) {
 			case 'kirki-background':
 			case 'kirki-dimensions':
 			case 'kirki-multicolor':

core/class-kirki.php

Spacing +20 added lines, -20 removed lines

@@ -144,7 +144,7 @@ 
 
 		$config                             = Kirki_Config::get_instance( $config_id, $args );
 		$config_args                        = $config->get_config();
-		self::$config[ $config_args['id'] ] = $config_args;
+		self::$config[ $config_args[ 'id' ] ] = $config_args;
 	}
 
 	/**
@@ -157,13 +157,13 @@ 
 	 */
 	public static function add_panel( $id = '', $args = array() ) {
 
-		$args['id']          = esc_attr( $id );
-		$args['description'] = ( isset( $args['description'] ) ) ? $args['description'] : '';
-		$args['priority']    = ( isset( $args['priority'] ) ) ? absint( $args['priority'] ) : 10;
-		$args['type']        = ( isset( $args['type'] ) ) ? $args['type'] : 'default';
-		$args['type']        = 'kirki-' . $args['type'];
+		$args[ 'id' ]          = esc_attr( $id );
+		$args[ 'description' ] = ( isset( $args[ 'description' ] ) ) ? $args[ 'description' ] : '';
+		$args[ 'priority' ]    = ( isset( $args[ 'priority' ] ) ) ? absint( $args[ 'priority' ] ) : 10;
+		$args[ 'type' ]        = ( isset( $args[ 'type' ] ) ) ? $args[ 'type' ] : 'default';
+		$args[ 'type' ]        = 'kirki-' . $args[ 'type' ];
 
-		self::$panels[ $args['id'] ] = $args;
+		self::$panels[ $args[ 'id' ] ] = $args;
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public static function remove_panel( $id = '' ) {
 		if ( ! in_array( $id, self::$panels_to_remove, true ) ) {
-			self::$panels_to_remove[] = $id;
+			self::$panels_to_remove[ ] = $id;
 		}
 	}
 
@@ -190,14 +190,14 @@ 
 	 */
 	public static function add_section( $id, $args ) {
 
-		$args['id']          = esc_attr( $id );
-		$args['panel']       = ( isset( $args['panel'] ) ) ? esc_attr( $args['panel'] ) : '';
-		$args['description'] = ( isset( $args['description'] ) ) ? $args['description'] : '';
-		$args['priority']    = ( isset( $args['priority'] ) ) ? absint( $args['priority'] ) : 10;
-		$args['type']        = ( isset( $args['type'] ) ) ? $args['type'] : 'default';
-		$args['type']        = 'kirki-' . $args['type'];
+		$args[ 'id' ]          = esc_attr( $id );
+		$args[ 'panel' ]       = ( isset( $args[ 'panel' ] ) ) ? esc_attr( $args[ 'panel' ] ) : '';
+		$args[ 'description' ] = ( isset( $args[ 'description' ] ) ) ? $args[ 'description' ] : '';
+		$args[ 'priority' ]    = ( isset( $args[ 'priority' ] ) ) ? absint( $args[ 'priority' ] ) : 10;
+		$args[ 'type' ]        = ( isset( $args[ 'type' ] ) ) ? $args[ 'type' ] : 'default';
+		$args[ 'type' ]        = 'kirki-' . $args[ 'type' ];
 
-		self::$sections[ $args['id'] ] = $args;
+		self::$sections[ $args[ 'id' ] ] = $args;
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 */
 	public static function remove_section( $id = '' ) {
 		if ( ! in_array( $id, self::$sections_to_remove, true ) ) {
-			self::$sections_to_remove[] = $id;
+			self::$sections_to_remove[ ] = $id;
 		}
 	}
 
@@ -229,16 +229,16 @@ 
 		}
 
 		// Early exit if 'type' is not defined.
-		if ( ! isset( $args['type'] ) ) {
+		if ( ! isset( $args[ 'type' ] ) ) {
 			return;
 		}
 
 		// If the field is font-awesome, enqueue the icons on the frontend.
-		if ( class_exists( 'Kirki_Modules_CSS' ) && ( 'fontawesome' === $args['type'] || 'kirki-fontawesome' === $args['type'] ) ) {
+		if ( class_exists( 'Kirki_Modules_CSS' ) && ( 'fontawesome' === $args[ 'type' ] || 'kirki-fontawesome' === $args[ 'type' ] ) ) {
 			Kirki_Modules_CSS::add_fontawesome_script();
 		}
 
-		$str       = str_replace( array( '-', '_' ), ' ', $args['type'] );
+		$str       = str_replace( array( '-', '_' ), ' ', $args[ 'type' ] );
 		$classname = 'Kirki_Field_' . str_replace( ' ', '_', ucwords( $str ) );
 		if ( class_exists( $classname ) ) {
 			new $classname( $config_id, $args );
@@ -266,7 +266,7 @@ 
 	 */
 	public static function remove_control( $id ) {
 		if ( ! in_array( $id, self::$controls_to_remove, true ) ) {
-			self::$controls_to_remove[] = $id;
+			self::$controls_to_remove[ ] = $id;
 		}
 	}
 

modules/css/field/class-kirki-output-field-background.php

Spacing +3 added lines, -3 removed lines

@@ -36,12 +36,12 @@
 		foreach ( array( 'background-image', 'background-color', 'background-repeat', 'background-position', 'background-size', 'background-attachment' ) as $property ) {
 
 			// See https://github.com/aristath/kirki/issues/1808.
-			if ( 'background-color' === $property && ( ! isset( $value['background-image'] ) || empty( $value['background-image'] ) ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = $output['prefix'] . $this->process_property_value( $property, $value[ $property ] ) . $output['suffix'];
+			if ( 'background-color' === $property && ( ! isset( $value[ 'background-image' ] ) || empty( $value[ 'background-image' ] ) ) ) {
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'background' ] = $output[ 'prefix' ] . $this->process_property_value( $property, $value[ $property ] ) . $output[ 'suffix' ];
 			}
 
 			if ( isset( $value[ $property ] ) && ! empty( $value[ $property ] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $this->process_property_value( $property, $value[ $property ] ) . $output['suffix'];
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $property ] = $output[ 'prefix' ] . $this->process_property_value( $property, $value[ $property ] ) . $output[ 'suffix' ];
 			}
 		}
 	}