aristath / kirki

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

Spacing +28 added lines, -28 removed lines

@@ -76,28 +76,28 @@ 
 
 		if ( empty( $this->button_label ) ) {
 			/* translators: %s represents the label of the row. */
-			$this->button_label = sprintf( esc_attr__( 'Add new %s', 'kirki' ), $this->row_label['value'] );
+			$this->button_label = sprintf( esc_attr__( 'Add new %s', 'kirki' ), $this->row_label[ 'value' ] );
 		}
 
-		if ( empty( $args['fields'] ) || ! is_array( $args['fields'] ) ) {
-			$args['fields'] = array();
+		if ( empty( $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) {
+			$args[ 'fields' ] = array();
 		}
 
 		// An array to store keys of fields that need to be filtered.
 		$media_fields_to_filter = array();
 
-		foreach ( $args['fields'] as $key => $value ) {
-			if ( ! isset( $value['default'] ) ) {
-				$args['fields'][ $key ]['default'] = '';
+		foreach ( $args[ 'fields' ] as $key => $value ) {
+			if ( ! isset( $value[ 'default' ] ) ) {
+				$args[ 'fields' ][ $key ][ 'default' ] = '';
 			}
-			if ( ! isset( $value['label'] ) ) {
-				$args['fields'][ $key ]['label'] = '';
+			if ( ! isset( $value[ 'label' ] ) ) {
+				$args[ 'fields' ][ $key ][ 'label' ] = '';
 			}
-			$args['fields'][ $key ]['id']      = $key;
+			$args[ 'fields' ][ $key ][ 'id' ] = $key;
 
 			// We check if the filed is an uploaded media ( image , file, video, etc.. ).
-			if ( isset( $value['type'] ) ) {
-				switch ( $value['type'] ) {
+			if ( isset( $value[ 'type' ] ) ) {
+				switch ( $value[ 'type' ] ) {
 					case 'image':
 					case 'cropped_image':
 					case 'upload':
@@ -117,14 +117,14 @@ 
 							)
 						);
 						// Hackily add in the data link parameter.
-						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][ $key ]['id'] ) . '"' . $this->get_link(), $dropdown );
-						$args['fields'][ $key ]['dropdown'] = $dropdown;
+						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args[ 'fields' ][ $key ][ 'id' ] ) . '"' . $this->get_link(), $dropdown );
+						$args[ 'fields' ][ $key ][ 'dropdown' ] = $dropdown;
 						break;
 				}
 			}
 		} // End foreach().
 
-		$this->fields = $args['fields'];
+		$this->fields = $args[ 'fields' ];
 
 		// Now we are going to filter the fields.
 		// First we create a copy of the value that would be used otherwise.
@@ -184,14 +184,14 @@ 
 
 		$fields = $this->fields;
 
-		$this->json['fields'] = $fields;
-		$this->json['row_label'] = $this->row_label;
+		$this->json[ 'fields' ] = $fields;
+		$this->json[ 'row_label' ] = $this->row_label;
 
 		// If filtered_value has been set and is not empty we use it instead of the actual value.
 		if ( is_array( $this->filtered_value ) && ! empty( $this->filtered_value ) ) {
-			$this->json['value'] = $this->filtered_value;
+			$this->json[ 'value' ] = $this->filtered_value;
 		}
-		$this->json['value'] = apply_filters( "kirki/controls/repeater/value/{$this->id}", $this->json['value'] );
+		$this->json[ 'value' ] = apply_filters( "kirki/controls/repeater/value/{$this->id}", $this->json[ 'value' ] );
 	}
 
 	/**
@@ -214,10 +214,10 @@ 
 
 		<ul class="repeater-fields"></ul>
 
-		<?php if ( isset( $this->choices['limit'] ) ) : ?>
+		<?php if ( isset( $this->choices[ 'limit' ] ) ) : ?>
 			<?php // @codingStandardsIgnoreLine ?>
 			<?php /* translators: %s represents the number of rows we're limiting the repeater to allow. */ ?>
-			<p class="limit"><?php printf( esc_attr__( 'Limit: %s rows', 'kirki' ), esc_html( $this->choices['limit'] ) ); ?></p>
+			<p class="limit"><?php printf( esc_attr__( 'Limit: %s rows', 'kirki' ), esc_html( $this->choices[ 'limit' ] ) ); ?></p>
 		<?php endif; ?>
 		<button class="button-secondary repeater-add"><?php echo esc_html( $this->button_label ); ?></button>
 
@@ -447,24 +447,24 @@ 
 	protected function row_label( $args ) {
 
 		// Validating args for row labels.
-		if ( isset( $args['row_label'] ) && is_array( $args['row_label'] ) && ! empty( $args['row_label'] ) ) {
+		if ( isset( $args[ 'row_label' ] ) && is_array( $args[ 'row_label' ] ) && ! empty( $args[ 'row_label' ] ) ) {
 
 			// Validating row label type.
-			if ( isset( $args['row_label']['type'] ) && ( 'text' === $args['row_label']['type'] || 'field' === $args['row_label']['type'] ) ) {
-				$this->row_label['type'] = $args['row_label']['type'];
+			if ( isset( $args[ 'row_label' ][ 'type' ] ) && ( 'text' === $args[ 'row_label' ][ 'type' ] || 'field' === $args[ 'row_label' ][ 'type' ] ) ) {
+				$this->row_label[ 'type' ] = $args[ 'row_label' ][ 'type' ];
 			}
 
 			// Validating row label type.
-			if ( isset( $args['row_label']['value'] ) && ! empty( $args['row_label']['value'] ) ) {
-				$this->row_label['value'] = esc_attr( $args['row_label']['value'] );
+			if ( isset( $args[ 'row_label' ][ 'value' ] ) && ! empty( $args[ 'row_label' ][ 'value' ] ) ) {
+				$this->row_label[ 'value' ] = esc_attr( $args[ 'row_label' ][ 'value' ] );
 			}
 
 			// Validating row label field.
-			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][ esc_attr( $args['row_label']['field'] ) ] ) ) {
-				$this->row_label['field'] = esc_attr( $args['row_label']['field'] );
+			if ( isset( $args[ 'row_label' ][ 'field' ] ) && ! empty( $args[ 'row_label' ][ 'field' ] ) && isset( $args[ 'fields' ][ esc_attr( $args[ 'row_label' ][ 'field' ] ) ] ) ) {
+				$this->row_label[ 'field' ] = esc_attr( $args[ 'row_label' ][ 'field' ] );
 			} else {
 				// If from field is not set correctly, making sure standard is set as the type.
-				$this->row_label['type'] = 'text';
+				$this->row_label[ 'type' ] = 'text';
 			}
 		}
 	}

controls/php/class-kirki-control-color-palette.php

Spacing +4 added lines, -4 removed lines

@@ -38,11 +38,11 @@
 		parent::to_json();
 
 		// If no palette has been defined, use Material Design Palette.
-		if ( ! isset( $this->json['choices']['colors'] ) || empty( $this->json['choices']['colors'] ) ) {
-			$this->json['choices']['colors'] = Kirki_Helper::get_material_design_colors( 'primary' );
+		if ( ! isset( $this->json[ 'choices' ][ 'colors' ] ) || empty( $this->json[ 'choices' ][ 'colors' ] ) ) {
+			$this->json[ 'choices' ][ 'colors' ] = Kirki_Helper::get_material_design_colors( 'primary' );
 		}
-		if ( ! isset( $this->json['choices']['size'] ) || empty( $this->json['choices']['size'] ) ) {
-			$this->json['choices']['size'] = 20;
+		if ( ! isset( $this->json[ 'choices' ][ 'size' ] ) || empty( $this->json[ 'choices' ][ 'size' ] ) ) {
+			$this->json[ 'choices' ][ 'size' ] = 20;
 		}
 	}
 

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;
 		}
 	}