aristath / kirki

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

Spacing +30 added lines, -30 removed lines

@@ -39,7 +39,7 @@ 
 		if ( Kirki_Util::get_wp_version() >= 4.9 ) {
 			return;
 		}
-		$custom_fonts_array  = ( isset( $this->choices['fonts'] ) && ( isset( $this->choices['fonts']['google'] ) || isset( $this->choices['fonts']['standard'] ) ) && ( ! empty( $this->choices['fonts']['google'] ) || ! empty( $this->choices['fonts']['standard'] ) ) );
+		$custom_fonts_array  = ( isset( $this->choices[ 'fonts' ] ) && ( isset( $this->choices[ 'fonts' ][ 'google' ] ) || isset( $this->choices[ 'fonts' ][ 'standard' ] ) ) && ( ! empty( $this->choices[ 'fonts' ][ 'google' ] ) || ! empty( $this->choices[ 'fonts' ][ 'standard' ] ) ) );
 		$localize_script_var = ( $custom_fonts_array ) ? 'kirkiFonts' . $this->id : 'kirkiAllFonts';
 		wp_localize_script(
 			'kirki-script', $localize_script_var, array(
@@ -57,25 +57,25 @@ 
 	public function to_json() {
 		parent::to_json();
 
-		if ( is_array( $this->json['value'] ) ) {
-			foreach ( array_keys( $this->json['value'] ) as $key ) {
-				if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][ $key ] ) ) {
-					unset( $this->json['value'][ $key ] );
+		if ( is_array( $this->json[ 'value' ] ) ) {
+			foreach ( array_keys( $this->json[ 'value' ] ) as $key ) {
+				if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json[ 'default' ][ $key ] ) ) {
+					unset( $this->json[ 'value' ][ $key ] );
 				}
 				// Fix for https://wordpress.org/support/topic/white-font-after-updateing-to-3-0-16.
-				if ( ! isset( $this->json['default'][ $key ] ) ) {
-					unset( $this->json['value'][ $key ] );
+				if ( ! isset( $this->json[ 'default' ][ $key ] ) ) {
+					unset( $this->json[ 'value' ][ $key ] );
 				}
 				// Fix for https://github.com/aristath/kirki/issues/1405.
-				if ( isset( $this->json['default'][ $key ] ) && false === $this->json['default'][ $key ] ) {
-					unset( $this->json['value'][ $key ] );
+				if ( isset( $this->json[ 'default' ][ $key ] ) && false === $this->json[ 'default' ][ $key ] ) {
+					unset( $this->json[ 'value' ][ $key ] );
 				}
 			}
 		}
 
-		$this->json['show_variants'] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
-		$this->json['show_subsets']  = ( true === Kirki_Fonts_Google::$force_load_all_subsets ) ? false : true;
-		$this->json['languages']     = Kirki_Fonts::get_google_font_subsets();
+		$this->json[ 'show_variants' ] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
+		$this->json[ 'show_subsets' ]  = ( true === Kirki_Fonts_Google::$force_load_all_subsets ) ? false : true;
+		$this->json[ 'languages' ]     = Kirki_Fonts::get_google_font_subsets();
 	}
 
 	/**
@@ -282,12 +282,12 @@ 
 		$final_variants = array();
 		foreach ( $variants as $variant ) {
 			if ( is_string( $variant ) ) {
-				$final_variants[] = array(
+				$final_variants[ ] = array(
 					'id'    => $variant,
 					'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant,
 				);
-			} elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) {
-				$final_variants[] = $variant;
+			} elseif ( is_array( $variant ) && isset( $variant[ 'id' ] ) && isset( $variant[ 'label' ] ) ) {
+				$final_variants[ ] = $variant;
 			}
 		}
 		return $final_variants;
@@ -305,8 +305,8 @@ 
 		$standard_fonts = Kirki_Fonts::get_standard_fonts();
 
 		$std_user_keys = array();
-		if ( isset( $this->choices['fonts'] ) && isset( $this->choices['fonts']['standard'] ) ) {
-			$std_user_keys = $this->choices['fonts']['standard'];
+		if ( isset( $this->choices[ 'fonts' ] ) && isset( $this->choices[ 'fonts' ][ 'standard' ] ) ) {
+			$std_user_keys = $this->choices[ 'fonts' ][ 'standard' ];
 		}
 
 		$standard_fonts_final = array();
@@ -319,15 +319,15 @@ 
 			)
 		);
 		foreach ( $standard_fonts as $key => $font ) {
-			if ( ( ! empty( $std_user_keys ) && ! in_array( $key, $std_user_keys, true ) ) || ! isset( $font['stack'] ) || ! isset( $font['label'] ) ) {
+			if ( ( ! empty( $std_user_keys ) && ! in_array( $key, $std_user_keys, true ) ) || ! isset( $font[ 'stack' ] ) || ! isset( $font[ 'label' ] ) ) {
 				continue;
 			}
-			$standard_fonts_final[] = array(
-				'family'      => $font['stack'],
-				'label'       => $font['label'],
+			$standard_fonts_final[ ] = array(
+				'family'      => $font[ 'stack' ],
+				'label'       => $font[ 'label' ],
 				'subsets'     => array(),
 				'is_standard' => true,
-				'variants'    => ( isset( $font['variants'] ) ) ? $this->format_variants_array( $font['variants'] ) : $default_variants,
+				'variants'    => ( isset( $font[ 'variants' ] ) ) ? $this->format_variants_array( $font[ 'variants' ] ) : $default_variants,
 			);
 		}
 		return $standard_fonts_final;
@@ -347,8 +347,8 @@ 
 		$all_subsets  = Kirki_Fonts::get_google_font_subsets();
 
 		$gf_user_keys = array();
-		if ( isset( $this->choices['fonts'] ) && isset( $this->choices['fonts']['google'] ) ) {
-			$gf_user_keys = $this->choices['fonts']['google'];
+		if ( isset( $this->choices[ 'fonts' ] ) && isset( $this->choices[ 'fonts' ][ 'google' ] ) ) {
+			$gf_user_keys = $this->choices[ 'fonts' ][ 'google' ];
 		}
 
 		$google_fonts_final = array();
@@ -357,15 +357,15 @@ 
 				continue;
 			}
 
-			$label    = ( isset( $args['label'] ) ) ? $args['label'] : $family;
-			$variants = ( isset( $args['variants'] ) ) ? $args['variants'] : array( 'regular', '700' );
-			$subsets  = ( isset( $args['subsets'] ) ) ? $args['subsets'] : array();
+			$label    = ( isset( $args[ 'label' ] ) ) ? $args[ 'label' ] : $family;
+			$variants = ( isset( $args[ 'variants' ] ) ) ? $args[ 'variants' ] : array( 'regular', '700' );
+			$subsets  = ( isset( $args[ 'subsets' ] ) ) ? $args[ 'subsets' ] : array();
 
 			$available_variants = array();
 			if ( is_array( $variants ) ) {
 				foreach ( $variants as $variant ) {
 					if ( array_key_exists( $variant, $all_variants ) ) {
-						$available_variants[] = array(
+						$available_variants[ ] = array(
 							'id' => $variant,
 							'label' => $all_variants[ $variant ],
 						);
@@ -377,7 +377,7 @@ 
 			if ( is_array( $subsets ) ) {
 				foreach ( $subsets as $subset ) {
 					if ( array_key_exists( $subset, $all_subsets ) ) {
-						$available_subsets[] = array(
+						$available_subsets[ ] = array(
 							'id' => $subset,
 							'label' => $all_subsets[ $subset ],
 						);
@@ -385,7 +385,7 @@ 
 				}
 			}
 
-			$google_fonts_final[] = array(
+			$google_fonts_final[ ] = array(
 				'family'       => $family,
 				'label'        => $label,
 				'variants'     => $available_variants,