aristath / kirki

core/class-kirki-field.php

Spacing +14 added lines, -14 removed lines

@@ -257,13 +257,13 @@ 
 
 		// 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 ] ) && ! empty( $value ) && $value !== $defaults[ $key ] ) {
-				$defaults[ $key ] = $value;
+			if ( isset( $defaults[$key] ) && ! empty( $value ) && $value !== $defaults[$key] ) {
+				$defaults[$key] = $value;
 			}
 		}
 
@@ -308,11 +308,11 @@ 
 		// Get all arguments with their values.
 		$args = get_object_vars( $this );
 		foreach ( array_keys( $args ) as $key ) {
-			$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;
 
 	}
 
@@ -407,7 +407,7 @@ 
 			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
 				/* translators: %1$s represents the field ID where the error occurs. */
 				_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
-				unset( $this->partial_refresh[ $id ] );
+				unset( $this->partial_refresh[$id] );
 				continue;
 			}
 		}
@@ -435,10 +435,10 @@ 
 		}
 		$settings = array();
 		foreach ( $this->settings as $setting_key => $setting_value ) {
-			$settings[ $setting_key ] = $setting_value;
+			$settings[$setting_key] = $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[ $setting_key ] = "{$this->option_name}[{$setting_value}]";
+				$settings[$setting_key] = "{$this->option_name}[{$setting_value}]";
 			}
 		}
 		$this->settings = $settings;
@@ -563,17 +563,17 @@ 
 		}
 		foreach ( $this->output as $key => $output ) {
 			if ( empty( $output ) || ! isset( $output['element'] ) ) {
-				unset( $this->output[ $key ] );
+				unset( $this->output[$key] );
 				continue;
 			}
 			if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) {
-				$this->output[ $key ]['sanitize_callback'] = $output['callback'];
+				$this->output[$key]['sanitize_callback'] = $output['callback'];
 			}
 			// Convert element arrays to strings.
 			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
-				$this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] );
-				sort( $this->output[ $key ]['element'] );
-				$this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] );
+				$this->output[$key]['element'] = array_unique( $this->output[$key]['element'] );
+				sort( $this->output[$key]['element'] );
+				$this->output[$key]['element'] = implode( ',', $this->output[$key]['element'] );
 			}
 		}
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 		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 );

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

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 		);
 
 		foreach ( array( 'background-image', 'background-color', 'background-repeat', 'background-position', 'background-size', 'background-attachment' ) as $property ) {
-			if ( isset( $value[ $property ] ) && ! empty( $value[ $property ] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $this->process_property_value( $property, $value[ $property ] ) . $output['suffix'];
+			if ( isset( $value[$property] ) && ! empty( $value[$property] ) ) {
+				$this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $this->process_property_value( $property, $value[$property] ) . $output['suffix'];
 			}
 		}
 	}

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(
@@ -61,7 +61,7 @@ 
 			}
 			$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'];
+			$this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $property_value . $output['suffix'];
 		}
 	}
 }

core/class-kirki-init.php

Spacing +4 added lines, -4 removed lines

@@ -167,7 +167,7 @@ 
 		$this->control_types = $this->default_control_types();
 		foreach ( $this->control_types as $key => $classname ) {
 			if ( ! class_exists( $classname ) ) {
-				unset( $this->control_types[ $key ] );
+				unset( $this->control_types[$key] );
 			}
 		}
 
@@ -195,7 +195,7 @@ 
 			foreach ( Kirki::$panels as $panel_args ) {
 				// Extra checks for nested panels.
 				if ( isset( $panel_args['panel'] ) ) {
-					if ( isset( Kirki::$panels[ $panel_args['panel'] ] ) ) {
+					if ( isset( Kirki::$panels[$panel_args['panel']] ) ) {
 						// Set the type to nested.
 						$panel_args['type'] = 'kirki-nested';
 					}
@@ -217,11 +217,11 @@ 
 			foreach ( Kirki::$sections as $section_args ) {
 				// Extra checks for nested sections.
 				if ( isset( $section_args['section'] ) ) {
-					if ( isset( Kirki::$sections[ $section_args['section'] ] ) ) {
+					if ( isset( Kirki::$sections[$section_args['section']] ) ) {
 						// Set the type to nested.
 						$section_args['type'] = 'kirki-nested';
 						// We need to check if the parent section is nested inside a panel.
-						$parent_section = Kirki::$sections[ $section_args['section'] ];
+						$parent_section = Kirki::$sections[$section_args['section']];
 						if ( isset( $parent_section['panel'] ) ) {
 							$section_args['panel'] = $parent_section['panel'];
 						}

core/class-kirki-util.php

Spacing +2 added lines, -2 removed lines

@@ -118,9 +118,9 @@
 						// If we have a variable_callback defined then get the value of the option
 						// and run it through the callback function.
 						// If no callback is defined (false) then just get the value.
-						$variables[ $variable_name ] = Kirki_Values::get_value( $field['settings'] );
+						$variables[$variable_name] = Kirki_Values::get_value( $field['settings'] );
 						if ( $variable_callback ) {
-							$variables[ $variable_name ] = call_user_func( $field_variable['callback'], Kirki_Values::get_value( $field['settings'] ) );
+							$variables[$variable_name] = call_user_func( $field_variable['callback'], Kirki_Values::get_value( $field['settings'] ) );
 						}
 					}
 				}

core/class-kirki-values.php

Spacing +17 added lines, -17 removed lines

@@ -40,8 +40,8 @@ 
 	 */
 	public function typography_field_tweaks( $value, $field_id ) {
 
-		if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['type'] ) ) {
-			if ( 'kirki-typography' === Kirki::$fields[ $field_id ]['type'] ) {
+		if ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['type'] ) ) {
+			if ( 'kirki-typography' === Kirki::$fields[$field_id]['type'] ) {
 
 				// Sanitize the value.
 				// This also adds font-weight if it doesn't already exist.
@@ -83,43 +83,43 @@ 
 		$config_id = ( '' === $config_id ) ? 'global' : $config_id;
 
 		// Fallback to 'global' if $config_id is not found.
-		if ( ! isset( Kirki::$config[ $config_id ] ) ) {
+		if ( ! isset( Kirki::$config[$config_id] ) ) {
 			$config_id = 'global';
 		}
 
-		if ( 'theme_mod' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( 'theme_mod' === Kirki::$config[$config_id]['option_type'] ) {
 
 			// We're using theme_mods so just get the value using get_theme_mod.
 			$default_value = null;
-			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) {
-				$default_value = Kirki::$fields[ $field_id ]['default'];
+			if ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['default'] ) ) {
+				$default_value = Kirki::$fields[$field_id]['default'];
 			}
 			$value = get_theme_mod( $field_id, $default_value );
 			return apply_filters( 'kirki/values/get_value', $value, $field_id );
 		}
 
-		if ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( 'option' === Kirki::$config[$config_id]['option_type'] ) {
 
 			// We're using options.
-			if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) {
+			if ( '' !== Kirki::$config[$config_id]['option_name'] ) {
 
 				// Options are serialized as a single option in the db.
 				// We'll have to get the option and then get the item from the array.
-				$options = get_option( Kirki::$config[ $config_id ]['option_name'] );
+				$options = get_option( Kirki::$config[$config_id]['option_name'] );
 
-				if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']' ] ) ) {
-					$field_id = Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']';
+				if ( ! isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[Kirki::$config[$config_id]['option_name'] . '[' . $field_id . ']'] ) ) {
+					$field_id = Kirki::$config[$config_id]['option_name'] . '[' . $field_id . ']';
 				}
-				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ]['option_name'] . '[', '', $field_id ) );
+				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[$config_id]['option_name'] . '[', '', $field_id ) );
 
-				$default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) ? Kirki::$fields[ $field_id ]['default'] : '';
-				$value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value;
+				$default_value = ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['default'] ) ) ? Kirki::$fields[$field_id]['default'] : '';
+				$value = ( isset( $options[$setting_modified] ) ) ? $options[$setting_modified] : $default_value;
 				$value = maybe_unserialize( $value );
 				return apply_filters( 'kirki/values/get_value', $value, $field_id );
 			}
 
 			// Each option separately saved in the db.
-			$value = get_option( $field_id, Kirki::$fields[ $field_id ]['default'] );
+			$value = get_option( $field_id, Kirki::$fields[$field_id]['default'] );
 			return apply_filters( 'kirki/values/get_value', $value, $field_id );
 
 		} // End if().
@@ -144,8 +144,8 @@ 
 			if ( isset( $field['option_name'] ) && '' !== $field['option_name'] ) {
 				$all_values = get_option( $field['option_name'], array() );
 				$sub_setting_id = str_replace( array( ']', $field['option_name'] . '[' ), '', $field['settings'] );
-				if ( isset( $all_values[ $sub_setting_id ] ) ) {
-					$value = $all_values[ $sub_setting_id ];
+				if ( isset( $all_values[$sub_setting_id] ) ) {
+					$value = $all_values[$sub_setting_id];
 				}
 			} else {
 				$value = get_option( $field['settings'], $field['default'] );

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

Spacing +5 added lines, -5 removed lines

@@ -160,8 +160,8 @@ 
 
 		// 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;
@@ -344,7 +344,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],
 						);
 					}
 				}