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 ); // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning
-						$args['fields'][ $key ]['dropdown'] = $dropdown;
+						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args[ 'fields' ][ $key ][ 'id' ] ) . '"' . $this->get_link(), $dropdown ); // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning
+						$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';
 			}
 		}
 	}

deprecated/filters.php

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
 	$config_ids = Kirki_Config::get_config_ids();
 	global $kirki_deprecated_filters_iteration;
 	foreach ( $config_ids as $config_id ) {
-		foreach( array(
+		foreach ( array(
 			'/dynamic_css',
 			'/output/control-classnames',
 			'/css/skip_hidden',
@@ -64,15 +64,15 @@ 
 			$kirki_deprecated_filters_iteration = array( $config_id, $filter_suffix );
 			add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) {
 				global $kirki_deprecated_filters_iteration;
-				$kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] );
-				return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args );
+				$kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] );
+				return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[ 0 ]}/{$kirki_deprecated_filters_iteration[ 1 ]}", $args );
 			}, 99 );
-			if ( false !== strpos( $kirki_deprecated_filters_iteration[1], '-' ) ) {
-				$kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] );
+			if ( false !== strpos( $kirki_deprecated_filters_iteration[ 1 ], '-' ) ) {
+				$kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] );
 				add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) {
 					global $kirki_deprecated_filters_iteration;
-					$kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] );
-					return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args );
+					$kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] );
+					return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[ 0 ]}/{$kirki_deprecated_filters_iteration[ 1 ]}", $args );
 				}, 99 );
 			}
 		}

field/class-kirki-field-code.php

Spacing +6 added lines, -6 removed lines

@@ -59,10 +59,10 @@ 
 	 * @access protected
 	 */
 	protected function set_choices() {
-		if ( ! isset( $this->choices['language'] ) ) {
+		if ( ! isset( $this->choices[ 'language' ] ) ) {
 			return;
 		}
-		$language = $this->choices['language'];
+		$language = $this->choices[ 'language' ];
 		switch ( $language ) {
 			case 'json':
 			case 'xml':
@@ -90,11 +90,11 @@ 
 				$language = 'text/x-' . $language;
 				break;
 		}
-		if ( ! isset( $this->editor_settings['codemirror'] ) ) {
-			$this->editor_settings['codemirror'] = array();
+		if ( ! isset( $this->editor_settings[ 'codemirror' ] ) ) {
+			$this->editor_settings[ 'codemirror' ] = array();
 		}
-		if ( ! isset( $this->editor_settings['codemirror']['mode'] ) ) {
-			$this->editor_settings['codemirror']['mode'] = $language;
+		if ( ! isset( $this->editor_settings[ 'codemirror' ][ 'mode' ] ) ) {
+			$this->editor_settings[ 'codemirror' ][ 'mode' ] = $language;
 		}
 	}
 

field/class-kirki-field-image.php

Spacing +11 added lines, -11 removed lines

@@ -60,14 +60,14 @@ 
 		if ( ! is_array( $this->choices ) ) {
 			$this->choices = (array) $this->choices;
 		}
-		if ( ! isset( $this->choices['save_as'] ) ) {
-			$this->choices['save_as'] = 'url';
+		if ( ! isset( $this->choices[ 'save_as' ] ) ) {
+			$this->choices[ 'save_as' ] = 'url';
 		}
-		if ( ! isset( $this->choices['labels'] ) ) {
-			$this->choices['labels'] = array();
+		if ( ! isset( $this->choices[ 'labels' ] ) ) {
+			$this->choices[ 'labels' ] = array();
 		}
 		$this->set_button_labels();
-		$this->choices['labels'] = wp_parse_args( $this->choices['labels'], $this->button_labels );
+		$this->choices[ 'labels' ] = wp_parse_args( $this->choices[ 'labels' ], $this->button_labels );
 	}
 
 	/**
@@ -93,15 +93,15 @@ 
 	 */
 	public function sanitize( $value ) {
 
-		if ( isset( $this->choices['save_as'] ) && 'array' === $this->choices['save_as'] ) {
+		if ( isset( $this->choices[ 'save_as' ] ) && 'array' === $this->choices[ 'save_as' ] ) {
 			return array(
-				'id'     => ( isset( $value['id'] ) && '' !== $value['id'] ) ? (int) $value['id'] : '',
-				'url'    => ( isset( $value['url'] ) && '' !== $value['url'] ) ? esc_url_raw( $value['url'] ) : '',
-				'width'  => ( isset( $value['width'] ) && '' !== $value['width'] ) ? (int) $value['width'] : '',
-				'height' => ( isset( $value['height'] ) && '' !== $value['height'] ) ? (int) $value['height'] : '',
+				'id'     => ( isset( $value[ 'id' ] ) && '' !== $value[ 'id' ] ) ? (int) $value[ 'id' ] : '',
+				'url'    => ( isset( $value[ 'url' ] ) && '' !== $value[ 'url' ] ) ? esc_url_raw( $value[ 'url' ] ) : '',
+				'width'  => ( isset( $value[ 'width' ] ) && '' !== $value[ 'width' ] ) ? (int) $value[ 'width' ] : '',
+				'height' => ( isset( $value[ 'height' ] ) && '' !== $value[ 'height' ] ) ? (int) $value[ 'height' ] : '',
 			);
 		}
-		if ( isset( $this->choices['save_as'] ) && 'id' === $this->choices['save_as'] ) {
+		if ( isset( $this->choices[ 'save_as' ] ) && 'id' === $this->choices[ 'save_as' ] ) {
 			return absint( $value );
 		}
 		if ( is_string( $value ) ) {

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

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['required'] = $this->required;
+		$this->json[ 'required' ] = $this->required;
 	}
 }

controls/php/class-kirki-control-cropped-image.php

Spacing +1 added lines, -1 removed lines

@@ -32,6 +32,6 @@
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['required'] = $this->required;
+		$this->json[ 'required' ] = $this->required;
 	}
 }

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'] ) ) ? $args['description'] : '';
-		$args['priority']    = ( isset( $args['priority'] ) ) ? absint( $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' ] ) ) ? $args[ 'description' ] : '';
+		$args[ 'priority' ]    = ( isset( $args[ 'priority' ] ) ) ? absint( $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'] ) ) ? $args['description'] : '';
-		$args['priority']    = ( isset( $args['priority'] ) ) ? absint( $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' ] ) ) ? $args[ 'description' ] : '';
+		$args[ 'priority' ]    = ( isset( $args[ 'priority' ] ) ) ? absint( $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;
 		}
 	}
 

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

Spacing +15 added lines, -15 removed lines

@@ -136,37 +136,37 @@
 		// Get the basics from the parent class.
 		parent::to_json();
 		// Default.
-		$this->json['default'] = $this->setting->default;
+		$this->json[ 'default' ] = $this->setting->default;
 		if ( isset( $this->default ) ) {
-			$this->json['default'] = $this->default;
+			$this->json[ 'default' ] = $this->default;
 		}
 		// Required.
-		$this->json['required'] = $this->required;
+		$this->json[ 'required' ] = $this->required;
 		// Output.
-		$this->json['output'] = $this->output;
+		$this->json[ 'output' ] = $this->output;
 		// Value.
-		$this->json['value'] = $this->value();
+		$this->json[ 'value' ] = $this->value();
 		// Choices.
-		$this->json['choices'] = $this->choices;
+		$this->json[ 'choices' ] = $this->choices;
 		// The link.
-		$this->json['link'] = $this->get_link();
+		$this->json[ 'link' ] = $this->get_link();
 		// The ID.
-		$this->json['id'] = $this->id;
+		$this->json[ 'id' ] = $this->id;
 		// Translation strings.
-		$this->json['l10n'] = $this->l10n();
+		$this->json[ 'l10n' ] = $this->l10n();
 		// The ajaxurl in case we need it.
-		$this->json['ajaxurl'] = admin_url( 'admin-ajax.php' );
+		$this->json[ 'ajaxurl' ] = admin_url( 'admin-ajax.php' );
 		// Input attributes.
-		$this->json['inputAttrs'] = '';
+		$this->json[ 'inputAttrs' ] = '';
 		foreach ( $this->input_attrs as $attr => $value ) {
-			$this->json['inputAttrs'] .= $attr . '="' . esc_attr( $value ) . '" ';
+			$this->json[ 'inputAttrs' ] .= $attr . '="' . esc_attr( $value ) . '" ';
 		}
 		// The kirki-config.
-		$this->json['kirkiConfig'] = $this->kirki_config;
+		$this->json[ 'kirkiConfig' ] = $this->kirki_config;
 		// The option-type.
-		$this->json['kirkiOptionType'] = $this->option_type;
+		$this->json[ 'kirkiOptionType' ] = $this->option_type;
 		// The option-name.
-		$this->json['kirkiOptionName'] = $this->option_name;
+		$this->json[ 'kirkiOptionName' ] = $this->option_name;
 	}
 
 	/**

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

Spacing +12 added lines, -12 removed lines

@@ -35,23 +35,23 @@ 
 	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_variants' ] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
 	}
 
 	/**
@@ -238,12 +238,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;