Completed
Pull Request — develop (#1315)
by Tim
03:03
created
core/class-kirki-panel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
 		if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->panel_types ) ) {
50 50
 			$args['type'] = 'default';
51 51
 		}
52
-		$panel_classname = $this->panel_types[ $args['type'] ];
52
+		$panel_classname = $this->panel_types[$args['type']];
53 53
 
54 54
 		$wp_customize->add_panel( new $panel_classname( $wp_customize, sanitize_key( $args['id'] ), $args ) );
55 55
 
Please login to merge, or discard this patch.
field/class-kirki-field-sortable.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 		}
53 53
 		$sanitized_value = array();
54 54
 		foreach ( $value as $sub_value ) {
55
-			if ( isset( $this->choices[ $sub_value ] ) ) {
55
+			if ( isset( $this->choices[$sub_value] ) ) {
56 56
 				$sanitized_value[] = esc_attr( $sub_value );
57 57
 			}
58 58
 		}
Please login to merge, or discard this patch.
field/class-kirki-field-select.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 			foreach ( $value as $key => $subvalue ) {
78 78
 				if ( '' !== $subvalue || isset( $this->choices[''] ) ) {
79 79
 					$key = sanitize_key( $key );
80
-					$value[ $key ] = esc_attr( $subvalue );
80
+					$value[$key] = esc_attr( $subvalue );
81 81
 				}
82 82
 			}
83 83
 			return $value;
Please login to merge, or discard this patch.
core/class-kirki-helper.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 		}
43 43
 		$count = count( $args );
44 44
 		for ( $i = 1; $i < $count; $i++ ) {
45
-			if ( is_array( $args[ $i ] ) ) {
46
-				$array = self::recurse( $array, $args[ $i ] );
45
+			if ( is_array( $args[$i] ) ) {
46
+				$array = self::recurse( $array, $args[$i] );
47 47
 			}
48 48
 		}
49 49
 		return $array;
@@ -61,15 +61,15 @@  discard block
 block discarded – undo
61 61
 	public static function recurse( $array, $array1 ) {
62 62
 		foreach ( $array1 as $key => $value ) {
63 63
 			// Create new key in $array, if it is empty or not an array.
64
-			if ( ! isset( $array[ $key ] ) || ( isset( $array[ $key ] ) && ! is_array( $array[ $key ] ) ) ) {
65
-				$array[ $key ] = array();
64
+			if ( ! isset( $array[$key] ) || ( isset( $array[$key] ) && ! is_array( $array[$key] ) ) ) {
65
+				$array[$key] = array();
66 66
 			}
67 67
 
68 68
 			// Overwrite the value in the base array.
69 69
 			if ( is_array( $value ) ) {
70
-				$value = self::recurse( $array[ $key ], $value );
70
+				$value = self::recurse( $array[$key], $value );
71 71
 			}
72
-			$array[ $key ] = $value;
72
+			$array[$key] = $value;
73 73
 		}
74 74
 		return $array;
75 75
 	}
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		// Properly format the array.
152 152
 		$items = array();
153 153
 		foreach ( $posts as $post ) {
154
-			$items[ $post->ID ] = $post->post_title;
154
+			$items[$post->ID] = $post->post_title;
155 155
 		}
156 156
 		wp_reset_postdata();
157 157
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		foreach ( $taxonomies as $taxonomy ) {
180 180
 			$id           = $taxonomy;
181 181
 			$taxonomy     = get_taxonomy( $taxonomy );
182
-			$items[ $id ] = $taxonomy->labels->name;
182
+			$items[$id] = $taxonomy->labels->name;
183 183
 		}
184 184
 
185 185
 		return $items;
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 
205 205
 		// Build the array.
206 206
 		foreach ( $post_types as $post_type ) {
207
-			$items[ $post_type->name ] = $post_type->labels->name;
207
+			$items[$post_type->name] = $post_type->labels->name;
208 208
 		}
209 209
 
210 210
 		return $items;
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 
229 229
 		// Build the array.
230 230
 		foreach ( $terms as $term ) {
231
-			$items[ $term->term_id ] = $term->name;
231
+			$items[$term->term_id] = $term->name;
232 232
 		}
233 233
 
234 234
 		return $items;
@@ -599,8 +599,8 @@  discard block
 block discarded – undo
599 599
 				unset( $colors['primary'] );
600 600
 				$position_colors = array();
601 601
 				foreach ( $colors as $color_family ) {
602
-					if ( isset( $color_family[ $key ] ) ) {
603
-						$position_colors[] = $color_family[ $key ];
602
+					if ( isset( $color_family[$key] ) ) {
603
+						$position_colors[] = $color_family[$key];
604 604
 					}
605 605
 				}
606 606
 				return $position_colors;
@@ -616,8 +616,8 @@  discard block
 block discarded – undo
616 616
 			case 'primary':
617 617
 				return $colors['primary'];
618 618
 			default:
619
-				if ( isset( $colors[ $context ] ) ) {
620
-					return $colors[ $context ];
619
+				if ( isset( $colors[$context] ) ) {
620
+					return $colors[$context];
621 621
 				}
622 622
 				return $colors['primary'];
623 623
 		} // End switch().
Please login to merge, or discard this patch.
controls/typography/class-kirki-control-typography.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 				if ( array_key_exists( $variant, $all_variants ) ) {
157 157
 					$available_variants[] = array(
158 158
 						'id' => $variant,
159
-						'label' => $all_variants[ $variant ],
159
+						'label' => $all_variants[$variant],
160 160
 					);
161 161
 				}
162 162
 			}
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 				if ( array_key_exists( $subset, $all_subsets ) ) {
167 167
 					$available_subsets[] = array(
168 168
 						'id' => $subset,
169
-						'label' => $all_subsets[ $subset ],
169
+						'label' => $all_subsets[$subset],
170 170
 					);
171 171
 				}
172 172
 			}
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 		if ( false === $id ) {
472 472
 			return $translation_strings;
473 473
 		}
474
-		return $translation_strings[ $id ];
474
+		return $translation_strings[$id];
475 475
 	}
476 476
 
477 477
 	/**
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
@@ -322,14 +322,14 @@  discard block
 block discarded – undo
322 322
 
323 323
 		// Get the config arguments, and merge them with the defaults.
324 324
 		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
325
-		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) {
326
-			$config_defaults = Kirki::$config[ $this->kirki_config ];
325
+		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) {
326
+			$config_defaults = Kirki::$config[$this->kirki_config];
327 327
 		}
328 328
 		$config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array();
329 329
 		foreach ( $config_defaults as $key => $value ) {
330
-			if ( isset( $defaults[ $key ] ) ) {
331
-				if ( ! empty( $value ) && $value != $defaults[ $key ] ) {
332
-					$defaults[ $key ] = $value;
330
+			if ( isset( $defaults[$key] ) ) {
331
+				if ( ! empty( $value ) && $value != $defaults[$key] ) {
332
+					$defaults[$key] = $value;
333 333
 				}
334 334
 			}
335 335
 		}
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
367 367
 		// Remove any whitelisted properties from above.
368 368
 		// These will get a free pass, completely unfiltered.
369 369
 		foreach ( $whitelisted_properties as $key => $default_value ) {
370
-			if ( isset( $properties[ $key ] ) ) {
371
-				unset( $properties[ $key ] );
370
+			if ( isset( $properties[$key] ) ) {
371
+				unset( $properties[$key] );
372 372
 			}
373 373
 		}
374 374
 
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 		// Get all arguments with their values.
401 401
 		$args = get_class_vars( __CLASS__ );
402 402
 		foreach ( $args as $key => $default_value ) {
403
-			$args[ $key ] = $this->$key;
403
+			$args[$key] = $this->$key;
404 404
 		}
405 405
 
406 406
 		// Add the whitelisted properties through the back door.
@@ -408,11 +408,11 @@  discard block
 block discarded – undo
408 408
 			if ( ! isset( $this->$key ) ) {
409 409
 				$this->$key = $default_value;
410 410
 			}
411
-			$args[ $key ] = $this->$key;
411
+			$args[$key] = $this->$key;
412 412
 		}
413 413
 
414 414
 		// Add the field to the static $fields variable properly indexed.
415
-		Kirki::$fields[ $this->settings ] = $args;
415
+		Kirki::$fields[$this->settings] = $args;
416 416
 
417 417
 	}
418 418
 
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 		}
514 514
 		foreach ( $this->partial_refresh as $id => $args ) {
515 515
 			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
516
-				unset( $this->partial_refresh[ $id ] );
516
+				unset( $this->partial_refresh[$id] );
517 517
 				continue;
518 518
 			}
519 519
 		}
@@ -541,10 +541,10 @@  discard block
 block discarded – undo
541 541
 		}
542 542
 		$settings = array();
543 543
 		foreach ( $this->settings as $setting_key => $setting_value ) {
544
-			$settings[ sanitize_key( $setting_key ) ] = esc_attr( $setting_value );
544
+			$settings[sanitize_key( $setting_key )] = esc_attr( $setting_value );
545 545
 			// If we're using serialized options then we need to spice this up.
546 546
 			if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) {
547
-				$settings[ sanitize_key( $setting_key ) ] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']';
547
+				$settings[sanitize_key( $setting_key )] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']';
548 548
 			}
549 549
 		}
550 550
 		$this->settings = $settings;
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 		);
644 644
 
645 645
 		if ( array_key_exists( $this->type, $default_callbacks ) ) {
646
-			$this->sanitize_callback = $default_callbacks[ $this->type ];
646
+			$this->sanitize_callback = $default_callbacks[$this->type];
647 647
 		}
648 648
 
649 649
 	}
Please login to merge, or discard this patch.
core/class-kirki-values.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -43,39 +43,39 @@  discard block
 block discarded – undo
43 43
 		$config_id = ( '' === $config_id ) ? 'global' : $config_id;
44 44
 
45 45
 		// Fallback to 'global' if $config_id is not found.
46
-		if ( ! isset( Kirki::$config[ $config_id ] ) ) {
46
+		if ( ! isset( Kirki::$config[$config_id] ) ) {
47 47
 			$config_id = 'global';
48 48
 		}
49 49
 
50
-		if ( 'theme_mod' === Kirki::$config[ $config_id ]['option_type'] ) {
50
+		if ( 'theme_mod' === Kirki::$config[$config_id]['option_type'] ) {
51 51
 
52 52
 			// We're using theme_mods so just get the value using get_theme_mod.
53 53
 			$default_value = null;
54
-			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) {
55
-				$default_value = Kirki::$fields[ $field_id ]['default'];
54
+			if ( isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[$field_id]['default'] ) ) {
55
+				$default_value = Kirki::$fields[$field_id]['default'];
56 56
 			}
57 57
 			$value = get_theme_mod( $field_id, $default_value );
58 58
 
59
-		} elseif ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) {
59
+		} elseif ( 'option' === Kirki::$config[$config_id]['option_type'] ) {
60 60
 
61 61
 			// We're using options.
62
-			if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) {
62
+			if ( '' !== Kirki::$config[$config_id]['option_name'] ) {
63 63
 
64 64
 				// Options are serialized as a single option in the db.
65 65
 				// We'll have to get the option and then get the item from the array.
66
-				$options = get_option( Kirki::$config[ $config_id ]['option_name'] );
66
+				$options = get_option( Kirki::$config[$config_id]['option_name'] );
67 67
 
68
-				if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']' ] ) ) {
69
-					$field_id = Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']';
68
+				if ( ! isset( Kirki::$fields[$field_id] ) && isset( Kirki::$fields[Kirki::$config[$config_id]['option_name'] . '[' . $field_id . ']'] ) ) {
69
+					$field_id = Kirki::$config[$config_id]['option_name'] . '[' . $field_id . ']';
70 70
 				}
71
-				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ]['option_name'] . '[', '', $field_id ) );
71
+				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[$config_id]['option_name'] . '[', '', $field_id ) );
72 72
 
73
-				$value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : Kirki::$fields[ $field_id ]['default'];
73
+				$value = ( isset( $options[$setting_modified] ) ) ? $options[$setting_modified] : Kirki::$fields[$field_id]['default'];
74 74
 				$value = maybe_unserialize( $value );
75 75
 			} else {
76 76
 
77 77
 				// Each option separately saved in the db.
78
-				$value = get_option( $field_id, Kirki::$fields[ $field_id ]['default'] );
78
+				$value = get_option( $field_id, Kirki::$fields[$field_id]['default'] );
79 79
 
80 80
 			} // End if().
81 81
 		} // End if().
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 			if ( isset( $field['option_name'] ) && '' !== $field['option_name'] ) {
101 101
 				$all_values = get_option( $field['option_name'], array() );
102 102
 				$sub_setting_id = str_replace( array( ']', $field['option_name'] . '[' ), '', $field['settings'] );
103
-				if ( isset( $all_values[ $sub_setting_id ] ) ) {
104
-					$value = $all_values[ $sub_setting_id ];
103
+				if ( isset( $all_values[$sub_setting_id] ) ) {
104
+					$value = $all_values[$sub_setting_id];
105 105
 				}
106 106
 			} else {
107 107
 				$value = get_option( $field['settings'], $field['default'] );
Please login to merge, or discard this patch.
modules/css/class-kirki-modules-css.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -184,11 +184,11 @@
 block discarded – undo
184 184
 
185 185
 			// Only continue if $field['output'] is set.
186 186
 			if ( isset( $field['output'] ) && ! empty( $field['output'] ) ) {
187
-				$css  = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
187
+				$css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
188 188
 
189 189
 				// Add the globals.
190
-				if ( isset( self::$css_array[ $config_id ] ) && ! empty( self::$css_array[ $config_id ] ) ) {
191
-					Kirki_Helper::array_replace_recursive( $css, self::$css_array[ $config_id ] );
190
+				if ( isset( self::$css_array[$config_id] ) && ! empty( self::$css_array[$config_id] ) ) {
191
+					Kirki_Helper::array_replace_recursive( $css, self::$css_array[$config_id] );
192 192
 				}
193 193
 			}
194 194
 		}
Please login to merge, or discard this patch.
field/class-kirki-field-repeater.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -72,23 +72,23 @@  discard block
 block discarded – undo
72 72
 
73 73
 			// Make sure the row is formatted as an array.
74 74
 			if ( ! is_array( $row_value ) ) {
75
-				$value[ $row_id ] = array();
75
+				$value[$row_id] = array();
76 76
 				continue;
77 77
 			}
78 78
 			// Start parsing sub-fields in rows.
79 79
 			foreach ( $row_value as $subfield_id => $subfield_value ) {
80 80
 				// Make sure this is a valid subfield.
81 81
 				// If it's not, then unset it.
82
-				if ( ! isset( $this->fields[ $subfield_id ] ) ) {
83
-					unset( $value[ $row_id ][ $subfield_id ] );
82
+				if ( ! isset( $this->fields[$subfield_id] ) ) {
83
+					unset( $value[$row_id][$subfield_id] );
84 84
 				}
85 85
 				// Get the subfield-type.
86
-				$subfield_type = $this->fields[ $subfield_id ]['type'];
86
+				$subfield_type = $this->fields[$subfield_id]['type'];
87 87
 
88 88
 				// Allow using a sanitize-callback on a per-field basis.
89
-				if ( isset( $this->fields[ $subfield_id ]['sanitize_callback'] ) ) {
89
+				if ( isset( $this->fields[$subfield_id]['sanitize_callback'] ) ) {
90 90
 
91
-					$subfield_value = call_user_func( $this->fields[ $subfield_id ]['sanitize_callback'], $subfield_value );
91
+					$subfield_value = call_user_func( $this->fields[$subfield_id]['sanitize_callback'], $subfield_value );
92 92
 
93 93
 				} else {
94 94
 
@@ -125,15 +125,15 @@  discard block
 block discarded – undo
125 125
 							$subfield_value = (string) intval( $subfield_value );
126 126
 							break;
127 127
 						case 'select':
128
-							if ( isset( $this->fields[ $subfield_id ]['multiple'] ) ) {
129
-								if ( true === $this->fields[ $subfield_id ]['multiple'] ) {
128
+							if ( isset( $this->fields[$subfield_id]['multiple'] ) ) {
129
+								if ( true === $this->fields[$subfield_id]['multiple'] ) {
130 130
 									$multiple = 2;
131 131
 								}
132
-								$multiple = (int) $this->fields[ $subfield_id ]['multiple'];
132
+								$multiple = (int) $this->fields[$subfield_id]['multiple'];
133 133
 								if ( 1 < $multiple ) {
134 134
 									$subfield_value = (array) $subfield_value;
135 135
 									foreach ( $subfield_value as $sub_subfield_key => $sub_subfield_value ) {
136
-										$subfield_value[ $sub_subfield_key ] = esc_attr( $sub_subfield_value );
136
+										$subfield_value[$sub_subfield_key] = esc_attr( $sub_subfield_value );
137 137
 									}
138 138
 								} else {
139 139
 									$subfield_value = esc_attr( $subfield_value );
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
 					} // End switch().
151 151
 				} // End if().
152
-				$value[ $row_id ][ $subfield_id ] = $subfield_value;
152
+				$value[$row_id][$subfield_id] = $subfield_value;
153 153
 			} // End foreach().
154 154
 		} // End foreach().
155 155
 
Please login to merge, or discard this patch.