aristath / kirki

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

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@
 	public function to_json() {
 		parent::to_json();
 
-		$this->json['palette']          = $this->palette;
-		$this->json['choices']['alpha'] = ( isset( $this->choices['alpha'] ) && $this->choices['alpha'] ) ? 'true' : 'false';
-		$this->json['mode']             = $this->mode;
+		$this->json[ 'palette' ]          = $this->palette;
+		$this->json[ 'choices' ][ 'alpha' ] = ( isset( $this->choices[ 'alpha' ] ) && $this->choices[ 'alpha' ] ) ? 'true' : 'false';
+		$this->json[ 'mode' ]             = $this->mode;
 	}
 }

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

Spacing +28 added lines, -28 removed lines

@@ -76,28 +76,28 @@ 
 
 		if ( empty( $this->button_label ) ) {
 			/* translators: %s represents the label of the row. */
-			$this->button_label = sprintf( esc_attr__( 'Add new %s', 'kirki' ), $this->row_label['value'] );
+			$this->button_label = sprintf( esc_attr__( 'Add new %s', 'kirki' ), $this->row_label[ 'value' ] );
 		}
 
-		if ( empty( $args['fields'] ) || ! is_array( $args['fields'] ) ) {
-			$args['fields'] = array();
+		if ( empty( $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
+			$args[ 'fields' ] = array();
 		}
 
 		// An array to store keys of fields that need to be filtered.
 		$media_fields_to_filter = array();
 
-		foreach ( $args['fields'] as $key => $value ) {
-			if ( ! isset( $value['default'] ) ) {
-				$args['fields'][ $key ]['default'] = '';
+		foreach ( $args[ 'fields' ] as $key => $value ) {
+			if ( ! isset( $value[ 'default' ] ) ) {
+				$args[ 'fields' ][ $key ][ 'default' ] = '';
 			}
-			if ( ! isset( $value['label'] ) ) {
-				$args['fields'][ $key ]['label'] = '';
+			if ( ! isset( $value[ 'label' ] ) ) {
+				$args[ 'fields' ][ $key ][ 'label' ] = '';
 			}
-			$args['fields'][ $key ]['id'] = $key;
+			$args[ 'fields' ][ $key ][ 'id' ] = $key;
 
 			// We check if the filed is an uploaded media ( image , file, video, etc.. ).
-			if ( isset( $value['type'] ) ) {
-				switch ( $value['type'] ) {
+			if ( isset( $value[ 'type' ] ) ) {
+				switch ( $value[ 'type' ] ) {
 					case 'image':
 					case 'cropped_image':
 					case 'upload':
@@ -117,14 +117,14 @@ 
 							)
 						);
 						// Hackily add in the data link parameter.
-						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][ $key ]['id'] ) . '"' . $this->get_link(), $dropdown );
-						$args['fields'][ $key ]['dropdown'] = $dropdown;
+						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args[ 'fields' ][ $key ][ 'id' ] ) . '"' . $this->get_link(), $dropdown );
+						$args[ 'fields' ][ $key ][ 'dropdown' ] = $dropdown;
 						break;
 				}
 			}
 		} // End foreach().
 
-		$this->fields = $args['fields'];
+		$this->fields = $args[ 'fields' ];
 
 		// Now we are going to filter the fields.
 		// First we create a copy of the value that would be used otherwise.
@@ -184,14 +184,14 @@ 
 
 		$fields = $this->fields;
 
-		$this->json['fields']    = $fields;
-		$this->json['row_label'] = $this->row_label;
+		$this->json[ 'fields' ]    = $fields;
+		$this->json[ 'row_label' ] = $this->row_label;
 
 		// If filtered_value has been set and is not empty we use it instead of the actual value.
 		if ( is_array( $this->filtered_value ) && ! empty( $this->filtered_value ) ) {
-			$this->json['value'] = $this->filtered_value;
+			$this->json[ 'value' ] = $this->filtered_value;
 		}
-		$this->json['value'] = apply_filters( "kirki/controls/repeater/value/{$this->id}", $this->json['value'] );
+		$this->json[ 'value' ] = apply_filters( "kirki/controls/repeater/value/{$this->id}", $this->json[ 'value' ] );
 	}
 
 	/**
@@ -214,10 +214,10 @@ 
 
 		<ul class="repeater-fields"></ul>
 
-		<?php if ( isset( $this->choices['limit'] ) ) : ?>
+		<?php if ( isset( $this->choices[ 'limit' ] ) ) : ?>
 			<?php // @codingStandardsIgnoreLine ?>
 			<?php /* translators: %s represents the number of rows we're limiting the repeater to allow. */ ?>
-			<p class="limit"><?php printf( esc_attr__( 'Limit: %s rows', 'kirki' ), esc_html( $this->choices['limit'] ) ); ?></p>
+			<p class="limit"><?php printf( esc_attr__( 'Limit: %s rows', 'kirki' ), esc_html( $this->choices[ 'limit' ] ) ); ?></p>
 		<?php endif; ?>
 		<button class="button-secondary repeater-add"><?php echo esc_html( $this->button_label ); ?></button>
 
@@ -447,24 +447,24 @@ 
 	protected function row_label( $args ) {
 
 		// Validating args for row labels.
-		if ( isset( $args['row_label'] ) && is_array( $args['row_label'] ) && ! empty( $args['row_label'] ) ) {
+		if ( isset( $args[ 'row_label' ] ) && is_array( $args[ 'row_label' ] ) && ! empty( $args[ 'row_label' ] ) ) {
 
 			// Validating row label type.
-			if ( isset( $args['row_label']['type'] ) && ( 'text' === $args['row_label']['type'] || 'field' === $args['row_label']['type'] ) ) {
-				$this->row_label['type'] = $args['row_label']['type'];
+			if ( isset( $args[ 'row_label' ][ 'type' ] ) && ( 'text' === $args[ 'row_label' ][ 'type' ] || 'field' === $args[ 'row_label' ][ 'type' ] ) ) {
+				$this->row_label[ 'type' ] = $args[ 'row_label' ][ 'type' ];
 			}
 
 			// Validating row label type.
-			if ( isset( $args['row_label']['value'] ) && ! empty( $args['row_label']['value'] ) ) {
-				$this->row_label['value'] = esc_attr( $args['row_label']['value'] );
+			if ( isset( $args[ 'row_label' ][ 'value' ] ) && ! empty( $args[ 'row_label' ][ 'value' ] ) ) {
+				$this->row_label[ 'value' ] = esc_attr( $args[ 'row_label' ][ 'value' ] );
 			}
 
 			// Validating row label field.
-			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][ esc_attr( $args['row_label']['field'] ) ] ) ) {
-				$this->row_label['field'] = esc_attr( $args['row_label']['field'] );
+			if ( isset( $args[ 'row_label' ][ 'field' ] ) && ! empty( $args[ 'row_label' ][ 'field' ] ) && isset( $args[ 'fields' ][ esc_attr( $args[ 'row_label' ][ 'field' ] ) ] ) ) {
+				$this->row_label[ 'field' ] = esc_attr( $args[ 'row_label' ][ 'field' ] );
 			} else {
 				// If from field is not set correctly, making sure standard is set as the type.
-				$this->row_label['type'] = 'text';
+				$this->row_label[ 'type' ] = 'text';
 			}
 		}
 	}

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

Spacing +30 added lines, -30 removed lines

@@ -39,7 +39,7 @@ 
 		if ( Kirki_Util::get_wp_version() >= 4.9 ) {
 			return;
 		}
-		$custom_fonts_array  = ( isset( $this->choices['fonts'] ) && ( isset( $this->choices['fonts']['google'] ) || isset( $this->choices['fonts']['standard'] ) ) && ( ! empty( $this->choices['fonts']['google'] ) || ! empty( $this->choices['fonts']['standard'] ) ) );
+		$custom_fonts_array  = ( isset( $this->choices[ 'fonts' ] ) && ( isset( $this->choices[ 'fonts' ][ 'google' ] ) || isset( $this->choices[ 'fonts' ][ 'standard' ] ) ) && ( ! empty( $this->choices[ 'fonts' ][ 'google' ] ) || ! empty( $this->choices[ 'fonts' ][ 'standard' ] ) ) );
 		$localize_script_var = ( $custom_fonts_array ) ? 'kirkiFonts' . $this->id : 'kirkiAllFonts';
 		wp_localize_script(
 			'kirki-script', $localize_script_var, array(
@@ -57,25 +57,25 @@ 
 	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_subsets']  = ( true === Kirki_Fonts_Google::$force_load_all_subsets ) ? false : true;
-		$this->json['languages']     = Kirki_Fonts::get_google_font_subsets();
+		$this->json[ 'show_variants' ] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
+		$this->json[ 'show_subsets' ]  = ( true === Kirki_Fonts_Google::$force_load_all_subsets ) ? false : true;
+		$this->json[ 'languages' ]     = Kirki_Fonts::get_google_font_subsets();
 	}
 
 	/**
@@ -282,12 +282,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;
@@ -305,8 +305,8 @@ 
 		$standard_fonts = Kirki_Fonts::get_standard_fonts();
 
 		$std_user_keys = array();
-		if ( isset( $this->choices['fonts'] ) && isset( $this->choices['fonts']['standard'] ) ) {
-			$std_user_keys = $this->choices['fonts']['standard'];
+		if ( isset( $this->choices[ 'fonts' ] ) && isset( $this->choices[ 'fonts' ][ 'standard' ] ) ) {
+			$std_user_keys = $this->choices[ 'fonts' ][ 'standard' ];
 		}
 
 		$standard_fonts_final = array();
@@ -319,15 +319,15 @@ 
 			)
 		);
 		foreach ( $standard_fonts as $key => $font ) {
-			if ( ( ! empty( $std_user_keys ) && ! in_array( $key, $std_user_keys, true ) ) || ! isset( $font['stack'] ) || ! isset( $font['label'] ) ) {
+			if ( ( ! empty( $std_user_keys ) && ! in_array( $key, $std_user_keys, true ) ) || ! isset( $font[ 'stack' ] ) || ! isset( $font[ 'label' ] ) ) {
 				continue;
 			}
-			$standard_fonts_final[] = array(
-				'family'      => $font['stack'],
-				'label'       => $font['label'],
+			$standard_fonts_final[ ] = array(
+				'family'      => $font[ 'stack' ],
+				'label'       => $font[ 'label' ],
 				'subsets'     => array(),
 				'is_standard' => true,
-				'variants'    => ( isset( $font['variants'] ) ) ? $this->format_variants_array( $font['variants'] ) : $default_variants,
+				'variants'    => ( isset( $font[ 'variants' ] ) ) ? $this->format_variants_array( $font[ 'variants' ] ) : $default_variants,
 			);
 		}
 		return $standard_fonts_final;
@@ -347,8 +347,8 @@ 
 		$all_subsets  = Kirki_Fonts::get_google_font_subsets();
 
 		$gf_user_keys = array();
-		if ( isset( $this->choices['fonts'] ) && isset( $this->choices['fonts']['google'] ) ) {
-			$gf_user_keys = $this->choices['fonts']['google'];
+		if ( isset( $this->choices[ 'fonts' ] ) && isset( $this->choices[ 'fonts' ][ 'google' ] ) ) {
+			$gf_user_keys = $this->choices[ 'fonts' ][ 'google' ];
 		}
 
 		$google_fonts_final = array();
@@ -357,15 +357,15 @@ 
 				continue;
 			}
 
-			$label    = ( isset( $args['label'] ) ) ? $args['label'] : $family;
-			$variants = ( isset( $args['variants'] ) ) ? $args['variants'] : array( 'regular', '700' );
-			$subsets  = ( isset( $args['subsets'] ) ) ? $args['subsets'] : array();
+			$label    = ( isset( $args[ 'label' ] ) ) ? $args[ 'label' ] : $family;
+			$variants = ( isset( $args[ 'variants' ] ) ) ? $args[ 'variants' ] : array( 'regular', '700' );
+			$subsets  = ( isset( $args[ 'subsets' ] ) ) ? $args[ 'subsets' ] : array();
 
 			$available_variants = array();
 			if ( is_array( $variants ) ) {
 				foreach ( $variants as $variant ) {
 					if ( array_key_exists( $variant, $all_variants ) ) {
-						$available_variants[] = array(
+						$available_variants[ ] = array(
 							'id'    => $variant,
 							'label' => $all_variants[ $variant ],
 						);
@@ -377,7 +377,7 @@ 
 			if ( is_array( $subsets ) ) {
 				foreach ( $subsets as $subset ) {
 					if ( array_key_exists( $subset, $all_subsets ) ) {
-						$available_subsets[] = array(
+						$available_subsets[ ] = array(
 							'id'    => $subset,
 							'label' => $all_subsets[ $subset ],
 						);
@@ -385,7 +385,7 @@ 
 				}
 			}
 
-			$google_fonts_final[] = array(
+			$google_fonts_final[ ] = array(
 				'family'   => $family,
 				'label'    => $label,
 				'variants' => $available_variants,

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

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@
 	public function to_json() {
 		parent::to_json();
 
-		$this->json['multiple']    = $this->multiple;
-		$this->json['placeholder'] = $this->placeholder;
+		$this->json[ 'multiple' ]    = $this->multiple;
+		$this->json[ 'placeholder' ] = $this->placeholder;
 	}
 }

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

Spacing +33 added lines, -33 removed lines

@@ -76,7 +76,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;
 		}
 
@@ -113,64 +113,64 @@ 
 	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';
 			}
-			if ( isset( $value['subsets'] ) ) {
+			if ( isset( $value[ 'subsets' ] ) ) {
 
 				// Add the subset directly to the array of subsets in the Kirki_GoogleFonts_Manager object.
 				// Subsets must be applied to ALL fonts if possible.
-				if ( ! is_array( $value['subsets'] ) ) {
-					$this->subsets[] = $value['subsets'];
+				if ( ! is_array( $value[ 'subsets' ] ) ) {
+					$this->subsets[ ] = $value[ 'subsets' ];
 				} else {
-					foreach ( $value['subsets'] as $subset ) {
-						$this->subsets[] = $subset;
+					foreach ( $value[ 'subsets' ] as $subset ) {
+						$this->subsets[ ] = $subset;
 					}
 				}
 			}
 
 			// 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;
 				}
 			}
 		} else {
 
 			// 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', 'font-subset', 'subset', 'subsets' ), true ) ) {
+					if ( ! isset( $output[ 'property' ] ) || ! in_array( $output[ 'property' ], array( 'font-family', 'font-weight', 'font-subset', 'subset', 'subsets' ), true ) ) {
 						continue;
 					}
 
@@ -178,25 +178,25 @@ 
 					$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;
 								}
 							}
-						} elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) {
+						} elseif ( 'font-subset' === $output[ 'property' ] || 'subset' === $output[ 'property' ] || 'subsets' === $output[ 'property' ] ) {
 							if ( ! is_array( $value ) ) {
 								if ( ! in_array( $value, $this->subsets, true ) ) {
-									$this->subsets[] = $value;
+									$this->subsets[ ] = $value;
 								}
 							} else {
 								foreach ( $value as $subset ) {
 									if ( ! in_array( $subset, $this->subsets, true ) ) {
-										$this->subsets[] = $subset;
+										$this->subsets[ ] = $subset;
 									}
 								}
 							}
@@ -231,8 +231,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 ) {
 
@@ -247,10 +247,10 @@ 
 
 			// Check if the selected subsets exist, even in one of the selected fonts.
 			// If they don't, then they have to be removed otherwise the link will fail.
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
+			if ( isset( $this->google_fonts[ $font ][ 'subsets' ] ) ) {
 				foreach ( $this->subsets as $subset ) {
-					if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) {
-						$valid_subsets[] = $subset;
+					if ( in_array( $subset, $this->google_fonts[ $font ][ 'subsets' ], true ) ) {
+						$valid_subsets[ ] = $subset;
 					}
 				}
 			}

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+subsetsString+\'"]}});}\'+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;subsets=(_.isUndefined(newval.subsets))?[]:newval.subsets;subsetsString=(_.isObject(newval.subsets))?\':\'+newval.subsets.join(\',\'):\'\';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=(-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':

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

Spacing +17 added lines, -17 removed lines

@@ -23,10 +23,10 @@ 
 	 */
 	protected function process_output( $output, $value ) {
 
-		$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
-		$output['element']     = ( isset( $output['element'] ) ) ? $output['element'] : 'body';
-		$output['prefix']      = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';
-		$output['suffix']      = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
+		$output[ 'media_query' ] = ( isset( $output[ 'media_query' ] ) ) ? $output[ 'media_query' ] : 'global';
+		$output[ 'element' ]     = ( isset( $output[ 'element' ] ) ) ? $output[ 'element' ] : 'body';
+		$output[ 'prefix' ]      = ( isset( $output[ 'prefix' ] ) ) ? $output[ 'prefix' ] : '';
+		$output[ 'suffix' ]      = ( isset( $output[ 'suffix' ] ) ) ? $output[ 'suffix' ] : '';
 
 		$value = Kirki_Field_Typography::sanitize( $value );
 
@@ -48,7 +48,7 @@ 
 		foreach ( $properties as $property ) {
 
 			// Early exit if the value is not in the defaults.
-			if ( ! isset( $this->field['default'][ $property ] ) ) {
+			if ( ! isset( $this->field[ 'default' ][ $property ] ) ) {
 				continue;
 			}
 
@@ -58,37 +58,37 @@ 
 			}
 
 			// Early exit if we use "choice" but not for this property.
-			if ( isset( $output['choice'] ) && $output['choice'] !== $property ) {
+			if ( isset( $output[ 'choice' ] ) && $output[ 'choice' ] !== $property ) {
 				continue;
 			}
 
 			// Take care of variants.
-			if ( 'variant' === $property && isset( $value['variant'] ) && ! empty( $value['variant'] ) ) {
+			if ( 'variant' === $property && isset( $value[ 'variant' ] ) && ! empty( $value[ 'variant' ] ) ) {
 
 				// Get the font_weight.
-				$font_weight = str_replace( 'italic', '', $value['variant'] );
+				$font_weight = str_replace( 'italic', '', $value[ 'variant' ] );
 				$font_weight = ( in_array( $font_weight, array( '', 'regular' ), true ) ) ? '400' : $font_weight;
 
 				// Is this italic?
-				$is_italic = ( false !== strpos( $value['variant'], 'italic' ) );
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $font_weight;
+				$is_italic = ( false !== strpos( $value[ 'variant' ], 'italic' ) );
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'font-weight' ] = $font_weight;
 				if ( $is_italic ) {
-					$this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = 'italic';
+					$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'font-style' ] = 'italic';
 				}
 				continue;
 			}
 
 			$property_value = $this->process_property_value( $property, $value[ $property ] );
 			if ( 'font-family' === $property ) {
-				$value['font-backup'] = ( isset( $value['font-backup'] ) ) ? $value['font-backup'] : '';
+				$value[ 'font-backup' ] = ( isset( $value[ 'font-backup' ] ) ) ? $value[ 'font-backup' ] : '';
 				$property_value       = $this->process_property_value( $property, array(
-					$value['font-family'],
-					$value['font-backup'],
+					$value[ 'font-family' ],
+					$value[ 'font-backup' ],
 				) );
 			}
-			$property       = ( isset( $output['choice'] ) && isset( $output['property'] ) ) ? $output['property'] : $property;
-			$property_value = ( is_array( $property_value ) && isset( $property_value[0] ) ) ? $property_value[0] : $property_value;
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $property_value . $output['suffix'];
+			$property       = ( isset( $output[ 'choice' ] ) && isset( $output[ 'property' ] ) ) ? $output[ 'property' ] : $property;
+			$property_value = ( is_array( $property_value ) && isset( $property_value[ 0 ] ) ) ? $property_value[ 0 ] : $property_value;
+			$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $property ] = $output[ 'prefix' ] . $property_value . $output[ 'suffix' ];
 		}
 	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -146,10 +146,10 @@ 
 	public static function css( $field ) {
 
 		// Set class vars.
-		self::$settings   = $field['settings'];
-		self::$callback   = $field['sanitize_callback'];
-		self::$field_type = $field['type'];
-		self::$output     = $field['output'];
+		self::$settings   = $field[ 'settings' ];
+		self::$callback   = $field[ 'sanitize_callback' ];
+		self::$field_type = $field[ 'type' ];
+		self::$output     = $field[ 'output' ];
 		if ( ! is_array( self::$output ) ) {
 			self::$output = array(
 				array(
@@ -164,7 +164,7 @@ 
 
 		// Find the class that will handle the outpout for this field.
 		$classname            = 'Kirki_Output';
-		$field_output_classes = apply_filters( "kirki/{$field['kirki_config']}/output/control-classnames", array(
+		$field_output_classes = apply_filters( "kirki/{$field[ 'kirki_config' ]}/output/control-classnames", array(
 			'kirki-background' => 'Kirki_Output_Field_Background',
 			'kirki-dimensions' => 'Kirki_Output_Field_Dimensions',
 			'kirki-image'      => 'Kirki_Output_Field_Image',
@@ -174,7 +174,7 @@ 
 		if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
 			$classname = $field_output_classes[ self::$field_type ];
 		}
-		$obj = new $classname( $field['kirki_config'], self::$output, self::$value, $field );
+		$obj = new $classname( $field[ 'kirki_config' ], self::$output, self::$value, $field );
 		return $obj->get_styles();
 
 	}

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 );
@@ -217,7 +217,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;
 						}
 					}
@@ -238,10 +238,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 );
@@ -259,13 +259,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
@@ -274,14 +274,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' ];
 	}
 
 	/**
@@ -319,8 +319,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

@@ -217,7 +217,8 @@
 						}
 						// 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;
 						}
 					}