aristath / kirki

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'] );

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

Spacing +3 added lines, -3 removed lines

@@ -34,15 +34,15 @@
 		) );
 		if ( is_array( $value ) ) {
 			if ( isset( $output['choice'] ) && $output['choice'] ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value[ $output['choice'] ] ) . $output['units'] . $output['suffix'];
+				$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $this->process_property_value( $output['property'], $value[$output['choice']] ) . $output['units'] . $output['suffix'];
 				return;
 			}
 			if ( isset( $value['url'] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value['url'] ) . $output['units'] . $output['suffix'];
+				$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $this->process_property_value( $output['property'], $value['url'] ) . $output['units'] . $output['suffix'];
 				return;
 			}
 			return;
 		}
-		$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
+		$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
 	}
 }

modules/css/class-kirki-output.php

Spacing +13 added lines, -13 removed lines

@@ -101,16 +101,16 @@ 
 			}
 			if ( is_array( $value ) ) {
 				foreach ( array_keys( $value ) as $value_k ) {
-					if ( ! is_string( $value[ $value_k ] ) ) {
+					if ( ! is_string( $value[$value_k] ) ) {
 						continue;
 					}
 					if ( isset( $output['choice'] ) ) {
 						if ( $output['choice'] === $value_k ) {
-							$value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] );
+							$value[$output['choice']] = str_replace( '$', $value[$output['choice']], $output['value_pattern'] );
 						}
 						continue;
 					}
-					$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] );
+					$value[$value_k] = str_replace( '$', $value[$value_k], $output['value_pattern'] );
 				}
 			}
 			$value = $this->apply_pattern_replace( $output, $value );
@@ -140,16 +140,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();
@@ -164,7 +164,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;
 				}
@@ -206,7 +206,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;
 						}
 					}
@@ -264,13 +264,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'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
+		$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
 	}
 
 	/**
@@ -290,7 +290,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();
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 			if ( false !== strpos( $output['property'], '%%' ) ) {
 				$property = str_replace( '%%', $key, $output['property'] );
 			}
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $this->process_property_value( $property, $value[ $key ] ) . $output['suffix'];
+			$this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $this->process_property_value( $property, $value[$key] ) . $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'] ) && 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;
 					}
 				}

controls/typography/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' ) ) && ! isset( $this->json['default'][ $key ] ) ) {
-				unset( $this->json['value'][ $key ] );
+			if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ) ) && ! 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],
 						);
 					}
 				}

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

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 			$output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
 
 			// Create the styles.
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $sub_value . $output['suffix'];
+			$this->styles[$output['media_query']][$output['element']][$property] = $sub_value . $output['suffix'];
 
 		}
 	}