aristath / kirki

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

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

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

Braces +5 added lines, -2 removed lines

@@ -336,7 +336,8 @@ 
 		</div>
 		<?php if ( Kirki_Util::get_wp_version() >= 4.9 ) : ?>
 			<input class="typography-hidden-value" type="hidden" {{{ data.link }}}>
-		<?php else : ?>
+		<?php else {
+	: ?>
 			<#
 			if ( ! _.isUndefined( data.value['font-family'] ) ) {
 				data.value['font-family'] = data.value['font-family'].replace( /&quot;/g, '&#39' );
@@ -344,7 +345,9 @@ 
 			valueJSON = JSON.stringify( data.value ).replace( /'/g, '&#39' );
 			#>
 			<input class="typography-hidden-value" type="hidden" value='{{{ valueJSON }}}' {{{ data.link }}}>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?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],
 						);
 					}
 				}

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-multicolor.php

Braces +5 added lines, -2 removed lines

@@ -68,9 +68,12 @@
 		<div class="iris-target"></div>
 		<?php if ( Kirki_Util::get_wp_version() >= 4.9 ) : ?>
 			<input class="multicolor-hidden-value" type="hidden" {{{ data.link }}}>
-		<?php else : ?>
+		<?php else {
+	: ?>
 			<input class="multicolor-hidden-value" type="hidden" value='{{{ JSON.stringify( data.value ) }}}' {{{ data.link }}}>
-		<?php endif; ?>
+		<?php endif;
+}
+?>
 		<?php
 	}
 }

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