aristath / kirki

field/class-kirki-field-preset.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 		// We're using a flat select.
 		foreach ( $this->choices as $key => $args ) {
-			$this->choices[ $key ] = $args['label'];
+			$this->choices[ $key ] = $args[ 'label' ];
 		}
 	}
 }

core/class-kirki-field.php

Spacing +34 added lines, -34 removed lines

@@ -243,28 +243,28 @@ 
 	 */
 	public function __construct( $config_id = 'global', $args = array() ) {
 
-		if ( isset( $args['setting'] ) && ! empty( $args['setting'] ) && ( ! isset( $args['settings'] ) || empty( $args['settings'] ) ) ) {
+		if ( isset( $args[ 'setting' ] ) && ! empty( $args[ 'setting' ] ) && ( ! isset( $args[ 'settings' ] ) || empty( $args[ 'settings' ] ) ) ) {
 			/* translators: %s represents the field ID where the error occurs. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args['settings'] ) ), '3.0.10' );
-			$args['settings'] = $args['setting'];
-			unset( $args['setting'] );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args[ 'settings' ] ) ), '3.0.10' );
+			$args[ 'settings' ] = $args[ 'setting' ];
+			unset( $args[ 'setting' ] );
 		}
 
 		// In case the user only provides 1 argument,
 		// assume that the provided argument is $args and set $config_id = 'global'.
 		if ( is_array( $config_id ) && empty( $args ) ) {
 			/* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
 			$args      = $config_id;
 			$config_id = 'global';
 		}
 
-		$args['kirki_config'] = $config_id;
+		$args[ 'kirki_config' ] = $config_id;
 
 		$this->kirki_config = trim( esc_attr( $config_id ) );
 		if ( '' === $config_id ) {
 			/* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
 			$this->kirki_config = 'global';
 		}
 
@@ -272,7 +272,7 @@ 
 		$defaults = get_class_vars( __CLASS__ );
 
 		// Get the config arguments, and merge them with the defaults.
-		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
+		$config_defaults = ( isset( Kirki::$config[ 'global' ] ) ) ? Kirki::$config[ 'global' ] : array();
 		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) {
 			$config_defaults = Kirki::$config[ $this->kirki_config ];
 		}
@@ -420,7 +420,7 @@ 
 			$this->partial_refresh = array();
 		}
 		foreach ( $this->partial_refresh as $id => $args ) {
-			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
+			if ( ! is_array( $args ) || ! isset( $args[ 'selector' ] ) || ! isset( $args[ 'render_callback' ] ) || ! is_callable( $args[ 'render_callback' ] ) ) {
 				/* translators: %1$s represents the field ID where the error occurs. */
 				_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
 				unset( $this->partial_refresh[ $id ] );
@@ -458,8 +458,8 @@ 
 			}
 		}
 		$this->settings = $settings;
-		if ( isset( $this->settings['kirki_placeholder_setting'] ) ) {
-			$this->settings = $this->settings['kirki_placeholder_setting'];
+		if ( isset( $this->settings[ 'kirki_placeholder_setting' ] ) ) {
+			$this->settings = $this->settings[ 'kirki_placeholder_setting' ];
 		}
 	}
 
@@ -473,7 +473,7 @@ 
 	protected function set_active_callback() {
 
 		if ( is_array( $this->active_callback ) && ! is_callable( $this->active_callback ) ) {
-			if ( isset( $this->active_callback[0] ) ) {
+			if ( isset( $this->active_callback[ 0 ] ) ) {
 				$this->required = $this->active_callback;
 			}
 		}
@@ -559,34 +559,34 @@ 
 			);
 		}
 		// Convert to array of arrays if needed.
-		if ( isset( $this->output['element'] ) ) {
+		if ( isset( $this->output[ 'element' ] ) ) {
 			/* translators: The field ID where the error occurs. */
 			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"output" invalid format in field %s. The "output" argument should be defined as an array of arrays.', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
 			$this->output = array( $this->output );
 		}
 		foreach ( $this->output as $key => $output ) {
-			if ( empty( $output ) || ! isset( $output['element'] ) ) {
+			if ( empty( $output ) || ! isset( $output[ 'element' ] ) ) {
 				unset( $this->output[ $key ] );
 				continue;
 			}
-			if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) {
-				$this->output[ $key ]['sanitize_callback'] = $output['callback'];
+			if ( ! isset( $output[ 'sanitize_callback' ] ) && isset( $output[ 'callback' ] ) ) {
+				$this->output[ $key ][ 'sanitize_callback' ] = $output[ 'callback' ];
 			}
 			// Convert element arrays to strings.
-			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
-				$this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] );
-				sort( $this->output[ $key ]['element'] );
+			if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) {
+				$this->output[ $key ][ 'element' ] = array_unique( $this->output[ $key ][ 'element' ] );
+				sort( $this->output[ $key ][ 'element' ] );
 
 				// Trim each element in the array.
-				foreach ( $this->output[ $key ]['element'] as $index => $element ) {
-					$this->output[ $key ]['element'][ $index ] = trim( $element );
+				foreach ( $this->output[ $key ][ 'element' ] as $index => $element ) {
+					$this->output[ $key ][ 'element' ][ $index ] = trim( $element );
 				}
-				$this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] );
+				$this->output[ $key ][ 'element' ] = implode( ',', $this->output[ $key ][ 'element' ] );
 			}
 
 			// Fix for https://github.com/aristath/kirki/issues/1659#issuecomment-346229751.
-			$this->output[ $key ]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ]['element'] );
-			$this->output[ $key ]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ]['element'] ) );
+			$this->output[ $key ][ 'element' ] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ][ 'element' ] );
+			$this->output[ $key ][ 'element' ] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ][ 'element' ] ) );
 		}
 	}
 
@@ -619,23 +619,23 @@ 
 
 			// Start going through each item in the $output array.
 			foreach ( $this->output as $output ) {
-				$output['function'] = ( isset( $output['function'] ) ) ? $output['function'] : 'style';
+				$output[ 'function' ] = ( isset( $output[ 'function' ] ) ) ? $output[ 'function' ] : 'style';
 
 				// If 'element' or 'property' are not defined, skip this.
-				if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) {
+				if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) {
 					continue;
 				}
-				if ( is_array( $output['element'] ) ) {
-					$output['element'] = implode( ',', $output['element'] );
+				if ( is_array( $output[ 'element' ] ) ) {
+					$output[ 'element' ] = implode( ',', $output[ 'element' ] );
 				}
 
 				// If there's a sanitize_callback defined skip this, unless we also have a js_callback defined.
-				if ( isset( $output['sanitize_callback'] ) && ! empty( $output['sanitize_callback'] ) && ! isset( $output['js_callback'] ) ) {
+				if ( isset( $output[ 'sanitize_callback' ] ) && ! empty( $output[ 'sanitize_callback' ] ) && ! isset( $output[ 'js_callback' ] ) ) {
 					continue;
 				}
 
 				// If we got this far, it's safe to add this.
-				$js_vars[] = $output;
+				$js_vars[ ] = $output;
 			}
 
 			// Did we manage to get all the items from 'output'?
@@ -660,7 +660,7 @@ 
 			$variable        = ( is_string( $this->variables ) && ! empty( $this->variables ) ) ? $this->variables : false;
 			$this->variables = array();
 			if ( $variable && empty( $this->variables ) ) {
-				$this->variables[0]['name'] = $variable;
+				$this->variables[ 0 ][ 'name' ] = $variable;
 			}
 		}
 	}
@@ -708,12 +708,12 @@ 
 		if ( is_string( $this->css_vars ) ) {
 			$this->css_vars = array( $this->css_vars );
 		}
-		if ( isset( $this->css_vars[0] ) && is_string( $this->css_vars[0] ) ) {
+		if ( isset( $this->css_vars[ 0 ] ) && is_string( $this->css_vars[ 0 ] ) ) {
 			$this->css_vars = array( $this->css_vars );
 		}
 		foreach ( $this->css_vars as $key => $val ) {
-			if ( ! isset( $val[1] ) ) {
-				$this->css_vars[ $key ][1] = '$';
+			if ( ! isset( $val[ 1 ] ) ) {
+				$this->css_vars[ $key ][ 1 ] = '$';
 			}
 		}
 	}

modules/css-vars/class-kirki-modules-css-vars.php

Spacing +8 added lines, -8 removed lines

@@ -76,15 +76,15 @@ 
 		echo '<style id="kirki-css-vars">';
 		echo ':root{';
 		foreach ( $fields as $id => $args ) {
-			if ( ! isset( $args['css_vars'] ) || empty( $args['css_vars'] ) ) {
+			if ( ! isset( $args[ 'css_vars' ] ) || empty( $args[ 'css_vars' ] ) ) {
 				continue;
 			}
-			$val = Kirki_Values::get_value( $args['kirki_config'], $id );
-			foreach ( $args['css_vars'] as $css_var ) {
-			if ( isset( $css_var[2] ) && is_array( $val ) && isset( $val[ $css_var[2] ] ) ) {
-				$val = $val[ $css_var[2] ];
+			$val = Kirki_Values::get_value( $args[ 'kirki_config' ], $id );
+			foreach ( $args[ 'css_vars' ] as $css_var ) {
+			if ( isset( $css_var[ 2 ] ) && is_array( $val ) && isset( $val[ $css_var[ 2 ] ] ) ) {
+				$val = $val[ $css_var[ 2 ] ];
 			}
-			echo esc_attr( $css_var[0] ) . ':' . esc_attr( str_replace( '$', $val, $css_var[1] ) ) . ';';
+			echo esc_attr( $css_var[ 0 ] ) . ':' . esc_attr( str_replace( '$', $val, $css_var[ 1 ] ) ) . ';';
 		}
 		}
 		echo '}';
@@ -105,8 +105,8 @@ 
 		$fields = Kirki::$fields;
 		$data   = array();
 		foreach ( $fields as $field ) {
-			if ( isset( $field['transport'] ) && 'postMessage' === $field['transport'] && isset( $field['css_vars'] ) && ! empty( $field['css_vars'] ) ) {
-				$data[] = $field;
+			if ( isset( $field[ 'transport' ] ) && 'postMessage' === $field[ 'transport' ] && isset( $field[ 'css_vars' ] ) && ! empty( $field[ 'css_vars' ] ) ) {
+				$data[ ] = $field;
 			}
 		}
 		wp_localize_script( 'kirki_auto_css_vars', 'kirkiCssVarFields', $data );

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

Spacing +17 added lines, -17 removed lines

@@ -158,41 +158,41 @@
 		// 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;
 		// 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;
 	}
 
 	/**

core/class-kirki-helper.php

Spacing +29 added lines, -29 removed lines

@@ -37,7 +37,7 @@ 
 
 		// Handle the arguments, merge one by one.
 		$args  = func_get_args();
-		$array = $args[0];
+		$array = $args[ 0 ];
 		if ( ! is_array( $array ) ) {
 			return $array;
 		}
@@ -93,27 +93,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';
 			}
 		}
 
@@ -151,7 +151,7 @@ 
 		}
 
 		if ( ! empty( $attachment ) ) {
-			return $attachment[0];
+			return $attachment[ 0 ];
 		}
 		return 0;
 	}
@@ -168,10 +168,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 ],
 		);
 
 	}
@@ -192,8 +192,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.
@@ -343,41 +343,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' ];
 		} // End switch().
 	}
 

modules/webfonts/class-kirki-fonts-google-local.php

Spacing +6 added lines, -6 removed lines

@@ -100,7 +100,7 @@ 
 		$key               = sanitize_key( $this->family );
 		$this->folder_path = $this->get_root_path() . "/$key";
 		$this->folder_url  = $this->get_root_url() . "/$key";
-		$this->files        = $this->get_font_family();
+		$this->files = $this->get_font_family();
 	}
 
 	/**
@@ -193,13 +193,13 @@ 
 		}
 
 		// Return regular if the one we want could not be found.
-		if ( isset( $local_urls['regular'] ) ) {
-			return $local_urls['regular'];
+		if ( isset( $local_urls[ 'regular' ] ) ) {
+			return $local_urls[ 'regular' ];
 		}
 
 		// Return the first available if all else failed.
 		$vals = array_values( $local_urls );
-		return $vals[0];
+		return $vals[ 0 ];
 	}
 
 	/**
@@ -391,7 +391,7 @@ 
 	public function get_root_path() {
 		// Get the upload directory for this site.
 		$upload_dir = wp_upload_dir();
-		$path       = untrailingslashit( wp_normalize_path( $upload_dir['basedir'] ) ) . '/webfonts';
+		$path       = untrailingslashit( wp_normalize_path( $upload_dir[ 'basedir' ] ) ) . '/webfonts';
 
 		// If the folder doesn't exist, create it.
 		if ( ! file_exists( $path ) ) {
@@ -416,7 +416,7 @@ 
 		$upload_dir = wp_upload_dir();
 
 		// The URL.
-		$url = trailingslashit( $upload_dir['baseurl'] );
+		$url = trailingslashit( $upload_dir[ 'baseurl' ] );
 		// Take care of domain mapping.
 		// When using domain mapping we have to make sure that the URL to the file
 		// does not include the original domain but instead the mapped domain.

Braces +3 added lines, -1 removed lines

@@ -80,8 +80,10 @@
 	 * @param string $family The font-family name.
 	 * @return Kirki_Fonts_Google_Local
 	 */
-	public static function do( $family ) {
+	public static function do {
+		( $family ) {
 		$key = sanitize_key( $family );
+	}
 		if ( ! isset( self::$instances[ $key ] ) ) {
 			self::$instances[ $key ] = new self( $family );
 		}

modules/webfonts/class-kirki-modules-webfonts-local.php

Braces +3 added lines, -1 removed lines

@@ -91,7 +91,9 @@
 		$fonts = array_keys( $this->googlefonts->fonts );
 		$fonts = array_unique( $fonts );
 		foreach ( $fonts as $family ) {
-			$css .= Kirki_Fonts_Google_Local::do( $family )->get_css();
+			$css .= Kirki_Fonts_Google_Local::do {
+				( $family )->get_css();
+			}
 		}
 		if ( $css ) {
 			echo '<style id="kirki-local-webfonts-' . esc_attr( sanitize_key( $this->config_id ) ) . '">' . $css . '</style>'; // WPCS: XSS ok.