Completed
Pull Request — develop (#1315)
by Tim
03:03
created
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.
core/class-kirki-fonts-google.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -184,11 +184,11 @@  discard block
 block discarded – undo
184 184
 			}
185 185
 
186 186
 			// Add the requested google-font.
187
-			if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) {
188
-				$this->fonts[ $value['font-family'] ] = array();
187
+			if ( ! isset( $this->fonts[$value['font-family']] ) ) {
188
+				$this->fonts[$value['font-family']] = array();
189 189
 			}
190
-			if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) {
191
-				$this->fonts[ $value['font-family'] ][] = $value['variant'];
190
+			if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) {
191
+				$this->fonts[$value['font-family']][] = $value['variant'];
192 192
 			}
193 193
 		} else {
194 194
 
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
206 206
 
207 207
 					if ( 'font-family' === $output['property'] ) {
208 208
 						if ( ! array_key_exists( $value, $this->fonts ) ) {
209
-							$this->fonts[ $value ] = array();
209
+							$this->fonts[$value] = array();
210 210
 						}
211 211
 					} elseif ( 'font-weight' === $output['property'] ) {
212 212
 						foreach ( $this->fonts as $font => $variants ) {
213 213
 							if ( ! in_array( $value, $variants, true ) ) {
214
-								$this->fonts[ $font ][] = $value;
214
+								$this->fonts[$font][] = $value;
215 215
 							}
216 216
 						}
217 217
 					} elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) {
@@ -250,31 +250,31 @@  discard block
 block discarded – undo
250 250
 			// Determine if this is indeed a google font or not.
251 251
 			// If it's not, then just remove it from the array.
252 252
 			if ( ! array_key_exists( $font, $this->google_fonts ) ) {
253
-				unset( $this->fonts[ $font ] );
253
+				unset( $this->fonts[$font] );
254 254
 				continue;
255 255
 			}
256 256
 
257 257
 			// Get all valid font variants for this font.
258 258
 			$font_variants = array();
259
-			if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
260
-				$font_variants = $this->google_fonts[ $font ]['variants'];
259
+			if ( isset( $this->google_fonts[$font]['variants'] ) ) {
260
+				$font_variants = $this->google_fonts[$font]['variants'];
261 261
 			}
262 262
 			foreach ( $variants as $variant ) {
263 263
 
264 264
 				// If this is not a valid variant for this font-family
265 265
 				// then unset it and move on to the next one.
266 266
 				if ( ! in_array( $variant, $font_variants, true ) ) {
267
-					$variant_key = array_search( $variant, $this->fonts[ $font ] );
268
-					unset( $this->fonts[ $font ][ $variant_key ] );
267
+					$variant_key = array_search( $variant, $this->fonts[$font] );
268
+					unset( $this->fonts[$font][$variant_key] );
269 269
 					continue;
270 270
 				}
271 271
 			}
272 272
 
273 273
 			// Check if the selected subsets exist, even in one of the selected fonts.
274 274
 			// If they don't, then they have to be removed otherwise the link will fail.
275
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
275
+			if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
276 276
 				foreach ( $this->subsets as $subset ) {
277
-					if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) {
277
+					if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) {
278 278
 						$valid_subsets[] = $subset;
279 279
 					}
280 280
 				}
@@ -302,8 +302,8 @@  discard block
 block discarded – undo
302 302
 
303 303
 			// Are we force-loading all variants?
304 304
 			if ( true === self::$force_load_all_variants ) {
305
-				if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
306
-					$variants = $this->google_fonts[ $font ]['variants'];
305
+				if ( isset( $this->google_fonts[$font]['variants'] ) ) {
306
+					$variants = $this->google_fonts[$font]['variants'];
307 307
 				}
308 308
 			}
309 309
 			$variants = implode( ',', $variants );
@@ -318,8 +318,8 @@  discard block
 block discarded – undo
318 318
 		// Are we force-loading all subsets?
319 319
 		if ( true === self::$force_load_all_subsets ) {
320 320
 
321
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
322
-				foreach ( $this->google_fonts[ $font ]['subsets'] as $subset ) {
321
+			if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
322
+				foreach ( $this->google_fonts[$font]['subsets'] as $subset ) {
323 323
 					$this->subsets[] = $subset;
324 324
 				}
325 325
 			}
Please login to merge, or discard this patch.
core/class-kirki-fonts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 			$google_fonts = array();
96 96
 			if ( is_array( $fonts ) ) {
97 97
 				foreach ( $fonts['items'] as $font ) {
98
-					$google_fonts[ $font['family'] ] = array(
98
+					$google_fonts[$font['family']] = array(
99 99
 						'label'    => $font['family'],
100 100
 						'variants' => $font['variants'],
101 101
 						'subsets'  => $font['subsets'],
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		$fonts = self::get_all_fonts();
147 147
 		$fonts_array = array();
148 148
 		foreach ( $fonts as $key => $args ) {
149
-			$fonts_array[ $key ] = $key;
149
+			$fonts_array[$key] = $key;
150 150
 		}
151 151
 		return $fonts_array;
152 152
 	}
Please login to merge, or discard this patch.
settings/class-kirki-settings-repeater-setting.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@
 block discarded – undo
68 68
 		// Make sure that every row is an array, not an object.
69 69
 		foreach ( $sanitized as $key => $_value ) {
70 70
 			if ( empty( $_value ) ) {
71
-				unset( $sanitized[ $key ] );
71
+				unset( $sanitized[$key] );
72 72
 			} else {
73
-				$sanitized[ $key ] = (array) $_value;
73
+				$sanitized[$key] = (array) $_value;
74 74
 			}
75 75
 		}
76 76
 
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.
modules/css/field/class-kirki-output-field-background.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -31,32 +31,32 @@
 block discarded – undo
31 31
 
32 32
 		// Background-image.
33 33
 		if ( isset( $value['background-image'] ) && ! empty( $value['background-image'] ) ) {
34
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['background-image'] = $output['prefix'] . $this->process_property_value( 'background-image', $value['background-image'] ) . $output['suffix'];
34
+			$this->styles[$output['media_query']][$output['element']]['background-image'] = $output['prefix'] . $this->process_property_value( 'background-image', $value['background-image'] ) . $output['suffix'];
35 35
 		}
36 36
 
37 37
 		// Background-color.
38 38
 		if ( isset( $value['background-color'] ) && ! empty( $value['background-color'] ) ) {
39
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['background-color'] = $output['prefix'] . $this->process_property_value( 'background-color', $value['background-color'] ) . $output['suffix'];
39
+			$this->styles[$output['media_query']][$output['element']]['background-color'] = $output['prefix'] . $this->process_property_value( 'background-color', $value['background-color'] ) . $output['suffix'];
40 40
 		}
41 41
 
42 42
 		// Background-repeat.
43 43
 		if ( isset( $value['background-repeat'] ) && ! empty( $value['background-repeat'] ) ) {
44
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['background-repeat'] = $output['prefix'] . $this->process_property_value( 'background-repeat', $value['background-repeat'] ) . $output['suffix'];
44
+			$this->styles[$output['media_query']][$output['element']]['background-repeat'] = $output['prefix'] . $this->process_property_value( 'background-repeat', $value['background-repeat'] ) . $output['suffix'];
45 45
 		}
46 46
 
47 47
 		// Background-position.
48 48
 		if ( isset( $value['background-position'] ) && ! empty( $value['background-position'] ) ) {
49
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['background-position'] = $output['prefix'] . $this->process_property_value( 'background-position', $value['background-position'] ) . $output['suffix'];
49
+			$this->styles[$output['media_query']][$output['element']]['background-position'] = $output['prefix'] . $this->process_property_value( 'background-position', $value['background-position'] ) . $output['suffix'];
50 50
 		}
51 51
 
52 52
 		// Background-size.
53 53
 		if ( isset( $value['background-size'] ) && ! empty( $value['background-size'] ) ) {
54
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['background-size'] = $output['prefix'] . $this->process_property_value( 'background-size', $value['background-size'] ) . $output['suffix'];
54
+			$this->styles[$output['media_query']][$output['element']]['background-size'] = $output['prefix'] . $this->process_property_value( 'background-size', $value['background-size'] ) . $output['suffix'];
55 55
 		}
56 56
 
57 57
 		// Background-attachment.
58 58
 		if ( isset( $value['background-attachment'] ) && ! empty( $value['background-attachment'] ) ) {
59
-			$this->styles[ $output['media_query'] ][ $output['element'] ]['background-attachment'] = $output['prefix'] . $this->process_property_value( 'background-attachment', $value['background-attachment'] ) . $output['suffix'];
59
+			$this->styles[$output['media_query']][$output['element']]['background-attachment'] = $output['prefix'] . $this->process_property_value( 'background-attachment', $value['background-attachment'] ) . $output['suffix'];
60 60
 		}
61 61
 	}
62 62
 }
Please login to merge, or discard this patch.