aristath / kirki

modules/webfonts/class-kirki-fonts.php

Spacing +5 added lines, -5 removed lines

@@ -137,11 +137,11 @@
 
 		$google_fonts = array();
 		if ( is_array( $fonts ) ) {
-			foreach ( $fonts['items'] as $font ) {
-				$google_fonts[ $font['family'] ] = array(
-					'label'    => $font['family'],
-					'variants' => $font['variants'],
-					'category' => $font['category'],
+			foreach ( $fonts[ 'items' ] as $font ) {
+				$google_fonts[ $font[ 'family' ] ] = array(
+					'label'    => $font[ 'family' ],
+					'variants' => $font[ 'variants' ],
+					'category' => $font[ 'category' ],
 				);
 			}
 		}

modules/webfonts/class-kirki-modules-webfonts-async.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 		$fonts_to_load = $this->googlefonts->fonts;
 
 		if ( ! empty( $fonts_to_load ) && 'preconnect' === $relation_type ) {
-			$urls[] = array(
+			$urls[ ] = array(
 				'href' => 'https://fonts.gstatic.com',
 				'crossorigin',
 			);

field/class-kirki-field-typography.php

Spacing +22 added lines, -22 removed lines

@@ -49,13 +49,13 @@ 
 	protected function set_default() {
 
 		// Accomodate the use of font-weight and convert to variant.
-		if ( isset( $this->default['font-weight'] ) ) {
-			$this->default['variant'] = ( 'regular' === $this->default['font-weight'] ) ? 400 : (string) intval( $this->default['font-weight'] );
+		if ( isset( $this->default[ 'font-weight' ] ) ) {
+			$this->default[ 'variant' ] = ( 'regular' === $this->default[ 'font-weight' ] ) ? 400 : (string) intval( $this->default[ 'font-weight' ] );
 		}
 
 		// Make sure letter-spacing has units.
-		if ( isset( $this->default['letter-spacing'] ) && is_numeric( $this->default['letter-spacing'] ) && $this->default['letter-spacing'] ) {
-			$this->default['letter-spacing'] .= 'px';
+		if ( isset( $this->default[ 'letter-spacing' ] ) && is_numeric( $this->default[ 'letter-spacing' ] ) && $this->default[ 'letter-spacing' ] ) {
+			$this->default[ 'letter-spacing' ] .= 'px';
 		}
 	}
 
@@ -106,15 +106,15 @@ 
 			foreach ( $this->output as $output ) {
 
 				// If 'element' or 'property' are not defined, skip this.
-				if ( ! isset( $output['element'] ) ) {
+				if ( ! isset( $output[ 'element' ] ) ) {
 					continue;
 				}
-				if ( is_array( $output['element'] ) ) {
-					$output['element'] = implode( ',', $output['element'] );
+				if ( is_array( $output[ 'element' ] ) ) {
+					$output[ 'element' ] = implode( ',', $output[ 'element' ] );
 				}
 
 				// 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'?
@@ -146,26 +146,26 @@ 
 		foreach ( $value as $key => $val ) {
 			switch ( $key ) {
 				case 'font-family':
-					$value['font-family'] = esc_attr( $val );
+					$value[ 'font-family' ] = esc_attr( $val );
 					break;
 				case 'font-weight':
-					if ( isset( $value['variant'] ) ) {
+					if ( isset( $value[ 'variant' ] ) ) {
 						break;
 					}
-					$value['variant'] = $val;
-					if ( isset( $value['font-style'] ) && 'italic' === $value['font-style'] ) {
-						$value['variant'] = ( '400' !== $val || 400 !== $val ) ? $value['variant'] . 'italic' : 'italic';
+					$value[ 'variant' ] = $val;
+					if ( isset( $value[ 'font-style' ] ) && 'italic' === $value[ 'font-style' ] ) {
+						$value[ 'variant' ] = ( '400' !== $val || 400 !== $val ) ? $value[ 'variant' ] . 'italic' : 'italic';
 					}
 					break;
 				case 'variant':
 					// Use 'regular' instead of 400 for font-variant.
-					$value['variant'] = ( 400 === $val || '400' === $val ) ? 'regular' : $val;
+					$value[ 'variant' ] = ( 400 === $val || '400' === $val ) ? 'regular' : $val;
 					// Get font-weight from variant.
-					$value['font-weight'] = filter_var( $value['variant'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
-					$value['font-weight'] = ( 'regular' === $value['variant'] || 'italic' === $value['variant'] ) ? 400 : absint( $value['font-weight'] );
+					$value[ 'font-weight' ] = filter_var( $value[ 'variant' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+					$value[ 'font-weight' ] = ( 'regular' === $value[ 'variant' ] || 'italic' === $value[ 'variant' ] ) ? 400 : absint( $value[ 'font-weight' ] );
 					// Get font-style from variant.
-					if ( ! isset( $value['font-style'] ) ) {
-						$value['font-style'] = ( false === strpos( $value['variant'], 'italic' ) ) ? 'normal' : 'italic';
+					if ( ! isset( $value[ 'font-style' ] ) ) {
+						$value[ 'font-style' ] = ( false === strpos( $value[ 'variant' ], 'italic' ) ) ? 'normal' : 'italic';
 					}
 					break;
 				case 'font-size':
@@ -176,21 +176,21 @@ 
 					break;
 				case 'text-align':
 					if ( ! in_array( $val, array( 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) {
-						$value['text-align'] = 'inherit';
+						$value[ 'text-align' ] = 'inherit';
 					}
 					break;
 				case 'text-transform':
 					if ( ! in_array( $val, array( 'none', 'capitalize', 'uppercase', 'lowercase', 'initial', 'inherit' ), true ) ) {
-						$value['text-transform'] = 'none';
+						$value[ 'text-transform' ] = 'none';
 					}
 					break;
 				case 'text-decoration':
 					if ( ! in_array( $val, array( 'none', 'underline', 'overline', 'line-through', 'initial', 'inherit' ), true ) ) {
-						$value['text-transform'] = 'none';
+						$value[ 'text-transform' ] = 'none';
 					}
 					break;
 				case 'color':
-					$value['color'] = ariColor::newColor( $val )->toCSS( 'hex' );
+					$value[ 'color' ] = ariColor::newColor( $val )->toCSS( 'hex' );
 					break;
 			} // End switch().
 		} // End foreach().

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

Spacing +22 added lines, -22 removed lines

@@ -59,7 +59,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;
 		}
 
@@ -95,53 +95,53 @@ 
 	public function generate_google_font( $args ) {
 
 		// 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 we don't have a font-family then we can skip this.
-			if ( ! isset( $value['font-family'] ) ) {
+			if ( ! isset( $value[ 'font-family' ] ) ) {
 				return;
 			}
 
 			// If not a google-font, then we can skip this.
-			if ( ! Kirki_Fonts::is_google_font( $value['font-family'] ) ) {
+			if ( ! 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;
 				}
 
@@ -149,14 +149,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;
 							}
 						}
 					}
@@ -188,8 +188,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 ) {