Completed
Push — develop ( 720728...cae3a5 )
by Aristeides
05:31
created
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-checkbox.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 	 * Sanitizes checkbox values.
41 41
 	 *
42 42
 	 * @access public
43
-	 * @param boolean|integer|string|null $value The checkbox value.
43
+	 * @param boolean|string $value The checkbox value.
44 44
 	 * @return bool
45 45
 	 */
46 46
 	public function sanitize( $value = null ) {
Please login to merge, or discard this patch.
modules/collapsible/class-kirki-modules-collapsible.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
 		$fields = Kirki::$fields;
50 50
 		foreach ( $fields as $field ) {
51 51
 			if ( isset( $field['collapsible'] ) && true === $field['collapsible'] && isset( $field['settings'] ) && isset( $field['label'] ) ) {
52
-				$collapsible_fields[ $field['settings'] ] = $field['label'];
52
+				$collapsible_fields[$field['settings']] = $field['label'];
53 53
 			}
54 54
 		}
55 55
 		$collapsible_fields = array_unique( $collapsible_fields );
Please login to merge, or discard this patch.
field/class-kirki-field-number.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 
73 73
 			$smallest = array();
74 74
 			foreach ( $valid as $possible_value ) {
75
-				$smallest[ $possible_value ] = abs( $possible_value - $value );
75
+				$smallest[$possible_value] = abs( $possible_value - $value );
76 76
 			}
77 77
 			asort( $smallest );
78 78
 			$value = key( $smallest );
Please login to merge, or discard this patch.
modules/css/field/class-kirki-output-field-dimensions.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 				$property = $output['property'] . '-' . $key;
34 34
 			}
35 35
 			$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
36
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $sub_value;
36
+			$this->styles[$output['media_query']][$output['element']][$property] = $sub_value;
37 37
 
38 38
 		}
39 39
 	}
Please login to merge, or discard this patch.
modules/css/field/class-kirki-output-field-multicolor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 			$output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
55 55
 
56 56
 			// Create the styles.
57
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $sub_value . $output['suffix'];
57
+			$this->styles[$output['media_query']][$output['element']][$output['property']] = $sub_value . $output['suffix'];
58 58
 
59 59
 		}
60 60
 	}
Please login to merge, or discard this patch.
modules/css/field/class-kirki-output-field-typography.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 		// Take care of font-families.
31 31
 		if ( isset( $value['font-family'] ) && ! empty( $value['font-family'] ) ) {
32 32
 			$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
33
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix'];
33
+			$this->styles[$output['media_query']][$output['element']]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix'];
34 34
 		}
35 35
 
36 36
 		// Add support for the older font-weight parameter.
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		// Once a user visits their customizer and make changes to their typography,
39 39
 		// new values are saved and this one is no longer used.
40 40
 		if ( isset( $value['font-weight'] ) && ! empty( $value['font-weight'] ) ) {
41
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix'];
41
+			$this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix'];
42 42
 		}
43 43
 
44 44
 		// Take care of variants.
@@ -50,44 +50,44 @@  discard block
 block discarded – undo
50 50
 
51 51
 			// Is this italic?
52 52
 			$is_italic = ( false !== strpos( $value['variant'], 'italic' ) );
53
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix'];
54
-			$font_style = $is_italic ? 'italic' : 'normal' ;
55
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = $output['prefix'] . $font_style . $output['suffix'];
53
+			$this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix'];
54
+			$font_style = $is_italic ? 'italic' : 'normal';
55
+			$this->styles[$output['media_query']][$output['element']]['font-style'] = $output['prefix'] . $font_style . $output['suffix'];
56 56
 		}
57 57
 
58 58
 		// Take care of font-size.
59 59
 		if ( isset( $value['font-size'] ) && ! empty( $value['font-size'] ) ) {
60
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix'];
60
+			$this->styles[$output['media_query']][$output['element']]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix'];
61 61
 		}
62 62
 
63 63
 		// Take care of line-height.
64 64
 		if ( isset( $value['line-height'] ) && ! empty( $value['line-height'] ) ) {
65
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix'];
65
+			$this->styles[$output['media_query']][$output['element']]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix'];
66 66
 		}
67 67
 
68 68
 		// Take care of letter-spacing.
69 69
 		if ( isset( $value['letter-spacing'] ) && ( ! empty( $value['letter-spacing'] ) || '0' == $value['letter-spacing'] ) ) {
70
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix'];
70
+			$this->styles[$output['media_query']][$output['element']]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix'];
71 71
 		}
72 72
 
73 73
 		// Take care of word-spacing.
74 74
 		if ( isset( $value['word-spacing'] ) && ( ! empty( $value['word-spacing'] ) || '0' == $value['word-spacing'] ) ) {
75
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix'];
75
+			$this->styles[$output['media_query']][$output['element']]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix'];
76 76
 		}
77 77
 
78 78
 		// Take care of text-align.
79 79
 		if ( isset( $value['text-align'] ) && ! empty( $value['text-align'] ) ) {
80
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix'];
80
+			$this->styles[$output['media_query']][$output['element']]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix'];
81 81
 		}
82 82
 
83 83
 		// Take care of text-transform.
84 84
 		if ( isset( $value['text-transform'] ) && ! empty( $value['text-transform'] ) ) {
85
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix'];
85
+			$this->styles[$output['media_query']][$output['element']]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix'];
86 86
 		}
87 87
 
88 88
 		// Take care of color.
89 89
 		if ( isset( $value['color'] ) && ! empty( $value['color'] ) ) {
90
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['color'] = $output['prefix'] . $value['color'] . $output['suffix'];
90
+			$this->styles[$output['media_query']][$output['element']]['color'] = $output['prefix'] . $value['color'] . $output['suffix'];
91 91
 		}
92 92
 	}
93 93
 }
Please login to merge, or discard this patch.