aristath / kirki

core/class-kirki-init.php

Spacing +4 added lines, -4 removed lines

@@ -167,7 +167,7 @@ 
 		$this->control_types = $this->default_control_types( apply_filters( 'kirki/control_types', $this->control_types ) );
 		foreach ( $this->control_types as $key => $classname ) {
 			if ( ! class_exists( $classname ) ) {
-				unset( $this->control_types[ $key ] );
+				unset( $this->control_types[$key] );
 			}
 		}
 
@@ -193,7 +193,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';
 					}
@@ -215,11 +215,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'];
 						}

class-kirki-autoload.php

Spacing +5 added lines, -5 removed lines

@@ -64,8 +64,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;
 		}
 
@@ -74,7 +74,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;
 			}
@@ -134,8 +134,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;
 	}

modules/webfonts/class-kirki-modules-webfonts-link.php

Spacing +2 added lines, -2 removed lines

@@ -130,8 +130,8 @@
 		// Are we force-loading all subsets?
 		if ( true === Kirki_Fonts_Google::$force_load_all_subsets ) {
 
-			if ( isset( $this->googlefonts->fonts[ $font ]['subsets'] ) ) {
-				foreach ( $this->googlefonts->fonts[ $font ]['subsets'] as $subset ) {
+			if ( isset( $this->googlefonts->fonts[$font]['subsets'] ) ) {
+				foreach ( $this->googlefonts->fonts[$font]['subsets'] as $subset ) {
 					$this->subsets[] = $subset;
 				}
 			}

modules/css/class-kirki-output.php

Spacing +11 added lines, -11 removed lines

@@ -101,12 +101,12 @@ 
 				$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 ( array_keys( $value ) as $value_k ) {
-						if ( is_string( $value[ $value_k ] ) ) {
-							$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] );
+						if ( is_string( $value[$value_k] ) ) {
+							$value[$value_k] = str_replace( '$', $value[$value_k], $output['value_pattern'] );
 						}
 					}
 				}
@@ -117,7 +117,7 @@ 
 					$replacement = ( false === $replacement || null === $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;
 					}
@@ -162,7 +162,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;
 						}
 					}
@@ -220,13 +220,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'];
 	}
 
 	/**
@@ -246,7 +246,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-background.php

Spacing +2 added lines, -2 removed lines

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

core/class-kirki-values.php

Spacing +17 added lines, -17 removed lines

@@ -43,14 +43,14 @@ 
 		$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';
 		}
 
-		switch ( Kirki::$config[ $config_id ]['option_type'] ) {
+		switch ( Kirki::$config[$config_id]['option_type'] ) {
 			case 'option':
 			case 'site_option':
-				$site_option = (bool) ( 'site_option' === Kirki::$config[ $config_id ] );
+				$site_option = (bool) ( 'site_option' === Kirki::$config[$config_id] );
 				return apply_filters( 'kirki/values/get_value', self::get_from_option( $config_id, $field_id, $site_option ), $field_id );
 			case 'user_meta':
 				$user_id = get_current_user_id();
@@ -73,8 +73,8 @@ 
 	private static function get_from_theme_mod( $field_id ) {
 		// 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'];
 		}
 		return get_theme_mod( $field_id, $default_value );
 	}
@@ -92,29 +92,29 @@ 
 	 */
 	private static function get_from_option( $config_id, $field_id, $site_option = false ) {
 		$get_option = ( $site_option ) ? 'get_site_option' : 'get_option';
-		if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) {
+		if ( '' !== Kirki::$config[$config_id]['option_name'] ) {
 
-			if ( false !== strpos( $field_id, Kirki::$config[ $config_id ]['option_name'] . '[' ) ) {
-				$field_id = str_replace( array( Kirki::$config[ $config_id ]['option_name'], '[', ']' ), '', $field_id );
+			if ( false !== strpos( $field_id, Kirki::$config[$config_id]['option_name'] . '[' ) ) {
+				$field_id = str_replace( array( Kirki::$config[$config_id]['option_name'], '[', ']' ), '', $field_id );
 			}
 
 			// 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.
-		return $get_option( $field_id, Kirki::$fields[ $field_id ]['default'] );
+		return $get_option( $field_id, Kirki::$fields[$field_id]['default'] );
 	}
 
 	/**
@@ -133,8 +133,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'] );

core/class-kirki-field.php

Spacing +15 added lines, -15 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;
 
 	}
 
@@ -333,7 +333,7 @@ 
 			$property_parts = explode( '_', $property );
 		}
 		foreach ( $property_parts as $property_part_k => $property_part_v ) {
-			$property_parts[ $property_part_k ] = ucfirst( $property_part_v );
+			$property_parts[$property_part_k] = ucfirst( $property_part_v );
 		}
 		return 'Kirki_Field_Property_' . implode( '_', $property_parts );
 	}
@@ -429,7 +429,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;
 			}
 		}
@@ -457,10 +457,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;
@@ -585,17 +585,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'] );
 			}
 		}
 	}