aristath / kirki

modules/css/property/class-kirki-output-property-font-family.php

Spacing +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
 		// Add backup font.
 		if ( Kirki_Fonts::is_google_font( $family ) ) {
 
-			if ( '' === $backup && isset( $google_fonts_array[ $family ] ) && isset( $backup_fonts[ $google_fonts_array[ $family ]['category'] ] ) ) {
-				$backup = $backup_fonts[ $google_fonts_array[ $family ]['category'] ];
+			if ( '' === $backup && isset( $google_fonts_array[$family] ) && isset( $backup_fonts[$google_fonts_array[$family]['category']] ) ) {
+				$backup = $backup_fonts[$google_fonts_array[$family]['category']];
 			}
 
 			// Add double quotes if needed.

core/class-kirki-values.php

Spacing +15 added lines, -15 removed lines

@@ -43,43 +43,43 @@ 
 		$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 );
 			return apply_filters( 'kirki/values/get_value', $value, $field_id );
 		}
 
-		if ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( '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 ) );
 
-				$default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) ? Kirki::$fields[ $field_id ]['default'] : '';
-				$value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value;
+				$default_value = ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['default'] ) ) ? Kirki::$fields[$field_id]['default'] : '';
+				$value = ( isset( $options[$setting_modified] ) ) ? $options[$setting_modified] : $default_value;
 				$value = maybe_unserialize( $value );
 				return apply_filters( 'kirki/values/get_value', $value, $field_id );
 			}
 
 			// 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'] );
 			return apply_filters( 'kirki/values/get_value', $value, $field_id );
 
 		} // End if().
@@ -104,8 +104,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/postmessage/class-kirki-modules-postmessage.php

Spacing +5 added lines, -5 removed lines

@@ -113,10 +113,10 @@ 
 			$js_var['index_key'] = $key;
 			$callback = $this->get_callback( $args );
 			if ( is_callable( $callback ) ) {
-				$field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) );
+				$field['scripts'][$key] = call_user_func_array( $callback, array( $js_var, $args ) );
 				continue;
 			}
-			$field['scripts'][ $key ] = $this->script_var( $js_var );
+			$field['scripts'][$key] = $this->script_var( $js_var );
 		}
 		$combo_extra_script = '';
 		$combo_css_script   = '';
@@ -207,7 +207,7 @@ 
 		$property_script = '';
 
 		// Define choice.
-		$choice  = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : '';
+		$choice = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : '';
 
 		$value_key = 'newval' . $args['index_key'];
 		$property_script .= $value_key . '=newval;';
@@ -297,7 +297,7 @@ 
 			'font-weight'    => 'fontWeight',
 			'font-style'     => 'fontStyle',
 		);
-		$choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) );
+		$choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[$args['choice']] ) );
 		$script .= ( ! $choice_condition ) ? $webfont_loader : '';
 		foreach ( $css_build_array as $property => $var ) {
 			if ( $choice_condition && $property !== $args['choice'] ) {
@@ -378,7 +378,7 @@ 
 			'units'         => '',
 			'js_callback'   => array( '', '' ),
 			'value_pattern' => '',
-		));
+		) );
 
 		// Element should be a string.
 		if ( is_array( $args['element'] ) ) {

modules/css/class-kirki-modules-css-generator.php

Spacing +9 added lines, -9 removed lines

@@ -172,7 +172,7 @@ 
 			'kirki-multicolor'  => 'Kirki_Output_Field_Multicolor',
 		) );
 		if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
-			$classname = $field_output_classes[ self::$field_type ];
+			$classname = $field_output_classes[self::$field_type];
 		}
 		$obj = new $classname( $field['kirki_config'], self::$output, self::$value );
 		return $obj->get_styles();
@@ -247,10 +247,10 @@ 
 							'transition',
 							'transition-property',
 						), true ) ) {
-							unset( $css[ $media_query ][ $element ][ $property ] );
-							$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
-							$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
-							$css[ $media_query ][ $element ][ $property ]              = $value;
+							unset( $css[$media_query][$element][$property] );
+							$css[$media_query][$element]['-webkit-' . $property] = $value;
+							$css[$media_query][$element]['-moz-' . $property]    = $value;
+							$css[$media_query][$element][$property]              = $value;
 						}
 
 						// Add -ms-* and -o-*.
@@ -260,10 +260,10 @@ 
 							'transition',
 							'transition-property',
 						), true ) ) {
-							unset( $css[ $media_query ][ $element ][ $property ] );
-							$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
-							$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
-							$css[ $media_query ][ $element ][ $property ]          = $value;
+							unset( $css[$media_query][$element][$property] );
+							$css[$media_query][$element]['-ms-' . $property] = $value;
+							$css[$media_query][$element]['-o-' . $property]  = $value;
+							$css[$media_query][$element][$property]          = $value;
 						}
 					}
 				}

l10n.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
 
 			// If the theme's textdomain is loaded, assign the theme's translations
 			// to the "kirki" textdomain.
-			if ( isset( $l10n[ $theme_textdomain ] ) ) {
+			if ( isset( $l10n[$theme_textdomain] ) ) {
 				// @codingStandardsIgnoreLine
-				$l10n[ $domain ] = $l10n[ $theme_textdomain ];
+				$l10n[$domain] = $l10n[$theme_textdomain];
 			}
 
 			// Always override.  We only want the theme to handle translations.

controls/dimensions/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;
 				}
 			}
 		}

controls/repeater/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.

modules/customizer-styling/class-kirki-modules-customizer-styling.php

Spacing +11 added lines, -22 removed lines

@@ -75,43 +75,32 @@
 		$back_obj = ( $back ) ? ariColor::newColor( $back ) : false;
 		if ( $back ) {
 			$text_on_back = ( 60 > $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode );
 			$border_on_back = ( 80 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode );
 			$back_on_back = ( 90 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode );
 			$hover_on_back = ( 90 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode );
 			$arrows_on_back = ( 50 > $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode );
+				$back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode );
 			$back_disabled_obj = ( 35 < $back_obj->lightness ) ?
-				$back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) :
-				$back_obj->getNew( 'lightness', $back_obj->lightness + 30 );
+				$back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 30 );
 		}
 		$accent     = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false;
 		$accent_obj = ( $accent ) ? ariColor::newColor( $accent ) : false;
 		if ( $accent ) {
 			$text_on_accent = ( 60 > $accent_obj->lightness ) ?
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) :
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode );
+				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode );
 			$border_on_accent = ( 50 < $accent_obj->lightness ) ?
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) :
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode );
+				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode );
 			$accent_disabled_obj = ( 35 < $accent_obj->lightness ) ?
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) :
-				$accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 );
+				$accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 );
 			$accent_disabled = $accent_disabled_obj->toCSS( $accent_disabled_obj->mode );
 			$text_on_accent_disabled = ( 60 > $accent_disabled_obj->lightness ) ?
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) :
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode );
+				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode );
 			$border_on_accent_disabled = ( 50 < $accent_disabled_obj->lightness ) ?
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) :
-				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode );
+				$accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode );
 		}
 
 		if ( $back ) {

modules/css/field/class-kirki-output-field-typography.php

Spacing +3 added lines, -3 removed lines

@@ -44,14 +44,14 @@ 
 		);
 
 		foreach ( $properties as $property ) {
-			if ( ! isset( $value[ $property ] ) || ! $value[ $property ] ) {
+			if ( ! isset( $value[$property] ) || ! $value[$property] ) {
 				continue;
 			}
 			if ( isset( $output['choice'] ) && $output['choice'] !== $property ) {
 				continue;
 			}
 
-			$property_value = $this->process_property_value( $property, $value[ $property ] );
+			$property_value = $this->process_property_value( $property, $value[$property] );
 			if ( 'font-family' === $property ) {
 				$value['font-backup'] = ( isset( $value['font-backup'] ) ) ? $value['font-backup'] : '';
 				$property_value = $this->process_property_value( $property, array(
@@ -60,7 +60,7 @@ 
 				) );
 			}
 			$property_value = ( is_array( $property_value ) && isset( $property_value[0] ) ) ? $property_value[0] : $property_value;
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $property_value . $output['suffix'];
+			$this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $property_value . $output['suffix'];
 		}
 	}
 }