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,

field/class-kirki-field-url.php

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 		if ( ! is_array( $this->choices ) ) {
 			$this->choices = array();
 		}
-		$this->choices['element'] = 'input';
-		$this->choices['type']    = 'text';
+		$this->choices[ 'element' ] = 'input';
+		$this->choices[ 'type' ]    = 'text';
 
 	}
 

core/class-kirki.php

Spacing +19 added lines, -19 removed lines

@@ -144,7 +144,7 @@ 
 
 		$config = Kirki_Config::get_instance( $config_id, $args );
 		$config_args = $config->get_config();
-		self::$config[ $config_args['id'] ] = $config_args;
+		self::$config[ $config_args[ 'id' ] ] = $config_args;
 	}
 
 	/**
@@ -157,13 +157,13 @@ 
 	 */
 	public static function add_panel( $id = '', $args = array() ) {
 
-		$args['id']          = esc_attr( $id );
-		$args['description'] = ( isset( $args['description'] ) ) ? esc_textarea( $args['description'] ) : '';
-		$args['priority']    = ( isset( $args['priority'] ) ) ? esc_attr( $args['priority'] ) : 10;
-		$args['type']        = ( isset( $args['type'] ) ) ? $args['type'] : 'default';
-		$args['type']        = 'kirki-' . $args['type'];
+		$args[ 'id' ]          = esc_attr( $id );
+		$args[ 'description' ] = ( isset( $args[ 'description' ] ) ) ? esc_textarea( $args[ 'description' ] ) : '';
+		$args[ 'priority' ]    = ( isset( $args[ 'priority' ] ) ) ? esc_attr( $args[ 'priority' ] ) : 10;
+		$args[ 'type' ]        = ( isset( $args[ 'type' ] ) ) ? $args[ 'type' ] : 'default';
+		$args[ 'type' ]        = 'kirki-' . $args[ 'type' ];
 
-		self::$panels[ $args['id'] ] = $args;
+		self::$panels[ $args[ 'id' ] ] = $args;
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public static function remove_panel( $id = '' ) {
 		if ( ! in_array( $id, self::$panels_to_remove, true ) ) {
-			self::$panels_to_remove[] = $id;
+			self::$panels_to_remove[ ] = $id;
 		}
 	}
 
@@ -190,14 +190,14 @@ 
 	 */
 	public static function add_section( $id, $args ) {
 
-		$args['id']          = esc_attr( $id );
-		$args['panel']       = ( isset( $args['panel'] ) ) ? esc_attr( $args['panel'] ) : '';
-		$args['description'] = ( isset( $args['description'] ) ) ? esc_textarea( $args['description'] ) : '';
-		$args['priority']    = ( isset( $args['priority'] ) ) ? esc_attr( $args['priority'] ) : 10;
-		$args['type']        = ( isset( $args['type'] ) ) ? $args['type'] : 'default';
-		$args['type']        = 'kirki-' . $args['type'];
+		$args[ 'id' ]          = esc_attr( $id );
+		$args[ 'panel' ]       = ( isset( $args[ 'panel' ] ) ) ? esc_attr( $args[ 'panel' ] ) : '';
+		$args[ 'description' ] = ( isset( $args[ 'description' ] ) ) ? esc_textarea( $args[ 'description' ] ) : '';
+		$args[ 'priority' ]    = ( isset( $args[ 'priority' ] ) ) ? esc_attr( $args[ 'priority' ] ) : 10;
+		$args[ 'type' ]        = ( isset( $args[ 'type' ] ) ) ? $args[ 'type' ] : 'default';
+		$args[ 'type' ]        = 'kirki-' . $args[ 'type' ];
 
-		self::$sections[ $args['id'] ] = $args;
+		self::$sections[ $args[ 'id' ] ] = $args;
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 */
 	public static function remove_section( $id = '' ) {
 		if ( ! in_array( $id, self::$sections_to_remove, true ) ) {
-			self::$sections_to_remove[] = $id;
+			self::$sections_to_remove[ ] = $id;
 		}
 	}
 
@@ -229,11 +229,11 @@ 
 		}
 
 		// Early exit if 'type' is not defined.
-		if ( ! isset( $args['type'] ) ) {
+		if ( ! isset( $args[ 'type' ] ) ) {
 			return;
 		}
 
-		$str = str_replace( array( '-', '_' ), ' ', $args['type'] );
+		$str = str_replace( array( '-', '_' ), ' ', $args[ 'type' ] );
 		$classname = 'Kirki_Field_' . str_replace( ' ', '_', ucwords( $str ) );
 		if ( class_exists( $classname ) ) {
 			new $classname( $config_id, $args );
@@ -261,7 +261,7 @@ 
 	 */
 	public static function remove_control( $id ) {
 		if ( ! in_array( $id, self::$controls_to_remove, true ) ) {
-			self::$controls_to_remove[] = $id;
+			self::$controls_to_remove[ ] = $id;
 		}
 	}
 

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

Spacing +12 added lines, -12 removed lines

@@ -119,12 +119,12 @@ 
 
 		$config   = apply_filters( 'kirki/config', array() );
 		$priority = 999;
-		if ( isset( $config['styles_priority'] ) ) {
-			$priority = absint( $config['styles_priority'] );
+		if ( isset( $config[ 'styles_priority' ] ) ) {
+			$priority = absint( $config[ 'styles_priority' ] );
 		}
 
 		// Allow completely disabling Kirki CSS output.
-		if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config['disable_output'] ) && true === $config['disable_output'] ) ) {
+		if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config[ 'disable_output' ] ) && true === $config[ 'disable_output' ] ) ) {
 			return;
 		}
 
@@ -155,7 +155,7 @@ 
 
 		// If we are in the customizer, load CSS using inline-styles.
 		// If we are in the frontend AND self::$ajax is true, then load dynamic CSS using AJAX.
-		if ( ( true === self::$ajax ) || ( isset( $config['inline_css'] ) && false === $config['inline_css'] ) ) {
+		if ( ( true === self::$ajax ) || ( isset( $config[ 'inline_css' ] ) && false === $config[ 'inline_css' ] ) ) {
 			add_action( 'wp_enqueue_scripts', array( $this, 'frontend_styles' ), $priority );
 			add_action( 'wp_ajax_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) );
 			add_action( 'wp_ajax_nopriv_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) );
@@ -186,7 +186,7 @@ 
 		$configs = Kirki::$config;
 		if ( ! $this->processed ) {
 			foreach ( $configs as $config_id => $args ) {
-				if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) {
+				if ( isset( $args[ 'disable_output' ] ) && true === $args[ 'disable_output' ] ) {
 					continue;
 				}
 				$styles = self::loop_controls( $config_id );
@@ -243,19 +243,19 @@ 
 		foreach ( $fields as $field ) {
 
 			// Only process fields that belong to $config_id.
-			if ( $config_id !== $field['kirki_config'] ) {
+			if ( $config_id !== $field[ 'kirki_config' ] ) {
 				continue;
 			}
 
 			if ( true === apply_filters( "kirki/{$config_id}/css/skip_hidden", true ) ) {
 				// Only continue if field dependencies are met.
-				if ( ! empty( $field['required'] ) ) {
+				if ( ! empty( $field[ 'required' ] ) ) {
 					$valid = true;
 
-					foreach ( $field['required'] as $requirement ) {
-						if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) {
-							$controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] );
-							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) {
+					foreach ( $field[ 'required' ] as $requirement ) {
+						if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) {
+							$controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] );
+							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) {
 								$valid = false;
 							}
 						}
@@ -268,7 +268,7 @@ 
 			}
 
 			// Only continue if $field['output'] is set.
-			if ( isset( $field['output'] ) && ! empty( $field['output'] ) ) {
+			if ( isset( $field[ 'output' ] ) && ! empty( $field[ 'output' ] ) ) {
 				$css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
 
 				// Add the globals.

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

Spacing +6 added lines, -6 removed lines

@@ -164,18 +164,18 @@
 	 */
 	public function loop_fields( $config_id ) {
 		foreach ( Kirki::$fields as $field ) {
-			if ( isset( $field['kirki_config'] ) && $config_id !== $field['kirki_config'] ) {
+			if ( isset( $field[ 'kirki_config' ] ) && $config_id !== $field[ 'kirki_config' ] ) {
 				continue;
 			}
 			if ( true === apply_filters( "kirki/{$config_id}/webfonts/skip_hidden", true ) ) {
 				// Only continue if field dependencies are met.
-				if ( ! empty( $field['required'] ) ) {
+				if ( ! empty( $field[ 'required' ] ) ) {
 					$valid = true;
 
-					foreach ( $field['required'] as $requirement ) {
-						if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) {
-							$controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] );
-							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) {
+					foreach ( $field[ 'required' ] as $requirement ) {
+						if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) {
+							$controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] );
+							if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) {
 								$valid = false;
 							}
 						}