aristath / kirki

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

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 * Returns an array of paths where translation files may be located.
 	 *
 	 * @access protected
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_paths() {
 

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

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

Spacing +7 added lines, -7 removed lines

@@ -52,12 +52,12 @@ 
 
 		if ( is_array( $this->json['value'] ) ) {
 			foreach ( array_keys( $this->json['value'] ) as $key ) {
-				if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][ $key ] ) ) {
-					unset( $this->json['value'][ $key ] );
+				if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][$key] ) ) {
+					unset( $this->json['value'][$key] );
 				}
 				// Fix for https://github.com/aristath/kirki/issues/1405.
-				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] );
 				}
 			}
 		}
@@ -257,7 +257,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;
@@ -338,7 +338,7 @@ 
 					if ( array_key_exists( $variant, $all_variants ) ) {
 						$available_variants[] = array(
 							'id' => $variant,
-							'label' => $all_variants[ $variant ],
+							'label' => $all_variants[$variant],
 						);
 					}
 				}
@@ -350,7 +350,7 @@ 
 					if ( array_key_exists( $subset, $all_subsets ) ) {
 						$available_subsets[] = array(
 							'id' => $subset,
-							'label' => $all_subsets[ $subset ],
+							'label' => $all_subsets[$subset],
 						);
 					}
 				}

docs/files/class-my-theme-kirki.php

Spacing +18 added lines, -18 removed lines

@@ -73,23 +73,23 @@ 
 		// Kirki does not exist, continue with our custom implementation.
 		// Get the default value of the field.
 		$default = '';
-		if ( isset( self::$fields[ $field_id ] ) && isset( self::$fields[ $field_id ]['default'] ) ) {
-			$default = self::$fields[ $field_id ]['default'];
+		if ( isset( self::$fields[$field_id] ) && isset( self::$fields[$field_id]['default'] ) ) {
+			$default = self::$fields[$field_id]['default'];
 		}
 
 		// Make sure the config is defined.
-		if ( isset( self::$config[ $config_id ] ) ) {
-			if ( 'option' == self::$config[ $config_id ]['option_type'] ) {
+		if ( isset( self::$config[$config_id] ) ) {
+			if ( 'option' == self::$config[$config_id]['option_type'] ) {
 
 				// check if we're using serialized options.
-				if ( isset( self::$config[ $config_id ]['option_name'] ) && ! empty( self::$config[ $config_id ]['option_name'] ) ) {
+				if ( isset( self::$config[$config_id]['option_name'] ) && ! empty( self::$config[$config_id]['option_name'] ) ) {
 
 					// Get all our options.
-					$all_options = get_option( self::$config[ $config_id ]['option_name'], array() );
+					$all_options = get_option( self::$config[$config_id]['option_name'], array() );
 
 					// If our option is not saved, return the default value.
 					// If option was set, return its value unserialized.
-					return ( ! isset( $all_options[ $field_id ] ) ) ? $default : maybe_unserialize( $all_options[ $field_id ] );
+					return ( ! isset( $all_options[$field_id] ) ) ? $default : maybe_unserialize( $all_options[$field_id] );
 				}
 
 				// If we're not using serialized options, get the value and return it.
@@ -148,11 +148,11 @@ 
 		}
 
 		// Kirki does not exist, set the config arguments.
-		$config[ $config_id ] = $args;
+		$config[$config_id] = $args;
 
 		// Make sure an option_type is defined.
-		if ( ! isset( self::$config[ $config_id ]['option_type'] ) ) {
-			self::$config[ $config_id ]['option_type'] = 'theme_mod';
+		if ( ! isset( self::$config[$config_id]['option_type'] ) ) {
+			self::$config[$config_id]['option_type'] = 'theme_mod';
 		}
 	}
 
@@ -180,7 +180,7 @@ 
 			if ( ! isset( $args['kirki_config'] ) ) {
 				$args['kirki_config'] = $config_id;
 			}
-			self::$fields[ $args['settings'] ] = $args;
+			self::$fields[$args['settings']] = $args;
 		}
 	}
 
@@ -264,7 +264,7 @@ 
 				if ( ! is_array( $value ) ) {
 					$value = str_replace( '$', $value, $output['value_pattern'] );
 					if ( ! empty( $output['element'] ) && ! empty( $output['property'] ) ) {
-						$css[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
+						$css[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
 					}
 				} else {
 					if ( 'typography' === $field['type'] ) {
@@ -278,27 +278,27 @@ 
 
 							// Add double quotes if needed to font-families.
 							if ( 'font-family' == $key && false !== strpos( $subvalue, ' ' ) && false === strpos( $subvalue, '"' ) ) {
-								$css[ $output['media_query'] ][ $output['element'] ]['font-family'] = '"' . $subvalue . '"';
+								$css[$output['media_query']][$output['element']]['font-family'] = '"' . $subvalue . '"';
 							}
 
 							// Variants contain both font-weight & italics.
 							if ( 'variant' === $key ) {
 								$font_weight = str_replace( 'italic', '', $subvalue );
 								$font_weight = ( in_array( $font_weight, array( '', 'regular' ) ) ) ? '400' : $font_weight;
-								$css[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $font_weight;
+								$css[$output['media_query']][$output['element']]['font-weight'] = $font_weight;
 
 								// Is this italic?
 								if ( false !== strpos( $subvalue, 'italic' ) ) {
-									$css[ $output['media_query'] ][ $output['element'] ]['font-style'] = 'italic';
+									$css[$output['media_query']][$output['element']]['font-style'] = 'italic';
 								}
 							} else {
-								$css[ $output['media_query'] ][ $output['element'] ][ $key ] = $subvalue;
+								$css[$output['media_query']][$output['element']][$key] = $subvalue;
 							}
 						}
 					} elseif ( 'multicolor' == $field['type'] ) {
 
 						if ( ! empty( $output['element'] ) && ! empty( $output['property'] ) && ! empty( $output['choice'] ) ) {
-							$css[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value[ $output['choice'] ] . $output['units'] . $output['suffix'];
+							$css[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value[$output['choice']] . $output['units'] . $output['suffix'];
 						}
 					} else {
 
@@ -313,7 +313,7 @@ 
 								$subvalue = 'url("' . $subvalue . '")';
 							}
 							if ( $subvalue ) {
-								$css[ $output['media_query'] ][ $output['element'] ][ $property ] = $subvalue;
+								$css[$output['media_query']][$output['element']][$property] = $subvalue;
 							}
 						}
 					}

docs/files/class-kirki-installer-section.php

Braces +5 added lines, -2 removed lines

@@ -55,8 +55,11 @@
 						<a class="install-now button-primary button" data-slug="kirki" href="<?php echo esc_url_raw( $plugin_install_url ); ?>" aria-label="<?php esc_attr_e( 'Install Kirki Toolkit now', 'textdomain' ); ?>" data-name="Kirki Toolkit">
 							<?php esc_html_e( 'Install Now', 'textdomain' ); ?>
 						</a>
-					<?php else : ?>
-						<p style="text-align:left;margin-top:0;"><?php esc_attr_e( 'You have installed Kirki. Activate it to take advantage of this theme\'s features in the customizer.', 'textdomain' ); ?></p>
+					<?php else {
+	: ?>
+						<p style="text-align:left;margin-top:0;"><?php esc_attr_e( 'You have installed Kirki. Activate it to take advantage of this theme\'s features in the customizer.', 'textdomain' );
+}
+?></p>
 						<a class="install-now button-secondary button change-theme" data-slug="kirki" href="<?php echo esc_url_raw( self_admin_url( 'plugins.php' ) ); ?>" aria-label="<?php esc_attr_e( 'Activate Kirki Toolkit now', 'textdomain' ); ?>" data-name="Kirki Toolkit">
 							<?php esc_html_e( 'Activate Now', 'textdomain' ); ?>
 						</a>

modules/css/class-kirki-output.php

Spacing +15 added lines, -15 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,10 +164,10 @@ 
 				$replacement = ( false === $replacement ) ? '' : $replacement;
 				if ( is_array( $value ) ) {
 					foreach ( $value as $k => $v ) {
-						if ( isset( $value[ $v ] ) ) {
-							$value[ $k ] = str_replace( $search, $replacement, $value[ $v ] );
+						if ( isset( $value[$v] ) ) {
+							$value[$k] = str_replace( $search, $replacement, $value[$v] );
 						} else {
-							$value[ $k ] = str_replace( $search, $replacement, $v );
+							$value[$k] = str_replace( $search, $replacement, $v );
 						}
 					}
 					return $value;
@@ -210,7 +210,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;
 						}
 					}
@@ -268,13 +268,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'];
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 			)
 		);
 		if ( array_key_exists( $property, $properties ) ) {
-			$classname = $properties[ $property ];
+			$classname = $properties[$property];
 			$obj = new $classname( $property, $value );
 			return $obj->get_value();
 		}

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