Completed
Pull Request — develop (#1334)
by Aristeides
02:56
created
modules/webfonts/class-kirki-fonts-google.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -142,15 +142,15 @@  discard block
 block discarded – undo
142 142
 			}
143 143
 
144 144
 			// Add the requested google-font.
145
-			if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) {
146
-				$this->fonts[ $value['font-family'] ] = array();
145
+			if ( ! isset( $this->fonts[$value['font-family']] ) ) {
146
+				$this->fonts[$value['font-family']] = array();
147 147
 			}
148
-			if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) {
149
-				$this->fonts[ $value['font-family'] ][] = $value['variant'];
148
+			if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) {
149
+				$this->fonts[$value['font-family']][] = $value['variant'];
150 150
 			}
151 151
 			if ( ! empty( $args['choices']['variant'] ) ) {
152 152
 				foreach ( $args['choices']['variant'] as $extra_variant ) {
153
-					$this->fonts[ $value['font-family'] ][] = $extra_variant;
153
+					$this->fonts[$value['font-family']][] = $extra_variant;
154 154
 				}
155 155
 			}
156 156
 		} else {
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
 
170 170
 					if ( 'font-family' === $output['property'] ) {
171 171
 						if ( ! array_key_exists( $value, $this->fonts ) ) {
172
-							$this->fonts[ $value ] = array();
172
+							$this->fonts[$value] = array();
173 173
 						}
174 174
 					} elseif ( 'font-weight' === $output['property'] ) {
175 175
 						foreach ( $this->fonts as $font => $variants ) {
176 176
 							if ( ! in_array( $value, $variants, true ) ) {
177
-								$this->fonts[ $font ][] = $value;
177
+								$this->fonts[$font][] = $value;
178 178
 							}
179 179
 						}
180 180
 					} elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) {
@@ -213,31 +213,31 @@  discard block
 block discarded – undo
213 213
 			// Determine if this is indeed a google font or not.
214 214
 			// If it's not, then just remove it from the array.
215 215
 			if ( ! array_key_exists( $font, $this->google_fonts ) ) {
216
-				unset( $this->fonts[ $font ] );
216
+				unset( $this->fonts[$font] );
217 217
 				continue;
218 218
 			}
219 219
 
220 220
 			// Get all valid font variants for this font.
221 221
 			$font_variants = array();
222
-			if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
223
-				$font_variants = $this->google_fonts[ $font ]['variants'];
222
+			if ( isset( $this->google_fonts[$font]['variants'] ) ) {
223
+				$font_variants = $this->google_fonts[$font]['variants'];
224 224
 			}
225 225
 			foreach ( $variants as $variant ) {
226 226
 
227 227
 				// If this is not a valid variant for this font-family
228 228
 				// then unset it and move on to the next one.
229 229
 				if ( ! in_array( $variant, $font_variants, true ) ) {
230
-					$variant_key = array_search( $variant, $this->fonts[ $font ] );
231
-					unset( $this->fonts[ $font ][ $variant_key ] );
230
+					$variant_key = array_search( $variant, $this->fonts[$font] );
231
+					unset( $this->fonts[$font][$variant_key] );
232 232
 					continue;
233 233
 				}
234 234
 			}
235 235
 
236 236
 			// Check if the selected subsets exist, even in one of the selected fonts.
237 237
 			// If they don't, then they have to be removed otherwise the link will fail.
238
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
238
+			if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
239 239
 				foreach ( $this->subsets as $subset ) {
240
-					if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) {
240
+					if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) {
241 241
 						$valid_subsets[] = $subset;
242 242
 					}
243 243
 				}
Please login to merge, or discard this patch.
core/class-kirki-setting-user-meta.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 		// @codingStandardsIgnoreLine
46 46
 		$single_meta = get_user_meta( get_current_user_id(), $id_base, true );
47 47
 
48
-		if ( isset( $user_meta[ $id_base ] ) ) {
48
+		if ( isset( $user_meta[$id_base] ) ) {
49 49
 			return $single_meta;
50 50
 		}
51 51
 		return $default;
Please login to merge, or discard this patch.
core/class-kirki-settings.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 		// Get the classname we'll be using to create our setting(s).
69 69
 		$classname = false;
70 70
 		if ( isset( $args['option_type'] ) && array_key_exists( $args['option_type'], $this->setting_types ) ) {
71
-			$classname = $this->setting_types[ $args['option_type'] ];
71
+			$classname = $this->setting_types[$args['option_type']];
72 72
 		}
73 73
 		if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->setting_types ) ) {
74 74
 			$args['type'] = 'default';
75 75
 		}
76
-		$classname = ! $classname ? $this->setting_types[ $args['type'] ] : $classname;
76
+		$classname = ! $classname ? $this->setting_types[$args['type']] : $classname;
77 77
 
78 78
 		// If settings are defined as an array, then we need to go through them
79 79
 		// and call add_setting for each one of them separately.
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 				$args['default'] = array();
85 85
 			}
86 86
 			foreach ( $args['settings'] as $key => $value ) {
87
-				$default   = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : '';
87
+				$default = ( isset( $defaults[$key] ) ) ? $defaults[$key] : '';
88 88
 				$this->add_setting( $classname, $value, $default, $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] );
89 89
 			}
90 90
 		}
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		foreach ( $this->setting_types as $key => $classname ) {
137 137
 
138 138
 			if ( ! class_exists( $classname ) ) {
139
-				unset( $this->setting_types[ $key ] );
139
+				unset( $this->setting_types[$key] );
140 140
 			}
141 141
 		}
142 142
 	}
Please login to merge, or discard this patch.
controls/typography/class-kirki-control-typography.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 		if ( false === $config_id ) {
392 392
 			return $translation_strings;
393 393
 		}
394
-		return $translation_strings[ $config_id ];
394
+		return $translation_strings[$config_id];
395 395
 	}
396 396
 
397 397
 	/**
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 			if ( is_string( $variant ) ) {
411 411
 				$final_variants[] = array(
412 412
 					'id'    => $variant,
413
-					'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant,
413
+					'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant,
414 414
 				);
415 415
 			} elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) {
416 416
 				$final_variants[] = $variant;
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 				if ( array_key_exists( $variant, $all_variants ) ) {
485 485
 					$available_variants[] = array(
486 486
 						'id' => $variant,
487
-						'label' => $all_variants[ $variant ],
487
+						'label' => $all_variants[$variant],
488 488
 					);
489 489
 				}
490 490
 			}
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 				if ( array_key_exists( $subset, $all_subsets ) ) {
495 495
 					$available_subsets[] = array(
496 496
 						'id' => $subset,
497
-						'label' => $all_subsets[ $subset ],
497
+						'label' => $all_subsets[$subset],
498 498
 					);
499 499
 				}
500 500
 			}
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
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 			'kirki-multicolor' => 'Kirki_Output_Field_Multicolor',
172 172
 		) );
173 173
 		if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
174
-			$classname = $field_output_classes[ self::$field_type ];
174
+			$classname = $field_output_classes[self::$field_type];
175 175
 		}
176 176
 		$obj = new $classname( $field['kirki_config'], self::$output, self::$value );
177 177
 		return $obj->get_styles();
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
235 235
 							'transition',
236 236
 							'transition-property',
237 237
 						), true ) ) {
238
-							unset( $css[ $media_query ][ $element ][ $property ] );
239
-							$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
240
-							$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
241
-							$css[ $media_query ][ $element ][ $property ]              = $value;
238
+							unset( $css[$media_query][$element][$property] );
239
+							$css[$media_query][$element]['-webkit-' . $property] = $value;
240
+							$css[$media_query][$element]['-moz-' . $property]    = $value;
241
+							$css[$media_query][$element][$property]              = $value;
242 242
 						}
243 243
 
244 244
 						// Add -ms-* and -o-*.
@@ -248,10 +248,10 @@  discard block
 block discarded – undo
248 248
 							'transition',
249 249
 							'transition-property',
250 250
 						), true ) ) {
251
-							unset( $css[ $media_query ][ $element ][ $property ] );
252
-							$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
253
-							$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
254
-							$css[ $media_query ][ $element ][ $property ]          = $value;
251
+							unset( $css[$media_query][$element][$property] );
252
+							$css[$media_query][$element]['-ms-' . $property] = $value;
253
+							$css[$media_query][$element]['-o-' . $property]  = $value;
254
+							$css[$media_query][$element][$property]          = $value;
255 255
 						}
256 256
 					}
257 257
 				}
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'] || 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'] || 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.
modules/postmessage/class-kirki-modules-postmessage.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			'units'         => '',
81 81
 			'js_callback'   => array( '', '' ),
82 82
 			'value_pattern' => '',
83
-		));
83
+		) );
84 84
 
85 85
 		// Element should be a string.
86 86
 		if ( is_array( $args['element'] ) ) {
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 			$value .= '+' . $args['units'] . $args['suffix'];
115 115
 		}
116 116
 		$scripts_array = array();
117
-		$scripts_array[ sanitize_key( $args['element'] ) ][ sanitize_key( $args['property'] ) ]['script'] = $property_script . $script;
118
-		$scripts_array[ sanitize_key( $args['element'] ) ][ sanitize_key( $args['property'] ) ]['css']    = $args['element'] . '{' . $args['property'] . ':\'+' . $value_key . '+\';}';
117
+		$scripts_array[sanitize_key( $args['element'] )][sanitize_key( $args['property'] )]['script'] = $property_script . $script;
118
+		$scripts_array[sanitize_key( $args['element'] )][sanitize_key( $args['property'] )]['css']    = $args['element'] . '{' . $args['property'] . ':\'+' . $value_key . '+\';}';
119 119
 
120 120
 		return $scripts_array;
121 121
 	}
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 		// Loop through the js_vars and generate the script.
139 139
 		foreach ( $args['js_vars'] as $key => $js_var ) {
140 140
 			$js_var['index_key'] = $key;
141
-			$field['scripts'][ $key ] = $this->_script( $js_var );
141
+			$field['scripts'][$key] = $this->_script( $js_var );
142 142
 		}
143 143
 		$combo_extra_script = '';
144 144
 		$combo_css_script   = '';
Please login to merge, or discard this patch.