aristath / kirki

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-init.php

Spacing +3 added lines, -3 removed lines

@@ -188,7 +188,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';
 					}
@@ -210,11 +210,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::get_option( $field['settings'] );
+						$variables[$variable_name] = Kirki::get_option( $field['settings'] );
 						if ( $variable_callback ) {
-							$variables[ $variable_name ] = call_user_func( $field_variable['callback'], Kirki::get_option( $field['settings'] ) );
+							$variables[$variable_name] = call_user_func( $field_variable['callback'], Kirki::get_option( $field['settings'] ) );
 						}
 					}
 				}

field/class-kirki-field-gradient.php

Spacing +10 added lines, -10 removed lines

@@ -77,25 +77,25 @@
 		foreach ( array( 'start', 'end' ) as $context ) {
 
 			// Make sure value is array.
-			if ( ! isset( $value[ $context ] ) ) {
-				$value[ $context ] = array();
+			if ( ! isset( $value[$context] ) ) {
+				$value[$context] = array();
 			}
 
 			// Make sure color is defined.
-			if ( ! isset( $value[ $context ]['color'] ) ) {
-				$value[ $context ]['color'] = '';
+			if ( ! isset( $value[$context]['color'] ) ) {
+				$value[$context]['color'] = '';
 			}
 			// Sanitize colors.
-			$color_obj = ariColor::newColor( $value[ $context ]['color'] );
-			$value[ $context ]['color'] = $color_obj->toCSS( $color_obj->mode );
+			$color_obj = ariColor::newColor( $value[$context]['color'] );
+			$value[$context]['color'] = $color_obj->toCSS( $color_obj->mode );
 
 			// Make sure position is defined.
-			if ( ! isset( $value[ $context ]['position'] ) ) {
-				$value[ $context ]['position'] = 0;
+			if ( ! isset( $value[$context]['position'] ) ) {
+				$value[$context]['position'] = 0;
 			};
 			// Sanitize positions.
-			$value[ $context ]['position'] = (int) $value[ $context ]['position'];
-			$value[ $context ]['position'] = max( min( $value[ $context ]['position'], 100 ), 0 );
+			$value[$context]['position'] = (int) $value[$context]['position'];
+			$value[$context]['position'] = max( min( $value[$context]['position'], 100 ), 0 );
 		}
 
 		// Make siure angle exists.

core/class-kirki-field.php

Spacing +13 added lines, -13 removed lines

@@ -327,13 +327,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;
 			}
 		}
 
@@ -370,8 +370,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] );
 			}
 		}
 
@@ -403,7 +403,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.
@@ -411,11 +411,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;
 
 	}
 
@@ -518,7 +518,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;
 			}
 		}
@@ -546,10 +546,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;
@@ -646,7 +646,7 @@ 
 		);
 
 		if ( array_key_exists( $this->type, $default_callbacks ) ) {
-			$this->sanitize_callback = $default_callbacks[ $this->type ];
+			$this->sanitize_callback = $default_callbacks[$this->type];
 		}
 
 	}

field/class-kirki-field-typography.php

Spacing +1 added lines, -1 removed lines

@@ -179,7 +179,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 ) ) {

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

Spacing +3 added lines, -3 removed lines

@@ -38,14 +38,14 @@
 
 		$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
 
-		$this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = $value['start']['color'];
+		$this->styles[$output['media_query']][$output['element']]['background'] = $value['start']['color'];
 		switch ( $value['mode'] ) {
 
 			case 'linear':
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = 'linear-gradient(' . intval( $value['angle'] ) . 'deg, ' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)';
+				$this->styles[$output['media_query']][$output['element']]['background'] = 'linear-gradient(' . intval( $value['angle'] ) . 'deg, ' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)';
 				break;
 			case 'radial':
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = 'radial-gradient(ellipse at center,' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)';
+				$this->styles[$output['media_query']][$output['element']]['background'] = 'radial-gradient(ellipse at center,' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)';
 				break;
 		}
 	}

modules/css/class-kirki-output.php

Spacing +18 added lines, -18 removed lines

@@ -101,19 +101,19 @@ 
 				$value = str_replace( '$', $value, $output['value_pattern'] );
 			}
 			if ( is_array( $value ) ) {
-				if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) ) {
-					$value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] );
+				if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) ) {
+					$value[$output['choice']] = str_replace( '$', $value[$output['choice']], $output['value_pattern'] );
 				} else {
 					foreach ( $value as $k => $v ) {
-						$value[ $k ] = str_replace( '$', $value[ $k ], $output['value_pattern'] );
+						$value[$k] = str_replace( '$', $value[$k], $output['value_pattern'] );
 					}
 				}
 			}
 			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;
@@ -129,16 +129,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();
@@ -153,7 +153,7 @@ 
 					$replacement = ( false === $replacement ) ? '' : $replacement;
 					if ( is_array( $value ) ) {
 						foreach ( $value as $k => $v ) {
-							$value[ $k ] = str_replace( $search, $replacement, $value[ $v ] );
+							$value[$k] = str_replace( $search, $replacement, $value[$v] );
 						}
 						return $value;
 					}
@@ -198,7 +198,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;
 						}
 					}
@@ -244,9 +244,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
@@ -256,13 +256,13 @@ 
 			'background',
 		);
 		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'];
 	}
 
 	/**
@@ -282,7 +282,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();
 		}