Completed
Pull Request — master (#1653)
by Aristeides
05:59 queued 03:27
created
modules/webfonts/class-kirki-modules-webfonts-async.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,9 +80,9 @@
 block discarded – undo
80 80
 		$fonts_to_load = array();
81 81
 		foreach ( $this->googlefonts->fonts as $font => $weights ) {
82 82
 			foreach ( $weights as $key => $value ) {
83
-				$weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
83
+				$weights[$key] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
84 84
 				if ( 'i' === $value ) {
85
-					$weights[ $key ] = '400i';
85
+					$weights[$key] = '400i';
86 86
 				}
87 87
 			}
88 88
 			$fonts_to_load[] = $font . ':' . join( ',', $weights );
Please login to merge, or discard this patch.
modules/css/class-kirki-modules-css.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -243,8 +243,8 @@
 block discarded – undo
243 243
 				$css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
244 244
 
245 245
 				// Add the globals.
246
-				if ( isset( self::$css_array[ $config_id ] ) && ! empty( self::$css_array[ $config_id ] ) ) {
247
-					Kirki_Helper::array_replace_recursive( $css, self::$css_array[ $config_id ] );
246
+				if ( isset( self::$css_array[$config_id] ) && ! empty( self::$css_array[$config_id] ) ) {
247
+					Kirki_Helper::array_replace_recursive( $css, self::$css_array[$config_id] );
248 248
 				}
249 249
 			}
250 250
 		}
Please login to merge, or discard this patch.
modules/css/property/class-kirki-output-property-font-family.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@
 block discarded – undo
43 43
 		// Add backup font.
44 44
 		if ( Kirki_Fonts::is_google_font( $family ) ) {
45 45
 
46
-			if ( '' === $backup && isset( $google_fonts_array[ $family ] ) && isset( $backup_fonts[ $google_fonts_array[ $family ]['category'] ] ) ) {
47
-				$backup = $backup_fonts[ $google_fonts_array[ $family ]['category'] ];
46
+			if ( '' === $backup && isset( $google_fonts_array[$family] ) && isset( $backup_fonts[$google_fonts_array[$family]['category']] ) ) {
47
+				$backup = $backup_fonts[$google_fonts_array[$family]['category']];
48 48
 			}
49 49
 
50 50
 			// Add double quotes if needed.
Please login to merge, or discard this patch.
modules/css/class-kirki-modules-css-generator.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 			'kirki-multicolor'  => 'Kirki_Output_Field_Multicolor',
173 173
 		) );
174 174
 		if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
175
-			$classname = $field_output_classes[ self::$field_type ];
175
+			$classname = $field_output_classes[self::$field_type];
176 176
 		}
177 177
 		$obj = new $classname( $field['kirki_config'], self::$output, self::$value );
178 178
 		return $obj->get_styles();
@@ -247,10 +247,10 @@  discard block
 block discarded – undo
247 247
 							'transition',
248 248
 							'transition-property',
249 249
 						), true ) ) {
250
-							unset( $css[ $media_query ][ $element ][ $property ] );
251
-							$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
252
-							$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
253
-							$css[ $media_query ][ $element ][ $property ]              = $value;
250
+							unset( $css[$media_query][$element][$property] );
251
+							$css[$media_query][$element]['-webkit-' . $property] = $value;
252
+							$css[$media_query][$element]['-moz-' . $property]    = $value;
253
+							$css[$media_query][$element][$property]              = $value;
254 254
 						}
255 255
 
256 256
 						// Add -ms-* and -o-*.
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
260 260
 							'transition',
261 261
 							'transition-property',
262 262
 						), true ) ) {
263
-							unset( $css[ $media_query ][ $element ][ $property ] );
264
-							$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
265
-							$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
266
-							$css[ $media_query ][ $element ][ $property ]          = $value;
263
+							unset( $css[$media_query][$element][$property] );
264
+							$css[$media_query][$element]['-ms-' . $property] = $value;
265
+							$css[$media_query][$element]['-o-' . $property]  = $value;
266
+							$css[$media_query][$element][$property]          = $value;
267 267
 						}
268 268
 					}
269 269
 				}
Please login to merge, or discard this patch.
core/class-kirki-modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 			if ( class_exists( $module_class ) ) {
88 88
 				// Use this syntax instead of $module_class::get_instance()
89 89
 				// for PHP 5.2 compatibility.
90
-				self::$active_modules[ $key ] = call_user_func( array( $module_class, 'get_instance' ) );
90
+				self::$active_modules[$key] = call_user_func( array( $module_class, 'get_instance' ) );
91 91
 			}
92 92
 		}
93 93
 	}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
 		$key = array_search( $module, self::$modules, true );
122 122
 		if ( false !== $key ) {
123
-			unset( self::$modules[ $key ] );
123
+			unset( self::$modules[$key] );
124 124
 		}
125 125
 	}
126 126
 
Please login to merge, or discard this patch.
field/class-kirki-field-typography.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@
 block discarded – undo
179 179
 				case 'letter-spacing':
180 180
 				case 'word-spacing':
181 181
 				case 'line-height':
182
-					$value[ $key ] = Kirki_Sanitize_Values::css_dimension( $val );
182
+					$value[$key] = Kirki_Sanitize_Values::css_dimension( $val );
183 183
 					break;
184 184
 				case 'text-align':
185 185
 					if ( ! in_array( $val, array( 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) {
Please login to merge, or discard this patch.
modules/webfonts/class-kirki-modules-webfonts-link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -130,8 +130,8 @@
 block discarded – undo
130 130
 		// Are we force-loading all subsets?
131 131
 		if ( true === Kirki_Fonts_Google::$force_load_all_subsets ) {
132 132
 
133
-			if ( isset( $this->googlefonts->fonts[ $font ]['subsets'] ) ) {
134
-				foreach ( $this->googlefonts->fonts[ $font ]['subsets'] as $subset ) {
133
+			if ( isset( $this->googlefonts->fonts[$font]['subsets'] ) ) {
134
+				foreach ( $this->googlefonts->fonts[$font]['subsets'] as $subset ) {
135 135
 					$this->subsets[] = $subset;
136 136
 				}
137 137
 			}
Please login to merge, or discard this patch.
core/class-kirki.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 
115 115
 		$config = Kirki_Config::get_instance( $config_id, $args );
116 116
 		$config_args = $config->get_config();
117
-		self::$config[ $config_args['id'] ] = $config_args;
117
+		self::$config[$config_args['id']] = $config_args;
118 118
 	}
119 119
 
120 120
 	/**
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 			$args['active_callback'] = ( isset( $args['required'] ) ) ? array( 'Kirki_Active_Callback', 'evaluate' ) : '__return_true';
137 137
 		}
138 138
 
139
-		self::$panels[ $args['id'] ] = $args;
139
+		self::$panels[$args['id']] = $args;
140 140
 	}
141 141
 
142 142
 	/**
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 			$args['active_callback'] = ( isset( $args['required'] ) ) ? array( 'Kirki_Active_Callback', 'evaluate' ) : '__return_true';
160 160
 		}
161 161
 
162
-		self::$sections[ $args['id'] ] = $args;
162
+		self::$sections[$args['id']] = $args;
163 163
 	}
164 164
 
165 165
 	/**
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 	 */
209 209
 	public static function get_config_param( $id, $param ) {
210 210
 
211
-		if ( ! isset( self::$config[ $id ] ) || ! isset( self::$config[ $id ][ $param ] ) ) {
211
+		if ( ! isset( self::$config[$id] ) || ! isset( self::$config[$id][$param] ) ) {
212 212
 			return '';
213 213
 		}
214
-		return self::$config[ $id ][ $param ];
214
+		return self::$config[$id][$param];
215 215
 	}
216 216
 }
Please login to merge, or discard this patch.
core/class-kirki-field.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -257,13 +257,13 @@  discard block
 block discarded – undo
257 257
 
258 258
 		// Get the config arguments, and merge them with the defaults.
259 259
 		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
260
-		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) {
261
-			$config_defaults = Kirki::$config[ $this->kirki_config ];
260
+		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) {
261
+			$config_defaults = Kirki::$config[$this->kirki_config];
262 262
 		}
263 263
 		$config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array();
264 264
 		foreach ( $config_defaults as $key => $value ) {
265
-			if ( isset( $defaults[ $key ] ) && ! empty( $value ) && $value !== $defaults[ $key ] ) {
266
-				$defaults[ $key ] = $value;
265
+			if ( isset( $defaults[$key] ) && ! empty( $value ) && $value !== $defaults[$key] ) {
266
+				$defaults[$key] = $value;
267 267
 			}
268 268
 		}
269 269
 
@@ -308,11 +308,11 @@  discard block
 block discarded – undo
308 308
 		// Get all arguments with their values.
309 309
 		$args = get_object_vars( $this );
310 310
 		foreach ( array_keys( $args ) as $key ) {
311
-			$args[ $key ] = $this->$key;
311
+			$args[$key] = $this->$key;
312 312
 		}
313 313
 
314 314
 		// Add the field to the static $fields variable properly indexed.
315
-		Kirki::$fields[ $this->settings ] = $args;
315
+		Kirki::$fields[$this->settings] = $args;
316 316
 
317 317
 	}
318 318
 
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
408 408
 				/* translators: %1$s represents the field ID where the error occurs. */
409 409
 				_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
410
-				unset( $this->partial_refresh[ $id ] );
410
+				unset( $this->partial_refresh[$id] );
411 411
 				continue;
412 412
 			}
413 413
 		}
@@ -435,10 +435,10 @@  discard block
 block discarded – undo
435 435
 		}
436 436
 		$settings = array();
437 437
 		foreach ( $this->settings as $setting_key => $setting_value ) {
438
-			$settings[ $setting_key ] = $setting_value;
438
+			$settings[$setting_key] = $setting_value;
439 439
 			// If we're using serialized options then we need to spice this up.
440 440
 			if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) {
441
-				$settings[ $setting_key ] = "{$this->option_name}[{$setting_value}]";
441
+				$settings[$setting_key] = "{$this->option_name}[{$setting_value}]";
442 442
 			}
443 443
 		}
444 444
 		$this->settings = $settings;
@@ -563,17 +563,17 @@  discard block
 block discarded – undo
563 563
 		}
564 564
 		foreach ( $this->output as $key => $output ) {
565 565
 			if ( empty( $output ) || ! isset( $output['element'] ) ) {
566
-				unset( $this->output[ $key ] );
566
+				unset( $this->output[$key] );
567 567
 				continue;
568 568
 			}
569 569
 			if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) {
570
-				$this->output[ $key ]['sanitize_callback'] = $output['callback'];
570
+				$this->output[$key]['sanitize_callback'] = $output['callback'];
571 571
 			}
572 572
 			// Convert element arrays to strings.
573 573
 			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
574
-				$this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] );
575
-				sort( $this->output[ $key ]['element'] );
576
-				$this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] );
574
+				$this->output[$key]['element'] = array_unique( $this->output[$key]['element'] );
575
+				sort( $this->output[$key]['element'] );
576
+				$this->output[$key]['element'] = implode( ',', $this->output[$key]['element'] );
577 577
 			}
578 578
 		}
579 579
 	}
Please login to merge, or discard this patch.