aristath / kirki

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

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;