aristath / kirki

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

Spacing +24 added lines, -24 removed lines

@@ -77,7 +77,7 @@ 
 		$config = apply_filters( 'kirki_config', array() );
 
 		// If we have set $config['disable_google_fonts'] to true then do not proceed any further.
-		if ( isset( $config['disable_google_fonts'] ) && true === $config['disable_google_fonts'] ) {
+		if ( isset( $config[ 'disable_google_fonts' ] ) && true === $config[ 'disable_google_fonts' ] ) {
 			return;
 		}
 
@@ -115,57 +115,57 @@ 
 		global $wp_customize;
 
 		// Process typography fields.
-		if ( isset( $args['type'] ) && 'kirki-typography' === $args['type'] ) {
+		if ( isset( $args[ 'type' ] ) && 'kirki-typography' === $args[ 'type' ] ) {
 
 			// Get the value.
 			$value = Kirki_Values::get_sanitized_field_value( $args );
 
-			if ( isset( $value['downloadFont'] ) && $value['downloadFont'] ) {
-				$this->hosted_fonts[] = $value['font-family'];
+			if ( isset( $value[ 'downloadFont' ] ) && $value[ 'downloadFont' ] ) {
+				$this->hosted_fonts[ ] = $value[ 'font-family' ];
 			}
 
 			// If we don't have a font-family then we can skip this.
-			if ( ! $wp_customize && ( ! isset( $value['font-family'] ) || in_array( $value['font-family'], $this->hosted_fonts ) ) ) {
+			if ( ! $wp_customize && ( ! isset( $value[ 'font-family' ] ) || in_array( $value[ 'font-family' ], $this->hosted_fonts ) ) ) {
 				return;
 			}
 
 			// If not a google-font, then we can skip this.
-			if ( ! isset( $value['font-family'] ) || ! Kirki_Fonts::is_google_font( $value['font-family'] ) ) {
+			if ( ! isset( $value[ 'font-family' ] ) || ! Kirki_Fonts::is_google_font( $value[ 'font-family' ] ) ) {
 				return;
 			}
 
 			// Set a default value for variants.
-			if ( ! isset( $value['variant'] ) ) {
-				$value['variant'] = 'regular';
+			if ( ! isset( $value[ 'variant' ] ) ) {
+				$value[ 'variant' ] = 'regular';
 			}
 
 			// 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' ];
 			}
 			// Are we force-loading all variants?
 			if ( true === self::$force_load_all_variants ) {
 				$all_variants               = Kirki_Fonts::get_all_variants();
-				$args['choices']['variant'] = array_keys( $all_variants );
+				$args[ 'choices' ][ 'variant' ] = array_keys( $all_variants );
 			}
 
-			if ( ! empty( $args['choices']['variant'] ) && is_array( $args['choices']['variant'] ) ) {
-				foreach ( $args['choices']['variant'] as $extra_variant ) {
-					$this->fonts[ $value['font-family'] ][] = $extra_variant;
+			if ( ! empty( $args[ 'choices' ][ 'variant' ] ) && is_array( $args[ 'choices' ][ 'variant' ] ) ) {
+				foreach ( $args[ 'choices' ][ 'variant' ] as $extra_variant ) {
+					$this->fonts[ $value[ 'font-family' ] ][ ] = $extra_variant;
 				}
 			}
 			return;
 		}
 
 		// Process non-typography fields.
-		if ( isset( $args['output'] ) && is_array( $args['output'] ) ) {
-			foreach ( $args['output'] as $output ) {
+		if ( isset( $args[ 'output' ] ) && is_array( $args[ 'output' ] ) ) {
+			foreach ( $args[ 'output' ] as $output ) {
 
 				// If we don't have a typography-related output argument we can skip this.
-				if ( ! isset( $output['property'] ) || ! in_array( $output['property'], array( 'font-family', 'font-weight' ), true ) ) {
+				if ( ! isset( $output[ 'property' ] ) || ! in_array( $output[ 'property' ], array( 'font-family', 'font-weight' ), true ) ) {
 					continue;
 				}
 
@@ -173,14 +173,14 @@ 
 				$value = Kirki_Values::get_sanitized_field_value( $args );
 
 				if ( is_string( $value ) ) {
-					if ( 'font-family' === $output['property'] ) {
+					if ( 'font-family' === $output[ 'property' ] ) {
 						if ( ! array_key_exists( $value, $this->fonts ) ) {
 							$this->fonts[ $value ] = array();
 						}
-					} elseif ( 'font-weight' === $output['property'] ) {
+					} 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;
 							}
 						}
 					}
@@ -212,8 +212,8 @@ 
 
 			// 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 ) {
 

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

Spacing +8 added lines, -8 removed lines

@@ -68,10 +68,10 @@ 
 	public function custom_css() {
 
 		$config = apply_filters( 'kirki_config', array() );
-		if ( ! isset( $config['color_accent'] ) && ! isset( $config['color_back'] ) ) {
+		if ( ! isset( $config[ 'color_accent' ] ) && ! isset( $config[ 'color_back' ] ) ) {
 			return;
 		}
-		$back     = isset( $config['color_back'] ) ? $config['color_back'] : false;
+		$back = isset( $config[ 'color_back' ] ) ? $config[ 'color_back' ] : false;
 
 		$text_on_back              = '';
 		$border_on_back            = '';
@@ -93,7 +93,7 @@ 
 			$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 );
 			$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 );
 		}
-		$accent     = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false;
+		$accent = ( isset( $config[ 'color_accent' ] ) ) ? $config[ 'color_accent' ] : false;
 		if ( $accent ) {
 			$accent_obj                = ariColor::newColor( $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 );
@@ -405,18 +405,18 @@ 
 			color: #444 !important;
 		}
 
-		<?php if ( isset( $config['width'] ) ) : ?>
+		<?php if ( isset( $config[ 'width' ] ) ) : ?>
 			.wp-full-overlay-sidebar {
-				width: <?php echo esc_attr( $config['width'] ); ?>;
+				width: <?php echo esc_attr( $config[ 'width' ] ); ?>;
 			}
 			.expanded .wp-full-overlay-footer {
-				width: <?php echo esc_attr( $config['width'] ); ?>;
+				width: <?php echo esc_attr( $config[ 'width' ] ); ?>;
 			}
 			.wp-full-overlay.expanded {
-				margin-left: <?php echo esc_attr( $config['width'] ); ?>;
+				margin-left: <?php echo esc_attr( $config[ 'width' ] ); ?>;
 			}
 			.wp-full-overlay.collapsed .wp-full-overlay-sidebar {
-				margin-left: -<?php echo esc_attr( $config['width'] ); ?>;
+				margin-left: -<?php echo esc_attr( $config[ 'width' ] ); ?>;
 			}
 		<?php endif; ?>
 		</style>

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

Spacing +5 added lines, -5 removed lines

@@ -203,13 +203,13 @@ 
 		}
 
 		// Return regular if the one we want could not be found.
-		if ( isset( $local_urls['regular'] ) ) {
-			return $local_urls['regular'];
+		if ( isset( $local_urls[ 'regular' ] ) ) {
+			return $local_urls[ 'regular' ];
 		}
 
 		// Return the first available if all else failed.
 		$vals = array_values( $local_urls );
-		return $vals[0];
+		return $vals[ 0 ];
 	}
 
 	/**
@@ -401,7 +401,7 @@ 
 	public function get_root_path() {
 		// Get the upload directory for this site.
 		$upload_dir = wp_upload_dir();
-		$path       = untrailingslashit( wp_normalize_path( $upload_dir['basedir'] ) ) . '/webfonts';
+		$path       = untrailingslashit( wp_normalize_path( $upload_dir[ 'basedir' ] ) ) . '/webfonts';
 
 		// If the folder doesn't exist, create it.
 		if ( ! file_exists( $path ) ) {
@@ -426,7 +426,7 @@ 
 		$upload_dir = wp_upload_dir();
 
 		// The URL.
-		$url = trailingslashit( $upload_dir['baseurl'] );
+		$url = trailingslashit( $upload_dir[ 'baseurl' ] );
 		// Take care of domain mapping.
 		// When using domain mapping we have to make sure that the URL to the file
 		// does not include the original domain but instead the mapped domain.

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

Spacing +3 added lines, -3 removed lines

@@ -36,12 +36,12 @@
 		foreach ( array( 'background-image', 'background-color', 'background-repeat', 'background-position', 'background-size', 'background-attachment' ) as $property ) {
 
 			// See https://github.com/aristath/kirki/issues/1808.
-			if ( 'background-color' === $property && isset( $value['background-color'] ) && $value['background-color'] && ( ! isset( $value['background-image'] ) || empty( $value['background-image'] ) ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = $output['prefix'] . $this->process_property_value( $property, $value[ $property ] ) . $output['suffix'];
+			if ( 'background-color' === $property && isset( $value[ 'background-color' ] ) && $value[ 'background-color' ] && ( ! isset( $value[ 'background-image' ] ) || empty( $value[ 'background-image' ] ) ) ) {
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'background' ] = $output[ 'prefix' ] . $this->process_property_value( $property, $value[ $property ] ) . $output[ 'suffix' ];
 			}
 
 			if ( isset( $value[ $property ] ) && ! empty( $value[ $property ] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $this->process_property_value( $property, $value[ $property ] ) . $output['suffix'];
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $property ] = $output[ 'prefix' ] . $this->process_property_value( $property, $value[ $property ] ) . $output[ 'suffix' ];
 			}
 		}
 	}

core/class-kirki-field.php

Spacing +34 added lines, -34 removed lines

@@ -243,28 +243,28 @@ 
 	 */
 	public function __construct( $config_id = 'global', $args = array() ) {
 
-		if ( isset( $args['setting'] ) && ! empty( $args['setting'] ) && ( ! isset( $args['settings'] ) || empty( $args['settings'] ) ) ) {
+		if ( isset( $args[ 'setting' ] ) && ! empty( $args[ 'setting' ] ) && ( ! isset( $args[ 'settings' ] ) || empty( $args[ 'settings' ] ) ) ) {
 			/* translators: %s represents the field ID where the error occurs. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args['settings'] ) ), '3.0.10' );
-			$args['settings'] = $args['setting'];
-			unset( $args['setting'] );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args[ 'settings' ] ) ), '3.0.10' );
+			$args[ 'settings' ] = $args[ 'setting' ];
+			unset( $args[ 'setting' ] );
 		}
 
 		// In case the user only provides 1 argument,
 		// assume that the provided argument is $args and set $config_id = 'global'.
 		if ( is_array( $config_id ) && empty( $args ) ) {
 			/* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
 			$args      = $config_id;
 			$config_id = 'global';
 		}
 
-		$args['kirki_config'] = $config_id;
+		$args[ 'kirki_config' ] = $config_id;
 
 		$this->kirki_config = trim( esc_attr( $config_id ) );
 		if ( '' === $config_id ) {
 			/* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
 			$this->kirki_config = 'global';
 		}
 
@@ -272,7 +272,7 @@ 
 		$defaults = get_class_vars( __CLASS__ );
 
 		// Get the config arguments, and merge them with the defaults.
-		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
+		$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 ];
 		}
@@ -420,7 +420,7 @@ 
 			$this->partial_refresh = array();
 		}
 		foreach ( $this->partial_refresh as $id => $args ) {
-			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
+			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 ] );
@@ -458,8 +458,8 @@ 
 			}
 		}
 		$this->settings = $settings;
-		if ( isset( $this->settings['kirki_placeholder_setting'] ) ) {
-			$this->settings = $this->settings['kirki_placeholder_setting'];
+		if ( isset( $this->settings[ 'kirki_placeholder_setting' ] ) ) {
+			$this->settings = $this->settings[ 'kirki_placeholder_setting' ];
 		}
 	}
 
@@ -481,7 +481,7 @@ 
 						unset( $this->active_callback[ $key ] );
 					}
 				}
-				if ( isset( $this->active_callback[0] ) ) {
+				if ( isset( $this->active_callback[ 0 ] ) ) {
 					$this->required = $this->active_callback;
 				}
 			}
@@ -568,34 +568,34 @@ 
 			);
 		}
 		// Convert to array of arrays if needed.
-		if ( isset( $this->output['element'] ) ) {
+		if ( isset( $this->output[ 'element' ] ) ) {
 			/* translators: The field ID where the error occurs. */
 			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"output" invalid format in field %s. The "output" argument should be defined as an array of arrays.', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
 			$this->output = array( $this->output );
 		}
 		foreach ( $this->output as $key => $output ) {
-			if ( empty( $output ) || ! isset( $output['element'] ) ) {
+			if ( empty( $output ) || ! isset( $output[ 'element' ] ) ) {
 				unset( $this->output[ $key ] );
 				continue;
 			}
-			if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) {
-				$this->output[ $key ]['sanitize_callback'] = $output['callback'];
+			if ( ! isset( $output[ 'sanitize_callback' ] ) && isset( $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'] );
+			if ( isset( $output[ 'element' ] ) && is_array( $output[ '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' ] ) );
 		}
 	}
 
@@ -628,23 +628,23 @@ 
 
 			// Start going through each item in the $output array.
 			foreach ( $this->output as $output ) {
-				$output['function'] = ( isset( $output['function'] ) ) ? $output['function'] : 'style';
+				$output[ 'function' ] = ( isset( $output[ 'function' ] ) ) ? $output[ 'function' ] : 'style';
 
 				// If 'element' or 'property' are not defined, skip this.
-				if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) {
+				if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) {
 					continue;
 				}
-				if ( is_array( $output['element'] ) ) {
-					$output['element'] = implode( ',', $output['element'] );
+				if ( is_array( $output[ 'element' ] ) ) {
+					$output[ 'element' ] = implode( ',', $output[ 'element' ] );
 				}
 
 				// If there's a sanitize_callback defined skip this, unless we also have a js_callback defined.
-				if ( isset( $output['sanitize_callback'] ) && ! empty( $output['sanitize_callback'] ) && ! isset( $output['js_callback'] ) ) {
+				if ( isset( $output[ 'sanitize_callback' ] ) && ! empty( $output[ 'sanitize_callback' ] ) && ! isset( $output[ 'js_callback' ] ) ) {
 					continue;
 				}
 
 				// If we got this far, it's safe to add this.
-				$js_vars[] = $output;
+				$js_vars[ ] = $output;
 			}
 
 			// Did we manage to get all the items from 'output'?
@@ -669,7 +669,7 @@ 
 			$variable        = ( is_string( $this->variables ) && ! empty( $this->variables ) ) ? $this->variables : false;
 			$this->variables = array();
 			if ( $variable && empty( $this->variables ) ) {
-				$this->variables[0]['name'] = $variable;
+				$this->variables[ 0 ][ 'name' ] = $variable;
 			}
 		}
 	}
@@ -717,12 +717,12 @@ 
 		if ( is_string( $this->css_vars ) ) {
 			$this->css_vars = array( $this->css_vars );
 		}
-		if ( isset( $this->css_vars[0] ) && is_string( $this->css_vars[0] ) ) {
+		if ( isset( $this->css_vars[ 0 ] ) && is_string( $this->css_vars[ 0 ] ) ) {
 			$this->css_vars = array( $this->css_vars );
 		}
 		foreach ( $this->css_vars as $key => $val ) {
-			if ( ! isset( $val[1] ) ) {
-				$this->css_vars[ $key ][1] = '$';
+			if ( ! isset( $val[ 1 ] ) ) {
+				$this->css_vars[ $key ][ 1 ] = '$';
 			}
 		}
 	}