aristath / kirki

modules/webfonts/class-kirki-fonts.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 			$google_fonts = array();
 			if ( is_array( $fonts ) ) {
 				foreach ( $fonts['items'] as $font ) {
-					$google_fonts[ $font['family'] ] = array(
+					$google_fonts[$font['family']] = array(
 						'label'    => $font['family'],
 						'variants' => $font['variants'],
 						'subsets'  => $font['subsets'],
@@ -146,7 +146,7 @@ 
 		$fonts = self::get_all_fonts();
 		$fonts_array = array();
 		foreach ( $fonts as $key => $args ) {
-			$fonts_array[ $key ] = $key;
+			$fonts_array[$key] = $key;
 		}
 		return $fonts_array;
 	}

modules/webfonts/class-kirki-fonts-google.php

Spacing +14 added lines, -14 removed lines

@@ -142,15 +142,15 @@ 
 			}
 
 			// 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'];
 			}
 			if ( ! empty( $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 {
@@ -169,12 +169,12 @@ 
 
 					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'] ) {
@@ -213,31 +213,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 ] );
-					unset( $this->fonts[ $font ][ $variant_key ] );
+					$variant_key = array_search( $variant, $this->fonts[$font] );
+					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;
 					}
 				}

core/class-kirki-setting-user-meta.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 		// @codingStandardsIgnoreLine
 		$single_meta = get_user_meta( get_current_user_id(), $id_base, true );
 
-		if ( isset( $user_meta[ $id_base ] ) ) {
+		if ( isset( $user_meta[$id_base] ) ) {
 			return $single_meta;
 		}
 		return $default;

core/class-kirki-settings.php

Spacing +4 added lines, -4 removed lines

@@ -68,12 +68,12 @@ 
 		// Get the classname we'll be using to create our setting(s).
 		$classname = false;
 		if ( isset( $args['option_type'] ) && array_key_exists( $args['option_type'], $this->setting_types ) ) {
-			$classname = $this->setting_types[ $args['option_type'] ];
+			$classname = $this->setting_types[$args['option_type']];
 		}
 		if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->setting_types ) ) {
 			$args['type'] = 'default';
 		}
-		$classname = ! $classname ? $this->setting_types[ $args['type'] ] : $classname;
+		$classname = ! $classname ? $this->setting_types[$args['type']] : $classname;
 
 		// If settings are defined as an array, then we need to go through them
 		// and call add_setting for each one of them separately.
@@ -84,7 +84,7 @@ 
 				$args['default'] = array();
 			}
 			foreach ( $args['settings'] as $key => $value ) {
-				$default   = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : '';
+				$default = ( isset( $defaults[$key] ) ) ? $defaults[$key] : '';
 				$this->add_setting( $classname, $value, $default, $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] );
 			}
 		}
@@ -136,7 +136,7 @@ 
 		foreach ( $this->setting_types as $key => $classname ) {
 
 			if ( ! class_exists( $classname ) ) {
-				unset( $this->setting_types[ $key ] );
+				unset( $this->setting_types[$key] );
 			}
 		}
 	}

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

modules/css/class-kirki-output.php

Spacing +13 added lines, -13 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;
@@ -119,16 +119,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();
@@ -222,9 +222,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
@@ -233,13 +233,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'];
 	}
 
 	/**
@@ -259,7 +259,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/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.