aristath / kirki

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'] ) && is_array( $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;
 					}
 				}

field/class-kirki-field-typography.php

Spacing +3 added lines, -3 removed lines

@@ -205,7 +205,7 @@ 
 				case 'letter-spacing':
 				case 'word-spacing':
 				case 'line-height':
-					$value[ $key ] = Kirki_Sanitize_Values::css_dimension( $val );
+					$value[$key] = Kirki_Sanitize_Values::css_dimension( $val );
 					break;
 				case 'text-align':
 					if ( ! in_array( $val, array( 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) {
@@ -224,8 +224,8 @@ 
 		} // End foreach().
 
 		foreach ( array( 'font-size', 'letter-spacing', 'word-spacing', 'line-height', 'text-align', 'color' ) as $property ) {
-			if ( is_array( self::$static_default ) && ! isset( self::$static_default[ $property ] ) ) {
-				unset( $value[ $property ] );
+			if ( is_array( self::$static_default ) && ! isset( self::$static_default[$property] ) ) {
+				unset( $value[$property] );
 			}
 		}
 		return $value;

kirki.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 // Instamtiate the modules.
 $kirki->modules = new Kirki_Modules();
 
-Kirki::$url  = str_replace( wp_normalize_path( WP_CONTENT_DIR ), WP_CONTENT_URL, Kirki::$path );
+Kirki::$url = str_replace( wp_normalize_path( WP_CONTENT_DIR ), WP_CONTENT_URL, Kirki::$path );
 
 // Instantiate 2ndary classes.
 new Kirki_L10n();

controls/php/class-kirki-settings-repeater-setting.php

Spacing +2 added lines, -2 removed lines

@@ -67,9 +67,9 @@
 
 		// Make sure that every row is an array, not an object.
 		foreach ( $sanitized as $key => $_value ) {
-			$sanitized[ $key ] = (array) $_value;
+			$sanitized[$key] = (array) $_value;
 			if ( empty( $_value ) ) {
-				unset( $sanitized[ $key ] );
+				unset( $sanitized[$key] );
 			}
 		}
 

controls/php/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.

controls/php/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;
 				}
 			}
 		}

class-kirki-autoload.php

Spacing +6 added lines, -6 removed lines

@@ -54,8 +54,8 @@ 
 		}
 
 		// Check if we've got it cached and ready.
-		if ( isset( $this->cached_paths[ $class_name ] ) && file_exists( $this->cached_paths[ $class_name ] ) ) {
-			include_once $this->cached_paths[ $class_name ];
+		if ( isset( $this->cached_paths[$class_name] ) && file_exists( $this->cached_paths[$class_name] ) ) {
+			include_once $this->cached_paths[$class_name];
 			return;
 		}
 
@@ -64,7 +64,7 @@ 
 		foreach ( $paths as $path ) {
 			$path = wp_normalize_path( $path );
 			if ( file_exists( $path ) ) {
-				$this->cached_paths[ $class_name ] = $path;
+				$this->cached_paths[$class_name] = $path;
 				include_once $path;
 				return;
 			}
@@ -99,7 +99,7 @@ 
 
 			// Handle controls loading.
 			if ( 'Control' === $name_parts[0] || 'Settings' === $name_parts[0] ) {
-				$path  = dirname( __FILE__ ) . '/controls/php/';
+				$path = dirname( __FILE__ ) . '/controls/php/';
 
 				$paths[] = $path . $filename;
 			}
@@ -114,8 +114,8 @@ 
 
 		$previous_path = '';
 		for ( $i = 0; $i < $levels; $i++ ) {
-			$paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
-			$previous_path .= strtolower( $exploded[ $i ] ) . '/';
+			$paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[$i] ) . '/' . $filename;
+			$previous_path .= strtolower( $exploded[$i] ) . '/';
 		}
 		return $paths;
 	}

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

Spacing +7 added lines, -7 removed lines

@@ -147,15 +147,15 @@ 
 		}
 
 		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 ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][$key] ) ) {
+				unset( $this->json['value'][$key] );
 			}
 		}
 
 		// Fix for https://github.com/aristath/kirki/issues/1405.
 		foreach ( array_keys( $this->json['value'] ) as $key ) {
-			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;
@@ -338,7 +338,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;
@@ -419,7 +419,7 @@ 
 					if ( array_key_exists( $variant, $all_variants ) ) {
 						$available_variants[] = array(
 							'id' => $variant,
-							'label' => $all_variants[ $variant ],
+							'label' => $all_variants[$variant],
 						);
 					}
 				}
@@ -431,7 +431,7 @@ 
 					if ( array_key_exists( $subset, $all_subsets ) ) {
 						$available_subsets[] = array(
 							'id' => $subset,
-							'label' => $all_subsets[ $subset ],
+							'label' => $all_subsets[$subset],
 						);
 					}
 				}