aristath / kirki

modules/customizer-styling/class-kirki-modules-customizer-styling.php

Spacing +8 added lines, -8 removed lines

@@ -68,10 +68,10 @@ 
 	public function custom_css() {
 
 		$config = apply_filters( 'kirki_config', array() );
-		if ( ! isset( $config['color_accent'] ) && ! isset( $config['color_back'] ) ) {
+		if ( ! isset( $config[ 'color_accent' ] ) && ! isset( $config[ 'color_back' ] ) ) {
 			return;
 		}
-		$back     = isset( $config['color_back'] ) ? $config['color_back'] : false;
+		$back = isset( $config[ 'color_back' ] ) ? $config[ 'color_back' ] : false;
 
 		$text_on_back              = '';
 		$border_on_back            = '';
@@ -93,7 +93,7 @@ 
 			$hover_on_back  = ( 90 < $back_obj->lightness ) ? $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode );
 			$arrows_on_back = ( 50 > $back_obj->lightness ) ? $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode );
 		}
-		$accent     = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false;
+		$accent = ( isset( $config[ 'color_accent' ] ) ) ? $config[ 'color_accent' ] : false;
 		if ( $accent ) {
 			$accent_obj                = ariColor::newColor( $accent );
 			$text_on_accent            = ( 60 > $accent_obj->lightness ) ? $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode );
@@ -405,18 +405,18 @@ 
 			color: #444 !important;
 		}
 
-		<?php if ( isset( $config['width'] ) ) : ?>
+		<?php if ( isset( $config[ 'width' ] ) ) : ?>
 			.wp-full-overlay-sidebar {
-				width: <?php echo esc_attr( $config['width'] ); // WPCS: XSS ok. ?>;
+				width: <?php echo esc_attr( $config[ 'width' ] ); // WPCS: XSS ok. ?>;
 			}
 			.expanded .wp-full-overlay-footer {
-				width: <?php echo esc_attr( $config['width'] ); // WPCS: XSS ok. ?>;
+				width: <?php echo esc_attr( $config[ 'width' ] ); // WPCS: XSS ok. ?>;
 			}
 			.wp-full-overlay.expanded {
-				margin-left: <?php echo esc_attr( $config['width'] ); // WPCS: XSS ok. ?>;
+				margin-left: <?php echo esc_attr( $config[ 'width' ] ); // WPCS: XSS ok. ?>;
 			}
 			.wp-full-overlay.collapsed .wp-full-overlay-sidebar {
-				margin-left: -<?php echo esc_attr( $config['width'] ); // WPCS: XSS ok. ?>;
+				margin-left: -<?php echo esc_attr( $config[ 'width' ] ); // WPCS: XSS ok. ?>;
 			}
 		<?php endif; ?>
 		</style>

modules/loading/class-kirki-modules-loading.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 		}
 		// Allow disabling the custom loader using the kirki_config filter.
 		$config = apply_filters( 'kirki_config', array() );
-		if ( isset( $config['disable_loader'] ) && true === $config['disable_loader'] ) {
+		if ( isset( $config[ 'disable_loader' ] ) && true === $config[ 'disable_loader' ] ) {
 			return;
 		}
 		// Add the "loading" icon.

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/webfonts/class-kirki-modules-webfonts.php

Spacing +6 added lines, -6 removed lines

@@ -169,18 +169,18 @@
 	 */
 	public function loop_fields( $config_id ) {
 		foreach ( Kirki::$fields as $field ) {
-			if ( isset( $field['kirki_config'] ) && $config_id !== $field['kirki_config'] ) {
+			if ( isset( $field[ 'kirki_config' ] ) && $config_id !== $field[ 'kirki_config' ] ) {
 				continue;
 			}
 			if ( true === apply_filters( "kirki_{$config_id}_webfonts_skip_hidden", true ) ) {
 				// Only continue if field dependencies are met.
-				if ( ! empty( $field['required'] ) ) {
+				if ( ! empty( $field[ 'required' ] ) ) {
 					$valid = true;
 
-					foreach ( $field['required'] as $requirement ) {
-						if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) {
-							$controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] );
-							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) {
+					foreach ( $field[ 'required' ] as $requirement ) {
+						if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) {
+							$controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] );
+							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) {
 								$valid = false;
 							}
 						}

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-modules-css.php

Spacing +12 added lines, -12 removed lines

@@ -119,12 +119,12 @@ 
 
 		$config   = apply_filters( 'kirki_config', array() );
 		$priority = 999;
-		if ( isset( $config['styles_priority'] ) ) {
-			$priority = absint( $config['styles_priority'] );
+		if ( isset( $config[ 'styles_priority' ] ) ) {
+			$priority = absint( $config[ 'styles_priority' ] );
 		}
 
 		// Allow completely disabling Kirki CSS output.
-		if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config['disable_output'] ) && true === $config['disable_output'] ) ) {
+		if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config[ 'disable_output' ] ) && true === $config[ 'disable_output' ] ) ) {
 			return;
 		}
 
@@ -155,7 +155,7 @@ 
 
 		// If we are in the customizer, load CSS using inline-styles.
 		// If we are in the frontend AND self::$ajax is true, then load dynamic CSS using AJAX.
-		if ( ( true === self::$ajax ) || ( isset( $config['inline_css'] ) && false === $config['inline_css'] ) ) {
+		if ( ( true === self::$ajax ) || ( isset( $config[ 'inline_css' ] ) && false === $config[ 'inline_css' ] ) ) {
 			add_action( 'wp_enqueue_scripts', array( $this, 'frontend_styles' ), $priority );
 			add_action( 'wp_ajax_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) );
 			add_action( 'wp_ajax_nopriv_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) );
@@ -186,7 +186,7 @@ 
 		$configs = Kirki::$config;
 		if ( ! $this->processed ) {
 			foreach ( $configs as $config_id => $args ) {
-				if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) {
+				if ( isset( $args[ 'disable_output' ] ) && true === $args[ 'disable_output' ] ) {
 					continue;
 				}
 				$styles = self::loop_controls( $config_id );
@@ -243,19 +243,19 @@ 
 		foreach ( $fields as $field ) {
 
 			// Only process fields that belong to $config_id.
-			if ( $config_id !== $field['kirki_config'] ) {
+			if ( $config_id !== $field[ 'kirki_config' ] ) {
 				continue;
 			}
 
 			if ( true === apply_filters( "kirki_{$config_id}_css_skip_hidden", true ) ) {
 				// Only continue if field dependencies are met.
-				if ( ! empty( $field['required'] ) ) {
+				if ( ! empty( $field[ 'required' ] ) ) {
 					$valid = true;
 
-					foreach ( $field['required'] as $requirement ) {
-						if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) {
-							$controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] );
-							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) {
+					foreach ( $field[ 'required' ] as $requirement ) {
+						if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) {
+							$controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] );
+							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) {
 								$valid = false;
 							}
 						}
@@ -268,7 +268,7 @@ 
 			}
 
 			// Only continue if $field['output'] is set.
-			if ( isset( $field['output'] ) && ! empty( $field['output'] ) ) {
+			if ( isset( $field[ 'output' ] ) && ! empty( $field[ 'output' ] ) ) {
 				$css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
 
 				// Add the globals.

modules/tooltips/class-kirki-modules-tooltips.php

Spacing +3 added lines, -3 removed lines

@@ -76,13 +76,13 @@
 
 		$fields = Kirki::$fields;
 		foreach ( $fields as $field ) {
-			if ( isset( $field['tooltip'] ) && ! empty( $field['tooltip'] ) ) {
+			if ( isset( $field[ 'tooltip' ] ) && ! empty( $field[ 'tooltip' ] ) ) {
 				// Get the control ID and properly format it for the tooltips
-				$id = str_replace( '[', '-', str_replace( ']', '', $field['settings'] ) );
+				$id = str_replace( '[', '-', str_replace( ']', '', $field[ 'settings' ] ) );
 				// Add the tooltips content.
 				$this->tooltips_content[ $id ] = array(
 					'id'      => $id,
-					'content' => wp_kses_post( $field['tooltip'] ),
+					'content' => wp_kses_post( $field[ 'tooltip' ] ),
 				);
 			}
 		}

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

Spacing +14 added lines, -14 removed lines

@@ -35,25 +35,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();
 	}
 
 	/**
@@ -250,12 +250,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;

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 ); // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning
-						$args['fields'][ $key ]['dropdown'] = $dropdown;
+						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args[ 'fields' ][ $key ][ 'id' ] ) . '"' . $this->get_link(), $dropdown ); // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning
+						$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';
 			}
 		}
 	}