aristath / kirki

field/class-kirki-field-select.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
 		if ( is_array( $value ) ) {
 			foreach ( $value as $key => $subvalue ) {
-				$value[ $key ] = esc_attr( $subvalue );
+				$value[$key] = esc_attr( $subvalue );
 			}
 			return $value;
 		}

core/class-kirki-control.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
 		$class_name = 'WP_Customize_Control';
 		// Get the classname from the array of control classnames.
 		if ( array_key_exists( $args['type'], $this->control_types ) ) {
-			$class_name = $this->control_types[ $args['type'] ];
+			$class_name = $this->control_types[$args['type']];
 		}
 		return $class_name;
 
@@ -133,7 +133,7 @@ 
 		foreach ( $this->control_types as $key => $classname ) {
 
 			if ( ! class_exists( $classname ) ) {
-				unset( $this->control_types[ $key ] );
+				unset( $this->control_types[$key] );
 			}
 		}
 	}

core/class-kirki-values.php

Spacing +24 added lines, -24 removed lines

@@ -43,73 +43,73 @@ 
 		$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 );
 
 			// If the field is a background field, then get the sub-fields
 			// and return an array of the values.
-			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['type'] ) && 'background' === Kirki::$fields[ $field_id ]['type'] ) {
+			if ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['type'] ) && 'background' === Kirki::$fields[$field_id]['type'] ) {
 				$value = array();
 				if ( null === $default_value ) {
 					$default_value = array();
 				}
 				foreach ( $default_value as $property_key => $property_default ) {
-					$value[ $property_key ] = get_theme_mod( $field_id . '_' . $property_key, $property_default );
+					$value[$property_key] = get_theme_mod( $field_id . '_' . $property_key, $property_default );
 				}
 			}
-		} elseif ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) {
+		} elseif ( '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 ) );
 
 				// If this is a background field, get the individual sub-fields and return an array.
-				if ( 'background' === Kirki::$fields[ $field_id ]['type'] ) {
+				if ( 'background' === Kirki::$fields[$field_id]['type'] ) {
 					$value = array();
 
-					foreach ( Kirki::$fields[ $field_id ]['default'] as $property => $property_default ) {
+					foreach ( Kirki::$fields[$field_id]['default'] as $property => $property_default ) {
 
-						if ( isset( $options[ $setting_modified . '_' . $property ] ) ) {
-							$value[ $property ] = $options[ $setting_modified . '_' . $property ];
+						if ( isset( $options[$setting_modified . '_' . $property] ) ) {
+							$value[$property] = $options[$setting_modified . '_' . $property];
 						} else {
-							$value[ $property ] = $property_default;
+							$value[$property] = $property_default;
 						}
 					}
 				} else {
 
 					// This is not a background field so continue and get the value.
-					$value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : Kirki::$fields[ $field_id ]['default'];
+					$value = ( isset( $options[$setting_modified] ) ) ? $options[$setting_modified] : Kirki::$fields[$field_id]['default'];
 					$value = maybe_unserialize( $value );
 				}
 			} else {
 
 				// 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'] );
 
 				// If the field is a background field, then get the sub-fields.
 				// and return an array of the values.
-				if ( 'background' === Kirki::$fields[ $field_id ]['type'] ) {
+				if ( 'background' === Kirki::$fields[$field_id]['type'] ) {
 					$value = array();
-					foreach ( Kirki::$fields[ $field_id ]['default'] as $property_key => $property_default ) {
-						$value[ $property_key ] = get_option( $field_id . '_' . $property_key, $property_default );
+					foreach ( Kirki::$fields[$field_id]['default'] as $property_key => $property_default ) {
+						$value[$property_key] = get_option( $field_id . '_' . $property_key, $property_default );
 					}
 				}
 			}
@@ -135,8 +135,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-config.php

Spacing +4 added lines, -4 removed lines

@@ -104,7 +104,7 @@ 
 		foreach ( $args as $key => $value ) {
 			// Is this property whitelisted?
 			if ( property_exists( $this, $key ) ) {
-				$args[ $key ] = $value;
+				$args[$key] = $value;
 			}
 		}
 
@@ -141,10 +141,10 @@ 
 		$id = ( '' === $id ) ? 'global' : $id;
 
 		$id_md5 = md5( $id );
-		if ( ! isset( self::$instances[ $id_md5 ] ) ) {
-			self::$instances[ $id_md5 ] = new self( $id, $args );
+		if ( ! isset( self::$instances[$id_md5] ) ) {
+			self::$instances[$id_md5] = new self( $id, $args );
 		}
-		return self::$instances[ $id_md5 ];
+		return self::$instances[$id_md5];
 
 	}
 

core/class-kirki-sanitize-values.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 		}
 
 		// Return empty if there are no numbers in the value.
-		if ( ! preg_match( '#[0-9]#' , $value ) ) {
+		if ( ! preg_match( '#[0-9]#', $value ) ) {
 			return '';
 		}
 

core/class-kirki-settings.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
 		if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->setting_types ) ) {
 			$args['type'] = 'default';
 		}
-		$classname = $this->setting_types[ $args['type'] ];
+		$classname = $this->setting_types[$args['type']];
 
 		// If settings are defined as an array, then we need to go through them
 		// and call add_setting for each one of them separately.
@@ -80,7 +80,7 @@ 
 				$args['default'] = array();
 			}
 			foreach ( $args['settings'] as $key => $value ) {
-				$default   = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : '';
+				$default = ( isset( $defaults[$key] ) ) ? $defaults[$key] : '';
 				$this->add_setting( $classname, $value, $default, $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] );
 			}
 		}
@@ -131,7 +131,7 @@ 
 		foreach ( $this->setting_types as $key => $classname ) {
 
 			if ( ! class_exists( $classname ) ) {
-				unset( $this->setting_types[ $key ] );
+				unset( $this->setting_types[$key] );
 			}
 		}
 	}

core/class-kirki-active-callback.php

Spacing +2 added lines, -2 removed lines

@@ -26,11 +26,11 @@
 		$fields = Kirki::$fields;
 
 		// Make sure the current object matches a registered field.
-		if ( ! isset( $object->setting->id ) || ! isset( $fields[ $object->setting->id ] ) ) {
+		if ( ! isset( $object->setting->id ) || ! isset( $fields[$object->setting->id] ) ) {
 			return true;
 		}
 
-		$field = $fields[ $object->setting->id ];
+		$field = $fields[$object->setting->id];
 
 		if ( isset( $field['required'] ) ) {
 

core/class-kirki-field.php

Spacing +14 added lines, -14 removed lines

@@ -330,14 +330,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;
 				}
 			}
 		}
@@ -375,8 +375,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] );
 			}
 		}
 
@@ -408,7 +408,7 @@ 
 		// Get all arguments with their values.
 		$args = get_class_vars( __CLASS__ );
 		foreach ( $args as $key => $default_value ) {
-			$args[ $key ] = $this->$key;
+			$args[$key] = $this->$key;
 		}
 
 		// Add the whitelisted properties through the back door.
@@ -416,11 +416,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;
 
 		if ( 'background' === $this->type ) {
 			// Build the background fields.
@@ -526,7 +526,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;
@@ -655,7 +655,7 @@ 
 		);
 
 		if ( array_key_exists( $this->type, $default_callbacks ) ) {
-			$this->sanitize_callback = $default_callbacks[ $this->type ];
+			$this->sanitize_callback = $default_callbacks[$this->type];
 		}
 
 	}

core/class-kirki.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public static $config   = array();
+	public static $config = array();
 
 	/**
 	 * An array containing all fields.
@@ -59,7 +59,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public static $fields   = array();
+	public static $fields = array();
 
 	/**
 	 * An array containing all panels.
@@ -68,7 +68,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public static $panels   = array();
+	public static $panels = array();
 
 	/**
 	 * An array containing all sections.
@@ -115,7 +115,7 @@ 
 
 		$config = Kirki_Config::get_instance( $config_id, $args );
 		$config_args = $config->get_config();
-		self::$config[ $config_args['id'] ] = $config_args;
+		self::$config[$config_args['id']] = $config_args;
 
 	}
 
@@ -138,7 +138,7 @@ 
 			$args['active_callback'] = ( isset( $args['required'] ) ) ? array( 'Kirki_Active_Callback', 'evaluate' ) : '__return_true';
 		}
 
-		self::$panels[ $args['id'] ] = $args;
+		self::$panels[$args['id']] = $args;
 
 	}
 
@@ -162,7 +162,7 @@ 
 			$args['active_callback'] = ( isset( $args['required'] ) ) ? array( 'Kirki_Active_Callback', 'evaluate' ) : '__return_true';
 		}
 
-		self::$sections[ $args['id'] ] = $args;
+		self::$sections[$args['id']] = $args;
 
 	}