aristath / kirki

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

Spacing +4 added lines, -4 removed lines

@@ -391,7 +391,7 @@ 
 		if ( false === $config_id ) {
 			return $translation_strings;
 		}
-		return $translation_strings[ $config_id ];
+		return $translation_strings[$config_id];
 	}
 
 	/**
@@ -410,7 +410,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;
@@ -484,7 +484,7 @@ 
 				if ( array_key_exists( $variant, $all_variants ) ) {
 					$available_variants[] = array(
 						'id' => $variant,
-						'label' => $all_variants[ $variant ],
+						'label' => $all_variants[$variant],
 					);
 				}
 			}
@@ -494,7 +494,7 @@ 
 				if ( array_key_exists( $subset, $all_subsets ) ) {
 					$available_subsets[] = array(
 						'id' => $subset,
-						'label' => $all_subsets[ $subset ],
+						'label' => $all_subsets[$subset],
 					);
 				}
 			}

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

Spacing +9 added lines, -9 removed lines

@@ -171,7 +171,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();
@@ -235,10 +235,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-*.
@@ -248,10 +248,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;
 						}
 					}
 				}

modules/postmessage/class-kirki-modules-postmessage.php

Spacing +4 added lines, -4 removed lines

@@ -88,10 +88,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   = '';
@@ -266,7 +266,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'] ) {
@@ -337,7 +337,7 @@ 
 			'units'         => '',
 			'js_callback'   => array( '', '' ),
 			'value_pattern' => '',
-		));
+		) );
 
 		// Element should be a string.
 		if ( is_array( $args['element'] ) ) {

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

Spacing +13 added lines, -26 removed lines

@@ -49,50 +49,37 @@
 		$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 );
 			$back_disabled = $back_disabled_obj->toCSS( $back_disabled_obj->mode );
 			$text_on_back_disabled = ( 60 > $back_disabled_obj->lightness ) ?
-				$back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) :
-				$back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode );
+				$back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode );
 			$border_on_back_disabled = ( 50 < $back_disabled_obj->lightness ) ?
-				$back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) :
-				$back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode );
+				$back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode );
 		}
 		$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/webfonts/class-kirki-modules-webfonts-async.php

Spacing +2 added lines, -2 removed lines

@@ -80,9 +80,9 @@
 		$fonts_to_load = array();
 		foreach ( $this->googlefonts->fonts as $font => $weights ) {
 			foreach ( $weights as $key => $value ) {
-				$weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
+				$weights[$key] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
 				if ( 'i' === $value ) {
-					$weights[ $key ] = '400i';
+					$weights[$key] = '400i';
 				}
 			}
 			$fonts_to_load[] = $font . ':' . join( ',', $weights );

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

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 		// Take care of font-families.
 		if ( isset( $value['font-family'] ) && ! empty( $value['font-family'] ) ) {
 			$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix'];
+			$this->styles[$output['media_query']][$output['element']]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix'];
 		}
 
 		$properties = array(
@@ -55,10 +55,10 @@ 
 			$value['font-family'] .= ', ' . $value['font-backup'];
 		}
 		foreach ( $properties as $property ) {
-			if ( ! isset( $value[ $property ] ) || '' === $value[ $property ] ) {
+			if ( ! isset( $value[$property] ) || '' === $value[$property] ) {
 				continue;
 			}
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $value[ $property ] . $output['suffix'];
+			$this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $value[$property] . $output['suffix'];
 		}
 	}
 }

modules/css/class-kirki-output.php

Spacing +12 added lines, -12 removed lines

@@ -102,8 +102,8 @@ 
 				if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) {
 					$option_type = 'theme_mod';
 					$option_name = false;
-					if ( isset( Kirki::$config[ $this->config_id ] ) ) {
-						$config = Kirki::$config[ $this->config_id ];
+					if ( isset( Kirki::$config[$this->config_id] ) ) {
+						$config = Kirki::$config[$this->config_id];
 						$option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod';
 						if ( 'option' === $option_type || 'site_option' === $option_type ) {
 							$option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false;
@@ -116,10 +116,10 @@ 
 						$replacement = '';
 						switch ( $option_type ) {
 							case 'option':
-								$replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_option( $replace );
+								$replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : 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();
@@ -213,9 +213,9 @@ 
 			return;
 		}
 		$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
-		$output['prefix']      = ( isset( $output['prefix'] ) )      ? $output['prefix']      : '';
-		$output['units']       = ( isset( $output['units'] ) )       ? $output['units']       : '';
-		$output['suffix']      = ( isset( $output['suffix'] ) )      ? $output['suffix']      : '';
+		$output['prefix']      = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';
+		$output['units']       = ( isset( $output['units'] ) ) ? $output['units'] : '';
+		$output['suffix']      = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
 
 		// Properties that can accept multiple values.
 		// Useful for example for gradients where all browsers use the "background-image" property
@@ -224,13 +224,13 @@ 
 			'background-image',
 		);
 		if ( in_array( $output['property'], $accepts_multiple ) ) {
-			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'] . $value . $output['units'] . $output['suffix'];
+		$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 			'background-position' => 'Kirki_Output_Property_Background_Position',
 		) );
 		if ( array_key_exists( $property, $properties ) ) {
-			$classname = $properties[ $property ];
+			$classname = $properties[$property];
 			$obj = new $classname( $property, $value );
 			return $obj->get_value();
 		}

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

Spacing +2 added lines, -2 removed lines

@@ -243,8 +243,8 @@
 				$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] );
 				}
 			}
 		}