aristath / kirki

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

Spacing +9 added lines, -9 removed lines

@@ -172,7 +172,7 @@ 
 			'kirki-multicolor'  => 'Kirki_Output_Field_Multicolor',
 		) );
 		if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
-			$classname = $field_output_classes[ self::$field_type ];
+			$classname = $field_output_classes[self::$field_type];
 		}
 		$obj = new $classname( $field['kirki_config'], self::$output, self::$value );
 		return $obj->get_styles();
@@ -247,10 +247,10 @@ 
 							'transition',
 							'transition-property',
 						), true ) ) {
-							unset( $css[ $media_query ][ $element ][ $property ] );
-							$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
-							$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
-							$css[ $media_query ][ $element ][ $property ]              = $value;
+							unset( $css[$media_query][$element][$property] );
+							$css[$media_query][$element]['-webkit-' . $property] = $value;
+							$css[$media_query][$element]['-moz-' . $property]    = $value;
+							$css[$media_query][$element][$property]              = $value;
 						}
 
 						// Add -ms-* and -o-*.
@@ -260,10 +260,10 @@ 
 							'transition',
 							'transition-property',
 						), true ) ) {
-							unset( $css[ $media_query ][ $element ][ $property ] );
-							$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
-							$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
-							$css[ $media_query ][ $element ][ $property ]          = $value;
+							unset( $css[$media_query][$element][$property] );
+							$css[$media_query][$element]['-ms-' . $property] = $value;
+							$css[$media_query][$element]['-o-' . $property]  = $value;
+							$css[$media_query][$element][$property]          = $value;
 						}
 					}
 				}

l10n.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
 
 			// If the theme's textdomain is loaded, assign the theme's translations
 			// to the "kirki" textdomain.
-			if ( isset( $l10n[ $theme_textdomain ] ) ) {
+			if ( isset( $l10n[$theme_textdomain] ) ) {
 				// @codingStandardsIgnoreLine
-				$l10n[ $domain ] = $l10n[ $theme_textdomain ];
+				$l10n[$domain] = $l10n[$theme_textdomain];
 			}
 
 			// Always override.  We only want the theme to handle translations.

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

Spacing +3 added lines, -3 removed lines

@@ -79,14 +79,14 @@
 		if ( is_array( $this->choices ) ) {
 			foreach ( $this->choices as $choice => $value ) {
 				if ( 'labels' !== $choice && true === $value ) {
-					$this->json['choices'][ $choice ] = true;
+					$this->json['choices'][$choice] = true;
 				}
 			}
 		}
 		if ( is_array( $this->json['default'] ) ) {
 			foreach ( $this->json['default'] as $key => $value ) {
-				if ( isset( $this->json['choices'][ $key ] ) && ! isset( $this->json['value'][ $key ] ) ) {
-					$this->json['value'][ $key ] = $value;
+				if ( isset( $this->json['choices'][$key] ) && ! isset( $this->json['value'][$key] ) ) {
+					$this->json['value'][$key] = $value;
 				}
 			}
 		}

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

Spacing +7 added lines, -7 removed lines

@@ -111,12 +111,12 @@ 
 
 		foreach ( $args['fields'] as $key => $value ) {
 			if ( ! isset( $value['default'] ) ) {
-				$args['fields'][ $key ]['default'] = '';
+				$args['fields'][$key]['default'] = '';
 			}
 			if ( ! isset( $value['label'] ) ) {
-				$args['fields'][ $key ]['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'] ) ) {
@@ -125,7 +125,7 @@ 
 					case 'cropped_image':
 					case 'upload':
 						// We add it to the list of fields that need some extra filtering/processing.
-						$media_fields_to_filter[ $key ] = true;
+						$media_fields_to_filter[$key] = true;
 						break;
 
 					case 'dropdown-pages':
@@ -140,8 +140,8 @@ 
 							)
 						);
 						// 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;
 				}
 			}
@@ -581,7 +581,7 @@ 
 			}
 
 			// Validating row label field.
-			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][ 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.

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

Spacing +11 added lines, -22 removed lines

@@ -75,43 +75,32 @@
 		$back_obj = ( $back ) ? ariColor::newColor( $back ) : false;
 		if ( $back ) {
 			$text_on_back = ( 60 > $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode );
 			$border_on_back = ( 80 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode );
 			$back_on_back = ( 90 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode );
 			$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 );
+				$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 );
+				$back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode );
 			$back_disabled_obj = ( 35 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 30 );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 30 );
 		}
 		$accent     = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false;
 		$accent_obj = ( $accent ) ? ariColor::newColor( $accent ) : false;
 		if ( $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 );
+				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode );
 			$border_on_accent = ( 50 < $accent_obj->lightness ) ?
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) :
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode );
+				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode );
 			$accent_disabled_obj = ( 35 < $accent_obj->lightness ) ?
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) :
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 );
+				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 );
 			$accent_disabled = $accent_disabled_obj->toCSS( $accent_disabled_obj->mode );
 			$text_on_accent_disabled = ( 60 > $accent_disabled_obj->lightness ) ?
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) :
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode );
+				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode );
 			$border_on_accent_disabled = ( 50 < $accent_disabled_obj->lightness ) ?
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) :
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode );
+				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode );
 		}
 
 		if ( $back ) {

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

Spacing +3 added lines, -3 removed lines

@@ -44,14 +44,14 @@ 
 		);
 
 		foreach ( $properties as $property ) {
-			if ( ! isset( $value[ $property ] ) || ! $value[ $property ] ) {
+			if ( ! isset( $value[$property] ) || ! $value[$property] ) {
 				continue;
 			}
 			if ( isset( $output['choice'] ) && $output['choice'] !== $property ) {
 				continue;
 			}
 
-			$property_value = $this->process_property_value( $property, $value[ $property ] );
+			$property_value = $this->process_property_value( $property, $value[$property] );
 			if ( 'font-family' === $property ) {
 				$value['font-backup'] = ( isset( $value['font-backup'] ) ) ? $value['font-backup'] : '';
 				$property_value = $this->process_property_value( $property, array(
@@ -60,7 +60,7 @@ 
 				) );
 			}
 			$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'];
+			$this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $property_value . $output['suffix'];
 		}
 	}
 }

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

Spacing +14 added lines, -14 removed lines

@@ -141,11 +141,11 @@ 
 			}
 
 			// 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 ) {
@@ -155,7 +155,7 @@ 
 
 			if ( ! empty( $args['choices']['variant'] ) ) {
 				foreach ( $args['choices']['variant'] as $extra_variant ) {
-					$this->fonts[ $value['font-family'] ][] = $extra_variant;
+					$this->fonts[$value['font-family']][] = $extra_variant;
 				}
 			}
 		} else {
@@ -175,12 +175,12 @@ 
 					if ( is_string( $value ) ) {
 						if ( 'font-family' === $output['property'] ) {
 							if ( ! array_key_exists( $value, $this->fonts ) ) {
-								$this->fonts[ $value ] = array();
+								$this->fonts[$value] = array();
 							}
 						} 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'] ) {
@@ -220,31 +220,31 @@ 
 			// Determine if this is indeed a google font or not.
 			// If it's not, then just remove it from the array.
 			if ( ! array_key_exists( $font, $this->google_fonts ) ) {
-				unset( $this->fonts[ $font ] );
+				unset( $this->fonts[$font] );
 				continue;
 			}
 
 			// 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 ) {
 
 				// If this is not a valid variant for this font-family
 				// then unset it and move on to the next one.
 				if ( ! in_array( $variant, $font_variants, true ) ) {
-					$variant_key = array_search( $variant, $this->fonts[ $font ], true );
-					unset( $this->fonts[ $font ][ $variant_key ] );
+					$variant_key = array_search( $variant, $this->fonts[$font], true );
+					unset( $this->fonts[$font][$variant_key] );
 					continue;
 				}
 			}
 
 			// 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 ) ) {
+					if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) {
 						$valid_subsets[] = $subset;
 					}
 				}

modules/webfonts/class-kirki-modules-webfonts-link.php

Spacing +2 added lines, -2 removed lines

@@ -122,8 +122,8 @@
 		// Are we force-loading all subsets?
 		if ( true === Kirki_Fonts_Google::$force_load_all_subsets ) {
 
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
-				foreach ( $this->google_fonts[ $font ]['subsets'] as $subset ) {
+			if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
+				foreach ( $this->google_fonts[$font]['subsets'] as $subset ) {
 					$this->subsets[] = $subset;
 				}
 			}

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

Spacing +5 added lines, -5 removed lines

@@ -176,8 +176,8 @@ 
 
 		// Fix for https://github.com/aristath/kirki/issues/1405.
 		foreach ( $this->json['value'] as $key => $val ) {
-			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;
@@ -361,7 +361,7 @@ 
 			if ( is_string( $variant ) ) {
 				$final_variants[] = array(
 					'id'    => $variant,
-					'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant,
+					'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant,
 				);
 			} elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) {
 				$final_variants[] = $variant;
@@ -436,7 +436,7 @@ 
 					if ( array_key_exists( $variant, $all_variants ) ) {
 						$available_variants[] = array(
 							'id' => $variant,
-							'label' => $all_variants[ $variant ],
+							'label' => $all_variants[$variant],
 						);
 					}
 				}
@@ -448,7 +448,7 @@ 
 					if ( array_key_exists( $subset, $all_subsets ) ) {
 						$available_subsets[] = array(
 							'id' => $subset,
-							'label' => $all_subsets[ $subset ],
+							'label' => $all_subsets[$subset],
 						);
 					}
 				}