Completed
Branch modular (f90ce2)
by Aristeides
02:19
created
modules/css-output/field/class-kirki-output-field-typography.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 			// Take care of font-families.
33 33
 			if ( isset( $value['font-family'] ) && ! empty( $value['font-family'] ) ) {
34 34
 				$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
35
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix'];
35
+				$this->styles[$output['media_query']][$output['element']]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix'];
36 36
 			}
37 37
 
38 38
 			// Add support for the older font-weight parameter.
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 			// Once a user visits their customizer and make changes to their typography,
41 41
 			// new values are saved and this one is no longer used.
42 42
 			if ( isset( $value['font-weight'] ) && ! empty( $value['font-weight'] ) ) {
43
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix'];
43
+				$this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix'];
44 44
 			}
45 45
 
46 46
 			// Take care of variants.
@@ -52,44 +52,44 @@  discard block
 block discarded – undo
52 52
 
53 53
 				// Is this italic?
54 54
 				$is_italic = ( false !== strpos( $value['variant'], 'italic' ) );
55
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix'];
56
-				$font_style = $is_italic ? 'italic' : 'normal' ;
57
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = $output['prefix'] . $font_style . $output['suffix'];
55
+				$this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix'];
56
+				$font_style = $is_italic ? 'italic' : 'normal';
57
+				$this->styles[$output['media_query']][$output['element']]['font-style'] = $output['prefix'] . $font_style . $output['suffix'];
58 58
 			}
59 59
 
60 60
 			// Take care of font-size.
61 61
 			if ( isset( $value['font-size'] ) && ! empty( $value['font-size'] ) ) {
62
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix'];
62
+				$this->styles[$output['media_query']][$output['element']]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix'];
63 63
 			}
64 64
 
65 65
 			// Take care of line-height.
66 66
 			if ( isset( $value['line-height'] ) && ! empty( $value['line-height'] ) ) {
67
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix'];
67
+				$this->styles[$output['media_query']][$output['element']]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix'];
68 68
 			}
69 69
 
70 70
 			// Take care of letter-spacing.
71 71
 			if ( isset( $value['letter-spacing'] ) && ( ! empty( $value['letter-spacing'] ) || '0' == $value['letter-spacing'] ) ) {
72
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix'];
72
+				$this->styles[$output['media_query']][$output['element']]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix'];
73 73
 			}
74 74
 
75 75
 			// Take care of word-spacing.
76 76
 			if ( isset( $value['word-spacing'] ) && ( ! empty( $value['word-spacing'] ) || '0' == $value['word-spacing'] ) ) {
77
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix'];
77
+				$this->styles[$output['media_query']][$output['element']]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix'];
78 78
 			}
79 79
 
80 80
 			// Take care of text-align.
81 81
 			if ( isset( $value['text-align'] ) && ! empty( $value['text-align'] ) ) {
82
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix'];
82
+				$this->styles[$output['media_query']][$output['element']]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix'];
83 83
 			}
84 84
 
85 85
 			// Take care of text-transform.
86 86
 			if ( isset( $value['text-transform'] ) && ! empty( $value['text-transform'] ) ) {
87
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix'];
87
+				$this->styles[$output['media_query']][$output['element']]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix'];
88 88
 			}
89 89
 
90 90
 			// Take care of color.
91 91
 			if ( isset( $value['color'] ) && ! empty( $value['color'] ) ) {
92
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['color'] = $output['prefix'] . $value['color'] . $output['suffix'];
92
+				$this->styles[$output['media_query']][$output['element']]['color'] = $output['prefix'] . $value['color'] . $output['suffix'];
93 93
 			}
94 94
 		}
95 95
 	}
Please login to merge, or discard this patch.
modules/css-output/field/class-kirki-output-field-spacing.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 					$property = $output['property'] . '-' . $key;
25 25
 				}
26 26
 				$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
27
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $sub_value;
27
+				$this->styles[$output['media_query']][$output['element']][$property] = $sub_value;
28 28
 			}
29 29
 		}
30 30
 	}
Please login to merge, or discard this patch.
modules/css-output/class-kirki-fonts.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 				$google_fonts = array();
101 101
 				if ( is_array( $fonts ) ) {
102 102
 					foreach ( $fonts['items'] as $font ) {
103
-						$google_fonts[ $font['family'] ] = array(
103
+						$google_fonts[$font['family']] = array(
104 104
 							'label'    => $font['family'],
105 105
 							'variants' => $font['variants'],
106 106
 							'subsets'  => $font['subsets'],
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			$fonts = self::get_all_fonts();
176 176
 			$fonts_array = array();
177 177
 			foreach ( $fonts as $key => $args ) {
178
-				$fonts_array[ $key ] = $key;
178
+				$fonts_array[$key] = $key;
179 179
 			}
180 180
 			return $fonts_array;
181 181
 		}
Please login to merge, or discard this patch.
modules/css-output/property/class-kirki-output-property-font-family.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@
 block discarded – undo
24 24
 			// Add backup font
25 25
 			if ( Kirki_Fonts::is_google_font( $this->value ) ) {
26 26
 
27
-				if ( isset( $google_fonts_array[ $this->value ] ) && isset( $google_fonts_array[ $this->value ]['category'] ) ) {
28
-					if ( isset( $backup_fonts[ $google_fonts_array[ $this->value ]['category'] ] ) ) {
27
+				if ( isset( $google_fonts_array[$this->value] ) && isset( $google_fonts_array[$this->value]['category'] ) ) {
28
+					if ( isset( $backup_fonts[$google_fonts_array[$this->value]['category']] ) ) {
29 29
 						// Add double quotes if needed
30 30
 						if ( false !== strpos( $this->value, ' ' ) && false === strpos( $this->value, '"' ) ) {
31
-							$this->value = '"' . $this->value . '", ' . $backup_fonts[ $google_fonts_array[ $this->value ]['category'] ];
31
+							$this->value = '"' . $this->value . '", ' . $backup_fonts[$google_fonts_array[$this->value]['category']];
32 32
 						} else {
33
-							$this->value .= ', ' . $backup_fonts[ $google_fonts_array[ $this->value ]['category'] ];
33
+							$this->value .= ', ' . $backup_fonts[$google_fonts_array[$this->value]['category']];
34 34
 						}
35 35
 					}
36 36
 				}
Please login to merge, or discard this patch.
modules/css-output/class-kirki-output.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -133,11 +133,11 @@  discard block
 block discarded – undo
133 133
 				return;
134 134
 			}
135 135
 			$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
136
-			$output['prefix']      = ( isset( $output['prefix'] ) )      ? $output['prefix']      : '';
137
-			$output['units']       = ( isset( $output['units'] ) )       ? $output['units']       : '';
138
-			$output['suffix']      = ( isset( $output['suffix'] ) )      ? $output['suffix']      : '';
136
+			$output['prefix']      = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';
137
+			$output['units']       = ( isset( $output['units'] ) ) ? $output['units'] : '';
138
+			$output['suffix']      = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
139 139
 
140
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
140
+			$this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
141 141
 		}
142 142
 
143 143
 		/**
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 				'background-position' => 'Kirki_Output_Property_Background_Position',
158 158
 			) );
159 159
 			if ( array_key_exists( $property, $properties ) ) {
160
-				$classname = $properties[ $property ];
160
+				$classname = $properties[$property];
161 161
 				$obj = new $classname( $property, $value );
162 162
 				return $obj->get_value();
163 163
 			}
Please login to merge, or discard this patch.
modules/css-output/class-kirki-fonts-google.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 				}
187 187
 
188 188
 				// Add the requested google-font.
189
-				if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) {
190
-					$this->fonts[ $value['font-family'] ] = array();
189
+				if ( ! isset( $this->fonts[$value['font-family']] ) ) {
190
+					$this->fonts[$value['font-family']] = array();
191 191
 				}
192
-				if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) {
193
-					$this->fonts[ $value['font-family'] ][] = $value['variant'];
192
+				if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) {
193
+					$this->fonts[$value['font-family']][] = $value['variant'];
194 194
 				}
195 195
 			} else {
196 196
 
@@ -208,12 +208,12 @@  discard block
 block discarded – undo
208 208
 
209 209
 						if ( 'font-family' === $output['property'] ) {
210 210
 							if ( ! array_key_exists( $value, $this->fonts ) ) {
211
-								$this->fonts[ $value ] = array();
211
+								$this->fonts[$value] = array();
212 212
 							}
213 213
 						} elseif ( 'font-weight' === $output['property'] ) {
214 214
 							foreach ( $this->fonts as $font => $variants ) {
215 215
 								if ( ! in_array( $value, $variants, true ) ) {
216
-									$this->fonts[ $font ][] = $value;
216
+									$this->fonts[$font][] = $value;
217 217
 								}
218 218
 							}
219 219
 						} elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) {
@@ -252,31 +252,31 @@  discard block
 block discarded – undo
252 252
 				// Determine if this is indeed a google font or not.
253 253
 				// If it's not, then just remove it from the array.
254 254
 				if ( ! array_key_exists( $font, $this->google_fonts ) ) {
255
-					unset( $this->fonts[ $font ] );
255
+					unset( $this->fonts[$font] );
256 256
 					continue;
257 257
 				}
258 258
 
259 259
 				// Get all valid font variants for this font.
260 260
 				$font_variants = array();
261
-				if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
262
-					$font_variants = $this->google_fonts[ $font ]['variants'];
261
+				if ( isset( $this->google_fonts[$font]['variants'] ) ) {
262
+					$font_variants = $this->google_fonts[$font]['variants'];
263 263
 				}
264 264
 				foreach ( $variants as $variant ) {
265 265
 
266 266
 					// If this is not a valid variant for this font-family
267 267
 					// then unset it and move on to the next one.
268 268
 					if ( ! in_array( $variant, $font_variants, true ) ) {
269
-						$variant_key = array_search( $variant, $this->fonts[ $font ] );
270
-						unset( $this->fonts[ $font ][ $variant_key ] );
269
+						$variant_key = array_search( $variant, $this->fonts[$font] );
270
+						unset( $this->fonts[$font][$variant_key] );
271 271
 						continue;
272 272
 					}
273 273
 				}
274 274
 
275 275
 				// Check if the selected subsets exist, even in one of the selected fonts.
276 276
 				// If they don't, then they have to be removed otherwise the link will fail.
277
-				if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
277
+				if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
278 278
 					foreach ( $this->subsets as $subset ) {
279
-						if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) {
279
+						if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) {
280 280
 							$valid_subsets[] = $subset;
281 281
 						}
282 282
 					}
@@ -301,8 +301,8 @@  discard block
 block discarded – undo
301 301
 
302 302
 				// Are we force-loading all variants?
303 303
 				if ( true === self::$force_load_all_variants ) {
304
-					if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
305
-						$variants = $this->google_fonts[ $font ]['variants'];
304
+					if ( isset( $this->google_fonts[$font]['variants'] ) ) {
305
+						$variants = $this->google_fonts[$font]['variants'];
306 306
 					}
307 307
 				}
308 308
 				$variants = implode( ',', $variants );
@@ -317,8 +317,8 @@  discard block
 block discarded – undo
317 317
 			// Are we force-loading all subsets?
318 318
 			if ( true === self::$force_load_all_subsets ) {
319 319
 
320
-				if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
321
-					foreach ( $this->google_fonts[ $font ]['subsets'] as $subset ) {
320
+				if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
321
+					foreach ( $this->google_fonts[$font]['subsets'] as $subset ) {
322 322
 						$this->subsets[] = $subset;
323 323
 					}
324 324
 				}
Please login to merge, or discard this patch.
modules/css-output/class-kirki-modules-css-output-generator.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 		 * @access public
40 40
 		 * @var null|string|array
41 41
 		 */
42
-		public static $settings    = null;
42
+		public static $settings = null;
43 43
 
44 44
 		/**
45 45
 		 * Output.
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		 * @access public
49 49
 		 * @var array
50 50
 		 */
51
-		public static $output      = array();
51
+		public static $output = array();
52 52
 
53 53
 		/**
54 54
 		 * Callback.
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		 * @access public
58 58
 		 * @var null|string|array
59 59
 		 */
60
-		public static $callback    = null;
60
+		public static $callback = null;
61 61
 
62 62
 		/**
63 63
 		 * Option Name.
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		 * @access public
76 76
 		 * @var string
77 77
 		 */
78
-		public static $field_type  = null;
78
+		public static $field_type = null;
79 79
 
80 80
 		/**
81 81
 		 * Google Fonts
@@ -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();
@@ -236,10 +236,10 @@  discard block
 block discarded – undo
236 236
 								'transition',
237 237
 								'transition-property',
238 238
 							) ) ) {
239
-								unset( $css[ $media_query ][ $element ][ $property ] );
240
-								$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
241
-								$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
242
-								$css[ $media_query ][ $element ][ $property ]              = $value;
239
+								unset( $css[$media_query][$element][$property] );
240
+								$css[$media_query][$element]['-webkit-' . $property] = $value;
241
+								$css[$media_query][$element]['-moz-' . $property]    = $value;
242
+								$css[$media_query][$element][$property]              = $value;
243 243
 							}
244 244
 
245 245
 							// Add -ms-* and -o-*.
@@ -249,10 +249,10 @@  discard block
 block discarded – undo
249 249
 								'transition',
250 250
 								'transition-property',
251 251
 							) ) ) {
252
-								unset( $css[ $media_query ][ $element ][ $property ] );
253
-								$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
254
-								$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
255
-								$css[ $media_query ][ $element ][ $property ]          = $value;
252
+								unset( $css[$media_query][$element][$property] );
253
+								$css[$media_query][$element]['-ms-' . $property] = $value;
254
+								$css[$media_query][$element]['-o-' . $property]  = $value;
255
+								$css[$media_query][$element][$property]          = $value;
256 256
 							}
257 257
 						}
258 258
 					}
Please login to merge, or discard this patch.
modules/tooltips/class-kirki-modules-tooltips.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		$fields = Kirki::$fields;
54 54
 		foreach ( $fields as $field ) {
55 55
 			if ( isset( $field['tooltip'] ) && ! empty( $field['tooltip'] ) ) {
56
-				$this->tooltips_content[ $field['settings'] ] = array(
56
+				$this->tooltips_content[$field['settings']] = array(
57 57
 					'id'      => sanitize_key( $field['settings'] ),
58 58
 					'content' => wp_kses_post( $field['tooltip'] ),
59 59
 				);
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	public function add_tooltip( $field_id, $tooltip ) {
73 73
 
74
-		$this->tooltips_content[ $field_id ] = array(
74
+		$this->tooltips_content[$field_id] = array(
75 75
 			'id'      => sanitize_key( $field_id ),
76 76
 			'content' => wp_kses_post( $tooltip ),
77 77
 		);
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
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 *
47 47
 	 * @static
48 48
 	 * @access public
49
-	 * @param boolean|integer|string|null $value The checkbox value.
49
+	 * @param boolean|string $value The checkbox value.
50 50
 	 * @return bool
51 51
 	 */
52 52
 	public static function sanitize( $value = null ) {
Please login to merge, or discard this patch.