aristath / kirki

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],
 						);
 					}
 				}

core/class-kirki-modules.php

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
 			if ( class_exists( $module_class ) ) {
 				// Use this syntax instead of $module_class::get_instance()
 				// for PHP 5.2 compatibility.
-				self::$active_modules[ $key ] = call_user_func( array( $module_class, 'get_instance' ) );
+				self::$active_modules[$key] = call_user_func( array( $module_class, 'get_instance' ) );
 			}
 		}
 	}
@@ -120,7 +120,7 @@ 
 
 		$key = array_search( $module, self::$modules, true );
 		if ( false !== $key ) {
-			unset( self::$modules[ $key ] );
+			unset( self::$modules[$key] );
 		}
 	}
 

core/class-kirki-field.php

Spacing +14 added lines, -14 removed lines

@@ -331,14 +331,14 @@ 
 
 		// Get the config arguments, and merge them with the defaults.
 		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
-		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) {
-			$config_defaults = Kirki::$config[ $this->kirki_config ];
+		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) {
+			$config_defaults = Kirki::$config[$this->kirki_config];
 		}
 		$config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array();
 		foreach ( $config_defaults as $key => $value ) {
-			if ( isset( $defaults[ $key ] ) ) {
-				if ( ! empty( $value ) && $value != $defaults[ $key ] ) {
-					$defaults[ $key ] = $value;
+			if ( isset( $defaults[$key] ) ) {
+				if ( ! empty( $value ) && $value != $defaults[$key] ) {
+					$defaults[$key] = $value;
 				}
 			}
 		}
@@ -376,8 +376,8 @@ 
 		// Remove any whitelisted properties from above.
 		// These will get a free pass, completely unfiltered.
 		foreach ( $whitelisted_properties as $key => $default_value ) {
-			if ( isset( $properties[ $key ] ) ) {
-				unset( $properties[ $key ] );
+			if ( isset( $properties[$key] ) ) {
+				unset( $properties[$key] );
 			}
 		}
 
@@ -409,7 +409,7 @@ 
 		// Get all arguments with their values.
 		$args = get_object_vars( $this );
 		foreach ( $args as $key => $default_value ) {
-			$args[ $key ] = $this->$key;
+			$args[$key] = $this->$key;
 		}
 
 		// Add the whitelisted properties through the back door.
@@ -417,11 +417,11 @@ 
 			if ( ! isset( $this->$key ) ) {
 				$this->$key = $default_value;
 			}
-			$args[ $key ] = $this->$key;
+			$args[$key] = $this->$key;
 		}
 
 		// Add the field to the static $fields variable properly indexed.
-		Kirki::$fields[ $this->settings ] = $args;
+		Kirki::$fields[$this->settings] = $args;
 
 	}
 
@@ -524,7 +524,7 @@ 
 		}
 		foreach ( $this->partial_refresh as $id => $args ) {
 			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
-				unset( $this->partial_refresh[ $id ] );
+				unset( $this->partial_refresh[$id] );
 				continue;
 			}
 		}
@@ -552,10 +552,10 @@ 
 		}
 		$settings = array();
 		foreach ( $this->settings as $setting_key => $setting_value ) {
-			$settings[ sanitize_key( $setting_key ) ] = esc_attr( $setting_value );
+			$settings[sanitize_key( $setting_key )] = esc_attr( $setting_value );
 			// If we're using serialized options then we need to spice this up.
 			if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) {
-				$settings[ sanitize_key( $setting_key ) ] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']';
+				$settings[sanitize_key( $setting_key )] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']';
 			}
 		}
 		$this->settings = $settings;
@@ -652,7 +652,7 @@ 
 		);
 
 		if ( array_key_exists( $this->type, $default_callbacks ) ) {
-			$this->sanitize_callback = $default_callbacks[ $this->type ];
+			$this->sanitize_callback = $default_callbacks[$this->type];
 		}
 
 	}

modules/css/class-kirki-output.php

Spacing +14 added lines, -14 removed lines

@@ -102,8 +102,8 @@ 
 				if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) {
 					$option_type = 'theme_mod';
 					$option_name = false;
-					if ( isset( Kirki::$config[ $this->config_id ] ) ) {
-						$config = Kirki::$config[ $this->config_id ];
+					if ( isset( Kirki::$config[$this->config_id] ) ) {
+						$config = Kirki::$config[$this->config_id];
 						$option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod';
 						if ( 'option' === $option_type || 'site_option' === $option_type ) {
 							$option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false;
@@ -119,16 +119,16 @@ 
 								if ( is_array( $options ) ) {
 									if ( $option_name ) {
 										$subkey = str_replace( array( $option_name, '[', ']' ), '', $replace );
-										$replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : '';
+										$replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : '';
 										break;
 									}
-									$replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : '';
+									$replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : '';
 									break;
 								}
 								$replacement = get_option( $replace );
 								break;
 							case 'site_option':
-								$replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace );
+								$replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace );
 								break;
 							case 'user_meta':
 								$user_id = get_current_user_id();
@@ -183,7 +183,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'] ] ) {
+						if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude === $value[$output['choice']] ) {
 							$skip = true;
 						}
 					}
@@ -229,9 +229,9 @@ 
 			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['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
@@ -240,13 +240,13 @@ 
 			'background-image',
 		);
 		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 ( 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'] . $value . $output['units'] . $output['suffix'];
+		$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 			'background-position' => 'Kirki_Output_Property_Background_Position',
 		) );
 		if ( array_key_exists( $property, $properties ) ) {
-			$classname = $properties[ $property ];
+			$classname = $properties[$property];
 			$obj = new $classname( $property, $value );
 			return $obj->get_value();
 		}