aristath / kirki

modules/custom-sections/sections/class-kirki-sections-nested-section.php

Spacing +6 added lines, -6 removed lines

@@ -53,15 +53,15 @@
 			)
 		);
 
-		$array['title']          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
-		$array['content']        = $this->get_content();
-		$array['active']         = $this->active();
-		$array['instanceNumber'] = $this->instance_number;
+		$array[ 'title' ]          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array[ 'content' ]        = $this->get_content();
+		$array[ 'active' ]         = $this->active();
+		$array[ 'instanceNumber' ] = $this->instance_number;
 
-		$array['customizeAction'] = esc_attr__( 'Customizing', 'kirki' );
+		$array[ 'customizeAction' ] = esc_attr__( 'Customizing', 'kirki' );
 		if ( $this->panel ) {
 			/* translators: The title. */
-			$array['customizeAction'] = sprintf( esc_attr__( 'Customizing ▸ %s', 'kirki' ), esc_html( $this->manager->get_panel( $this->panel )->title ) );
+			$array[ 'customizeAction' ] = sprintf( esc_attr__( 'Customizing ▸ %s', 'kirki' ), esc_html( $this->manager->get_panel( $this->panel )->title ) );
 		}
 		return $array;
 	}

core/class-kirki-values.php

Spacing +24 added lines, -24 removed lines

@@ -40,17 +40,17 @@ 
 	 */
 	public function typography_field_tweaks( $value, $field_id ) {
 
-		if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['type'] ) ) {
-			if ( 'kirki-typography' === Kirki::$fields[ $field_id ]['type'] ) {
+		if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'type' ] ) ) {
+			if ( 'kirki-typography' === Kirki::$fields[ $field_id ][ 'type' ] ) {
 
 				// Sanitize the value.
 				// This also adds font-weight if it doesn't already exist.
 				$value = Kirki_Field_Typography::sanitize( $value );
 
 				// Combine font-family and font-backup.
-				if ( isset( $value['font-family'] ) && isset( $value['font-backup'] ) ) {
-					$value['font-family'] .= ', ' . $value['font-backup'];
-					unset( $value['font-backup'] );
+				if ( isset( $value[ 'font-family' ] ) && isset( $value[ 'font-backup' ] ) ) {
+					$value[ 'font-family' ] .= ', ' . $value[ 'font-backup' ];
+					unset( $value[ 'font-backup' ] );
 				}
 			}
 		}
@@ -87,39 +87,39 @@ 
 			$config_id = 'global';
 		}
 
-		if ( 'theme_mod' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( 'theme_mod' === Kirki::$config[ $config_id ][ 'option_type' ] ) {
 
 			// We're using theme_mods so just get the value using get_theme_mod.
 			$default_value = null;
-			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) {
-				$default_value = Kirki::$fields[ $field_id ]['default'];
+			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'default' ] ) ) {
+				$default_value = Kirki::$fields[ $field_id ][ 'default' ];
 			}
 			$value = get_theme_mod( $field_id, $default_value );
 			return apply_filters( 'kirki_values_get_value', $value, $field_id );
 		}
 
-		if ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( 'option' === Kirki::$config[ $config_id ][ 'option_type' ] ) {
 
 			// We're using options.
-			if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) {
+			if ( '' !== Kirki::$config[ $config_id ][ 'option_name' ] ) {
 
 				// Options are serialized as a single option in the db.
 				// We'll have to get the option and then get the item from the array.
-				$options = get_option( Kirki::$config[ $config_id ]['option_name'] );
+				$options = get_option( Kirki::$config[ $config_id ][ 'option_name' ] );
 
-				if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']' ] ) ) {
-					$field_id = Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']';
+				if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ][ 'option_name' ] . '[' . $field_id . ']' ] ) ) {
+					$field_id = Kirki::$config[ $config_id ][ 'option_name' ] . '[' . $field_id . ']';
 				}
-				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ]['option_name'] . '[', '', $field_id ) );
+				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ][ 'option_name' ] . '[', '', $field_id ) );
 
-				$default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) ? Kirki::$fields[ $field_id ]['default'] : '';
+				$default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'default' ] ) ) ? Kirki::$fields[ $field_id ][ 'default' ] : '';
 				$value         = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value;
 				$value         = maybe_unserialize( $value );
 				return apply_filters( 'kirki_values_get_value', $value, $field_id );
 			}
 
 			// Each option separately saved in the db.
-			$value = get_option( $field_id, Kirki::$fields[ $field_id ]['default'] );
+			$value = get_option( $field_id, Kirki::$fields[ $field_id ][ 'default' ] );
 			return apply_filters( 'kirki_values_get_value', $value, $field_id );
 
 		}
@@ -135,18 +135,18 @@ 
 	 * @return string|array
 	 */
 	public static function get_sanitized_field_value( $field ) {
-		$value = $field['default'];
-		if ( isset( $field['option_type'] ) && 'theme_mod' === $field['option_type'] ) {
-			$value = get_theme_mod( $field['settings'], $field['default'] );
-		} elseif ( isset( $field['option_type'] ) && 'option' === $field['option_type'] ) {
-			if ( isset( $field['option_name'] ) && '' !== $field['option_name'] ) {
-				$all_values     = get_option( $field['option_name'], array() );
-				$sub_setting_id = str_replace( array( ']', $field['option_name'] . '[' ), '', $field['settings'] );
+		$value = $field[ 'default' ];
+		if ( isset( $field[ 'option_type' ] ) && 'theme_mod' === $field[ 'option_type' ] ) {
+			$value = get_theme_mod( $field[ 'settings' ], $field[ 'default' ] );
+		} elseif ( isset( $field[ 'option_type' ] ) && 'option' === $field[ 'option_type' ] ) {
+			if ( isset( $field[ 'option_name' ] ) && '' !== $field[ 'option_name' ] ) {
+				$all_values     = get_option( $field[ 'option_name' ], array() );
+				$sub_setting_id = str_replace( array( ']', $field[ 'option_name' ] . '[' ), '', $field[ 'settings' ] );
 				if ( isset( $all_values[ $sub_setting_id ] ) ) {
 					$value = $all_values[ $sub_setting_id ];
 				}
 			} else {
-				$value = get_option( $field['settings'], $field['default'] );
+				$value = get_option( $field[ 'settings' ], $field[ 'default' ] );
 			}
 		}
 

core/class-kirki-l10n.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 
 		global $l10n;
 		if ( isset( $l10n[ $this->get_theme_textdomain() ] ) ) {
-			$l10n['kirki'] = $l10n[ $this->get_theme_textdomain() ]; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
+			$l10n[ 'kirki' ] = $l10n[ $this->get_theme_textdomain() ]; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
 		}
 
 		// Check if the domain is "kirki".

core/class-kirki-helper.php

Spacing +29 added lines, -29 removed lines

@@ -36,7 +36,7 @@ 
 
 		// Handle the arguments, merge one by one.
 		$args  = func_get_args();
-		$array = $args[0];
+		$array = $args[ 0 ];
 		if ( ! is_array( $array ) ) {
 			return $array;
 		}
@@ -92,27 +92,27 @@ 
 
 		if ( 'ftpext' === $method ) {
 			// If defined, set it to that, Else, set to NULL.
-			$credentials['hostname'] = defined( 'FTP_HOST' ) ? preg_replace( '|\w+://|', '', FTP_HOST ) : null;
-			$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : null;
-			$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : null;
+			$credentials[ 'hostname' ] = defined( 'FTP_HOST' ) ? preg_replace( '|\w+://|', '', FTP_HOST ) : null;
+			$credentials[ 'username' ] = defined( 'FTP_USER' ) ? FTP_USER : null;
+			$credentials[ 'password' ] = defined( 'FTP_PASS' ) ? FTP_PASS : null;
 
 			// Set FTP port.
-			if ( strpos( $credentials['hostname'], ':' ) && null !== $credentials['hostname'] ) {
-				list( $credentials['hostname'], $credentials['port'] ) = explode( ':', $credentials['hostname'], 2 );
-				if ( ! is_numeric( $credentials['port'] ) ) {
-					unset( $credentials['port'] );
+			if ( strpos( $credentials[ 'hostname' ], ':' ) && null !== $credentials[ 'hostname' ] ) {
+				list( $credentials[ 'hostname' ], $credentials[ 'port' ] ) = explode( ':', $credentials[ 'hostname' ], 2 );
+				if ( ! is_numeric( $credentials[ 'port' ] ) ) {
+					unset( $credentials[ 'port' ] );
 				}
 			} else {
-				unset( $credentials['port'] );
+				unset( $credentials[ 'port' ] );
 			}
 
 			// Set connection type.
 			if ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' === $method ) {
-				$credentials['connection_type'] = 'ftps';
+				$credentials[ 'connection_type' ] = 'ftps';
 			} elseif ( ! array_filter( $credentials ) ) {
-				$credentials['connection_type'] = null;
+				$credentials[ 'connection_type' ] = null;
 			} else {
-				$credentials['connection_type'] = 'ftp';
+				$credentials[ 'connection_type' ] = 'ftp';
 			}
 		}
 
@@ -149,7 +149,7 @@ 
 		}
 
 		if ( ! empty( $attachment ) ) {
-			return $attachment[0];
+			return $attachment[ 0 ];
 		}
 		return 0;
 	}
@@ -166,10 +166,10 @@ 
 		$image    = wp_get_attachment_image_src( $image_id, 'full' );
 
 		return array(
-			'url'       => $image[0],
-			'width'     => $image[1],
-			'height'    => $image[2],
-			'thumbnail' => $image[3],
+			'url'       => $image[ 0 ],
+			'width'     => $image[ 1 ],
+			'height'    => $image[ 2 ],
+			'thumbnail' => $image[ 3 ],
 		);
 
 	}
@@ -190,8 +190,8 @@ 
 					'suppress_filters' => false,
 				)
 			);
-		} elseif ( is_array( $args ) && ! isset( $args['suppress_filters'] ) ) {
-			$args['suppress_filters'] = false;
+		} elseif ( is_array( $args ) && ! isset( $args[ 'suppress_filters' ] ) ) {
+			$args[ 'suppress_filters' ] = false;
 		}
 
 		// Get the posts.
@@ -341,41 +341,41 @@ 
 				$key = absint( $context ) / 100;
 				if ( 'A100' === $context ) {
 					$key = 10;
-					unset( $colors['grey'] );
+					unset( $colors[ 'grey' ] );
 				} elseif ( 'A200' === $context ) {
 					$key = 11;
-					unset( $colors['grey'] );
+					unset( $colors[ 'grey' ] );
 				} elseif ( 'A400' === $context ) {
 					$key = 12;
-					unset( $colors['grey'] );
+					unset( $colors[ 'grey' ] );
 				} elseif ( 'A700' === $context ) {
 					$key = 13;
-					unset( $colors['grey'] );
+					unset( $colors[ 'grey' ] );
 				}
-				unset( $colors['primary'] );
+				unset( $colors[ 'primary' ] );
 				$position_colors = array();
 				foreach ( $colors as $color_family ) {
 					if ( isset( $color_family[ $key ] ) ) {
-						$position_colors[] = $color_family[ $key ];
+						$position_colors[ ] = $color_family[ $key ];
 					}
 				}
 				return $position_colors;
 			case 'all':
-				unset( $colors['primary'] );
+				unset( $colors[ 'primary' ] );
 				$all_colors = array();
 				foreach ( $colors as $color_family ) {
 					foreach ( $color_family as $color ) {
-						$all_colors[] = $color;
+						$all_colors[ ] = $color;
 					}
 				}
 				return $all_colors;
 			case 'primary':
-				return $colors['primary'];
+				return $colors[ 'primary' ];
 			default:
 				if ( isset( $colors[ $context ] ) ) {
 					return $colors[ $context ];
 				}
-				return $colors['primary'];
+				return $colors[ 'primary' ];
 		}
 	}
 

Braces +2 added lines, -1 removed lines

@@ -441,7 +441,8 @@
 		if ( 'contains' === $operator || 'in' === $operator ) {
 			if ( is_array( $value1 ) && is_array( $value2 ) ) {
 				foreach ( $value2 as $val ) {
-					if ( in_array( $val, $value1 ) ) { // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
+					if ( in_array( $val, $value1 ) ) {
+// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
 						return true;
 					}
 				}

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

Spacing +28 added lines, -28 removed lines

@@ -84,28 +84,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':
@@ -125,14 +125,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;
 				}
 			}
 		}
 
-		$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.
@@ -192,14 +192,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' ] );
 	}
 
 	/**
@@ -222,9 +222,9 @@ 
 
 		<ul class="repeater-fields"></ul>
 
-		<?php if ( isset( $this->choices['limit'] ) ) : ?>
+		<?php if ( isset( $this->choices[ 'limit' ] ) ) : ?>
 			<?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>
 
@@ -457,24 +457,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-slider.php

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
 	public function to_json() {
 		parent::to_json();
 
-		$this->json['choices'] = wp_parse_args(
-			$this->json['choices'], array(
+		$this->json[ 'choices' ] = wp_parse_args(
+			$this->json[ 'choices' ], array(
 				'min'    => '0',
 				'max'    => '100',
 				'step'   => '1',

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

Spacing +17 added lines, -17 removed lines

@@ -159,41 +159,41 @@
 		// Get the basics from the parent class.
 		parent::to_json();
 		// Default value.
-		$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;
 		// The preset.
-		$this->json['preset'] = $this->preset;
+		$this->json[ 'preset' ] = $this->preset;
 		// The CSS-Variables.
-		$this->json['css-var'] = $this->css_vars;
+		$this->json[ 'css-var' ] = $this->css_vars;
 	}
 
 	/**