aristath / kirki

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/php/class-kirki-settings-repeater-setting.php

Spacing +2 added lines, -2 removed lines

@@ -67,9 +67,9 @@
 
 		// Make sure that every row is an array, not an object.
 		foreach ( $sanitized as $key => $_value ) {
-			$sanitized[ $key ] = (array) $_value;
+			$sanitized[$key] = (array) $_value;
 			if ( empty( $_value ) ) {
-				unset( $sanitized[ $key ] );
+				unset( $sanitized[$key] );
 			}
 		}
 

controls/php/class-kirki-control-repeater.php

Spacing +7 added lines, -7 removed lines

@@ -111,12 +111,12 @@ 
 
 		foreach ( $args['fields'] as $key => $value ) {
 			if ( ! isset( $value['default'] ) ) {
-				$args['fields'][ $key ]['default'] = '';
+				$args['fields'][$key]['default'] = '';
 			}
 			if ( ! isset( $value['label'] ) ) {
-				$args['fields'][ $key ]['label'] = '';
+				$args['fields'][$key]['label'] = '';
 			}
-			$args['fields'][ $key ]['id']      = $key;
+			$args['fields'][$key]['id'] = $key;
 
 			// We check if the filed is an uploaded media ( image , file, video, etc.. ).
 			if ( isset( $value['type'] ) ) {
@@ -125,7 +125,7 @@ 
 					case 'cropped_image':
 					case 'upload':
 						// We add it to the list of fields that need some extra filtering/processing.
-						$media_fields_to_filter[ $key ] = true;
+						$media_fields_to_filter[$key] = true;
 						break;
 
 					case 'dropdown-pages':
@@ -140,8 +140,8 @@ 
 							)
 						);
 						// Hackily add in the data link parameter.
-						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][ $key ]['id'] ) . '"' . $this->get_link(), $dropdown );
-						$args['fields'][ $key ]['dropdown'] = $dropdown;
+						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][$key]['id'] ) . '"' . $this->get_link(), $dropdown );
+						$args['fields'][$key]['dropdown'] = $dropdown;
 						break;
 				}
 			}
@@ -581,7 +581,7 @@ 
 			}
 
 			// Validating row label field.
-			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][ esc_attr( $args['row_label']['field'] ) ] ) ) {
+			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][esc_attr( $args['row_label']['field'] )] ) ) {
 				$this->row_label['field'] = esc_attr( $args['row_label']['field'] );
 			} else {
 				// If from field is not set correctly, making sure standard is set as the type.

controls/php/class-kirki-control-dimensions.php

Spacing +3 added lines, -3 removed lines

@@ -79,14 +79,14 @@
 		if ( is_array( $this->choices ) ) {
 			foreach ( $this->choices as $choice => $value ) {
 				if ( 'labels' !== $choice && true === $value ) {
-					$this->json['choices'][ $choice ] = true;
+					$this->json['choices'][$choice] = true;
 				}
 			}
 		}
 		if ( is_array( $this->json['default'] ) ) {
 			foreach ( $this->json['default'] as $key => $value ) {
-				if ( isset( $this->json['choices'][ $key ] ) && ! isset( $this->json['value'][ $key ] ) ) {
-					$this->json['value'][ $key ] = $value;
+				if ( isset( $this->json['choices'][$key] ) && ! isset( $this->json['value'][$key] ) ) {
+					$this->json['value'][$key] = $value;
 				}
 			}
 		}

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

core/class-kirki-l10n.php

Spacing +2 added lines, -2 removed lines

@@ -117,9 +117,9 @@
 	public function override_load_textdomain( $override, $domain, $mofile ) {
 
 		global $l10n;
-		if ( isset( $l10n[ $this->get_theme_textdomain() ] ) ) {
+		if ( isset( $l10n[$this->get_theme_textdomain()] ) ) {
 			// @codingStandardsIgnoreLine WordPress.Variables.GlobalVariables.OverrideProhibited
-			$l10n['kirki'] = $l10n[ $this->get_theme_textdomain() ];
+			$l10n['kirki'] = $l10n[$this->get_theme_textdomain()];
 		}
 
 		// Check if the domain is "kirki".

controls/php/class-kirki-control-background.php

Braces +5 added lines, -2 removed lines

@@ -200,10 +200,13 @@
 			</div>
 			<?php if ( Kirki_Util::get_wp_version() >= 4.9 ) : ?>
 				<input class="background-hidden-value" type="hidden" {{{ data.link }}}>
-			<?php else : ?>
+			<?php else {
+	: ?>
 				<# valueJSON = JSON.stringify( data.value ).replace( /'/g, '&#39' ); #>
 				<input class="background-hidden-value" type="hidden" value='{{{ valueJSON }}}' {{{ data.link }}}>
-			<?php endif; ?>
+			<?php endif;
+}
+?>
 		<?php
 	}
 }

class-kirki-autoload.php

Spacing +6 added lines, -6 removed lines

@@ -54,8 +54,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;
 		}
 
@@ -64,7 +64,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;
 			}
@@ -99,7 +99,7 @@ 
 
 			// Handle controls loading.
 			if ( 'Control' === $name_parts[0] || 'Settings' === $name_parts[0] ) {
-				$path  = dirname( __FILE__ ) . '/controls/php/';
+				$path = dirname( __FILE__ ) . '/controls/php/';
 				$paths[] = $path . $filename;
 			}
 		}
@@ -113,8 +113,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;
 	}

core/class-kirki-field.php

Spacing +18 added lines, -18 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;
 
 	}
 
@@ -407,7 +407,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;
 			}
 		}
@@ -435,10 +435,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;
@@ -550,27 +550,27 @@ 
 		}
 		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'] = array_unique( $this->output[$key]['element'] );
+				sort( $this->output[$key]['element'] );
 
 				// Trim each element in the array.
-				foreach ( $this->output[ $key ]['element'] as $index => $element ) {
-					$this->output[ $key ]['element'][ $index ] = trim( $element );
+				foreach ( $this->output[$key]['element'] as $index => $element ) {
+					$this->output[$key]['element'][$index] = trim( $element );
 				}
-				$this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] );
+				$this->output[$key]['element'] = implode( ',', $this->output[$key]['element'] );
 			}
 
 			// Fix for https://github.com/aristath/kirki/issues/1659#issuecomment-346229751.
-			$this->output[ $key ]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ]['element'] );
-			$this->output[ $key ]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ]['element'] ) );
+			$this->output[$key]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[$key]['element'] );
+			$this->output[$key]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[$key]['element'] ) );
 		}
 	}