aristath / kirki

modules/tooltips/class-kirki-modules-tooltips.php

Spacing +3 added lines, -3 removed lines

@@ -76,13 +76,13 @@
 
 		$fields = Kirki::$fields;
 		foreach ( $fields as $field ) {
-			if ( isset( $field['tooltip'] ) && ! empty( $field['tooltip'] ) ) {
+			if ( isset( $field[ 'tooltip' ] ) && ! empty( $field[ 'tooltip' ] ) ) {
 				// Get the control ID and properly format it for the tooltips
-				$id = str_replace( '[', '-', str_replace( ']', '', $field['settings'] ) );
+				$id = str_replace( '[', '-', str_replace( ']', '', $field[ 'settings' ] ) );
 				// Add the tooltips content.
 				$this->tooltips_content[ $id ] = array(
 					'id'      => $id,
-					'content' => wp_kses_post( $field['tooltip'] ),
+					'content' => wp_kses_post( $field[ 'tooltip' ] ),
 				);
 			}
 		}

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

Spacing +14 added lines, -14 removed lines

@@ -35,25 +35,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();
 	}
 
 	/**
@@ -250,12 +250,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;

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

Braces +48 added lines, -24 removed lines

@@ -1,55 +1,68 @@ 
 <?php
 // @codingStandardsIgnoreFile
 
-add_filter( 'kirki_config', function( $args ) {
+add_filter( 'kirki_config', function( $args )
+{
 	return apply_filters( 'kirki/config', $args );
 }, 99 );
 
-add_filter( 'kirki_control_types', function( $args ) {
+add_filter( 'kirki_control_types', function( $args )
+{
 	return apply_filters( 'kirki/control_types', $args );
 }, 99 );
 
-add_filter( 'kirki_section_types', function( $args ) {
+add_filter( 'kirki_section_types', function( $args )
+{
 	return apply_filters( 'kirki/section_types', $args );
 }, 99 );
 
-add_filter( 'kirki_section_types_exclude', function( $args ) {
+add_filter( 'kirki_section_types_exclude', function( $args )
+{
 	return apply_filters( 'kirki/section_types/exclude', $args );
 }, 99 );
 
-add_filter( 'kirki_control_types_exclude', function( $args ) {
+add_filter( 'kirki_control_types_exclude', function( $args )
+{
 	return apply_filters( 'kirki/control_types/exclude', $args );
 }, 99 );
 
-add_filter( 'kirki_controls', function( $args ) {
+add_filter( 'kirki_controls', function( $args )
+{
 	return apply_filters( 'kirki/controls', $args );
 }, 99 );
 
-add_filter( 'kirki_fields', function( $args ) {
+add_filter( 'kirki_fields', function( $args )
+{
 	return apply_filters( 'kirki/fields', $args );
 }, 99 );
 
-add_filter( 'kirki_modules', function( $args ) {
+add_filter( 'kirki_modules', function( $args )
+{
 	return apply_filters( 'kirki/modules', $args );
 }, 99 );
 
-add_filter( 'kirki_panel_types', function( $args ) {
+add_filter( 'kirki_panel_types', function( $args )
+{
 	return apply_filters( 'kirki/panel_types', $args );
 }, 99 );
 
-add_filter( 'kirki_setting_types', function( $args ) {
+add_filter( 'kirki_setting_types', function( $args )
+{
 	return apply_filters( 'kirki/setting_types', $args );
 }, 99 );
 
-add_filter( 'kirki_variable', function( $args ) {
+add_filter( 'kirki_variable', function( $args )
+{
 	return apply_filters( 'kirki/variable', $args );
 }, 99 );
 
-add_filter( 'kirki_values_get_value', function( $arg1, $arg2 ) {
+add_filter( 'kirki_values_get_value', function( $arg1, $arg2 )
+{
 	return apply_filters( 'kirki/values/get_value', $arg1, $arg2 );
 }, 99, 2 );
 
-add_action( 'init', function() {
+add_action( 'init', function()
+{
 	$config_ids = Kirki_Config::get_config_ids();
 	global $kirki_deprecated_filters_iteration;
 	foreach ( $config_ids as $config_id ) {
@@ -62,14 +75,16 @@ 
 			'/webfonts/skip_hidden',
 		) as $filter_suffix ) {
 			$kirki_deprecated_filters_iteration = array( $config_id, $filter_suffix );
-			add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) {
+			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 );
 			}, 99 );
 			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 ) {
+				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 );
@@ -79,38 +94,47 @@ 
 	}
 }, 99 );
 
-add_filter( 'kirki_enqueue_google_fonts', function( $args ) {
+add_filter( 'kirki_enqueue_google_fonts', function( $args )
+{
 	return apply_filters( 'kirki/enqueue_google_fonts', $args );
 }, 99 );
 
-add_filter( 'kirki_styles_array', function( $args ) {
+add_filter( 'kirki_styles_array', function( $args )
+{
 	return apply_filters( 'kirki/styles_array', $args );
 }, 99 );
 
-add_filter( 'kirki_dynamic_css_method', function( $args ) {
+add_filter( 'kirki_dynamic_css_method', function( $args )
+{
 	return apply_filters( 'kirki/dynamic_css/method', $args );
 }, 99 );
 
-add_filter( 'kirki_postmessage_script', function( $args ) {
+add_filter( 'kirki_postmessage_script', function( $args )
+{
 	return apply_filters( 'kirki/postmessage/script', $args );
 }, 99 );
 
-add_filter( 'kirki_fonts_all', function( $args ) {
+add_filter( 'kirki_fonts_all', function( $args )
+{
 	return apply_filters( 'kirki/fonts/all', $args );
 }, 99 );
 
-add_filter( 'kirki_fonts_standard_fonts', function( $args ) {
+add_filter( 'kirki_fonts_standard_fonts', function( $args )
+{
 	return apply_filters( 'kirki/fonts/standard_fonts', $args );
 }, 99 );
 
-add_filter( 'kirki_fonts_backup_fonts', function( $args ) {
+add_filter( 'kirki_fonts_backup_fonts', function( $args )
+{
 	return apply_filters( 'kirki/fonts/backup_fonts', $args );
 }, 99 );
 
-add_filter( 'kirki_fonts_google_fonts', function( $args ) {
+add_filter( 'kirki_fonts_google_fonts', function( $args )
+{
 	return apply_filters( 'kirki/fonts/google_fonts', $args );
 }, 99 );
 
-add_filter( 'kirki_googlefonts_load_method', function( $args ) {
+add_filter( 'kirki_googlefonts_load_method', function( $args )
+{
 	return apply_filters( 'kirki/googlefonts_load_method', $args );
 }, 99 );