aristath / kirki

core/class-kirki-field.php

Spacing +14 added lines, -14 removed lines

@@ -322,14 +322,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;
 				}
 			}
 		}
@@ -367,8 +367,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] );
 			}
 		}
 
@@ -400,7 +400,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.
@@ -408,11 +408,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;
 
 	}
 
@@ -513,7 +513,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;
 			}
 		}
@@ -541,10 +541,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;
@@ -643,7 +643,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-values.php

Spacing +14 added lines, -14 removed lines

@@ -43,39 +43,39 @@ 
 		$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 );
 
-		} 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 ) );
 
-				$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'] );
 
 			} // End if().
 		} // End if().
@@ -100,8 +100,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/class-kirki-modules-css.php

Spacing +3 added lines, -3 removed lines

@@ -184,11 +184,11 @@
 
 			// Only continue if $field['output'] is set.
 			if ( isset( $field['output'] ) && ! empty( $field['output'] ) ) {
-				$css  = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
+				$css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
 
 				// Add the globals.
-				if ( isset( self::$css_array[ $config_id ] ) && ! empty( self::$css_array[ $config_id ] ) ) {
-					Kirki_Helper::array_replace_recursive( $css, self::$css_array[ $config_id ] );
+				if ( isset( self::$css_array[$config_id] ) && ! empty( self::$css_array[$config_id] ) ) {
+					Kirki_Helper::array_replace_recursive( $css, self::$css_array[$config_id] );
 				}
 			}
 		}

field/class-kirki-field-repeater.php

Spacing +11 added lines, -11 removed lines

@@ -72,23 +72,23 @@ 
 
 			// Make sure the row is formatted as an array.
 			if ( ! is_array( $row_value ) ) {
-				$value[ $row_id ] = array();
+				$value[$row_id] = array();
 				continue;
 			}
 			// Start parsing sub-fields in rows.
 			foreach ( $row_value as $subfield_id => $subfield_value ) {
 				// Make sure this is a valid subfield.
 				// If it's not, then unset it.
-				if ( ! isset( $this->fields[ $subfield_id ] ) ) {
-					unset( $value[ $row_id ][ $subfield_id ] );
+				if ( ! isset( $this->fields[$subfield_id] ) ) {
+					unset( $value[$row_id][$subfield_id] );
 				}
 				// Get the subfield-type.
-				$subfield_type = $this->fields[ $subfield_id ]['type'];
+				$subfield_type = $this->fields[$subfield_id]['type'];
 
 				// Allow using a sanitize-callback on a per-field basis.
-				if ( isset( $this->fields[ $subfield_id ]['sanitize_callback'] ) ) {
+				if ( isset( $this->fields[$subfield_id]['sanitize_callback'] ) ) {
 
-					$subfield_value = call_user_func( $this->fields[ $subfield_id ]['sanitize_callback'], $subfield_value );
+					$subfield_value = call_user_func( $this->fields[$subfield_id]['sanitize_callback'], $subfield_value );
 
 				} else {
 
@@ -125,15 +125,15 @@ 
 							$subfield_value = (string) intval( $subfield_value );
 							break;
 						case 'select':
-							if ( isset( $this->fields[ $subfield_id ]['multiple'] ) ) {
-								if ( true === $this->fields[ $subfield_id ]['multiple'] ) {
+							if ( isset( $this->fields[$subfield_id]['multiple'] ) ) {
+								if ( true === $this->fields[$subfield_id]['multiple'] ) {
 									$multiple = 2;
 								}
-								$multiple = (int) $this->fields[ $subfield_id ]['multiple'];
+								$multiple = (int) $this->fields[$subfield_id]['multiple'];
 								if ( 1 < $multiple ) {
 									$subfield_value = (array) $subfield_value;
 									foreach ( $subfield_value as $sub_subfield_key => $sub_subfield_value ) {
-										$subfield_value[ $sub_subfield_key ] = esc_attr( $sub_subfield_value );
+										$subfield_value[$sub_subfield_key] = esc_attr( $sub_subfield_value );
 									}
 								} else {
 									$subfield_value = esc_attr( $subfield_value );
@@ -149,7 +149,7 @@ 
 
 					} // End switch().
 				} // End if().
-				$value[ $row_id ][ $subfield_id ] = $subfield_value;
+				$value[$row_id][$subfield_id] = $subfield_value;
 			} // End foreach().
 		} // End foreach().
 

field/class-kirki-field-checkbox.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	 * Sanitizes checkbox values.
 	 *
 	 * @access public
-	 * @param boolean|integer|string|null $value The checkbox value.
+	 * @param boolean|string $value The checkbox value.
 	 * @return bool
 	 */
 	public function sanitize( $value = null ) {

modules/collapsible/class-kirki-modules-collapsible.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 		$fields = Kirki::$fields;
 		foreach ( $fields as $field ) {
 			if ( isset( $field['collapsible'] ) && true === $field['collapsible'] && isset( $field['settings'] ) && isset( $field['label'] ) ) {
-				$collapsible_fields[ $field['settings'] ] = $field['label'];
+				$collapsible_fields[$field['settings']] = $field['label'];
 			}
 		}
 		$collapsible_fields = array_unique( $collapsible_fields );

field/class-kirki-field-number.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
 			$smallest = array();
 			foreach ( $valid as $possible_value ) {
-				$smallest[ $possible_value ] = abs( $possible_value - $value );
+				$smallest[$possible_value] = abs( $possible_value - $value );
 			}
 			asort( $smallest );
 			$value = key( $smallest );

core/class-kirki-fonts-google.php

Spacing +17 added lines, -17 removed lines

@@ -184,11 +184,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'];
 			}
 		} else {
 
@@ -206,12 +206,12 @@ 
 
 					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'] ) {
@@ -250,31 +250,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 ] );
-					unset( $this->fonts[ $font ][ $variant_key ] );
+					$variant_key = array_search( $variant, $this->fonts[$font] );
+					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;
 					}
 				}
@@ -302,8 +302,8 @@ 
 
 			// Are we force-loading all variants?
 			if ( true === self::$force_load_all_variants ) {
-				if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
-					$variants = $this->google_fonts[ $font ]['variants'];
+				if ( isset( $this->google_fonts[$font]['variants'] ) ) {
+					$variants = $this->google_fonts[$font]['variants'];
 				}
 			}
 			$variants = implode( ',', $variants );
@@ -318,8 +318,8 @@ 
 		// Are we force-loading all subsets?
 		if ( true === self::$force_load_all_subsets ) {
 
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
-				foreach ( $this->google_fonts[ $font ]['subsets'] as $subset ) {
+			if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
+				foreach ( $this->google_fonts[$font]['subsets'] as $subset ) {
 					$this->subsets[] = $subset;
 				}
 			}

core/class-kirki-fonts.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 			$google_fonts = array();
 			if ( is_array( $fonts ) ) {
 				foreach ( $fonts['items'] as $font ) {
-					$google_fonts[ $font['family'] ] = array(
+					$google_fonts[$font['family']] = array(
 						'label'    => $font['family'],
 						'variants' => $font['variants'],
 						'subsets'  => $font['subsets'],
@@ -146,7 +146,7 @@ 
 		$fonts = self::get_all_fonts();
 		$fonts_array = array();
 		foreach ( $fonts as $key => $args ) {
-			$fonts_array[ $key ] = $key;
+			$fonts_array[$key] = $key;
 		}
 		return $fonts_array;
 	}