Completed
Pull Request — master (#1454)
by Aristeides
05:16 queued 02:08
created
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.
modules/webfonts/class-kirki-modules-webfonts-async.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,9 +80,9 @@
 block discarded – undo
80 80
 		$fonts_to_load = array();
81 81
 		foreach ( $this->googlefonts->fonts as $font => $weights ) {
82 82
 			foreach ( $weights as $key => $value ) {
83
-				$weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
83
+				$weights[$key] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value );
84 84
 				if ( 'i' === $value ) {
85
-					$weights[ $key ] = '400i';
85
+					$weights[$key] = '400i';
86 86
 				}
87 87
 			}
88 88
 			$fonts_to_load[] = $font . ':' . join( ',', $weights );
Please login to merge, or discard this patch.
modules/css/class-kirki-modules-css.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -243,8 +243,8 @@
 block discarded – undo
243 243
 				$css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) );
244 244
 
245 245
 				// Add the globals.
246
-				if ( isset( self::$css_array[ $config_id ] ) && ! empty( self::$css_array[ $config_id ] ) ) {
247
-					Kirki_Helper::array_replace_recursive( $css, self::$css_array[ $config_id ] );
246
+				if ( isset( self::$css_array[$config_id] ) && ! empty( self::$css_array[$config_id] ) ) {
247
+					Kirki_Helper::array_replace_recursive( $css, self::$css_array[$config_id] );
248 248
 				}
249 249
 			}
250 250
 		}
Please login to merge, or discard this patch.
modules/css/property/class-kirki-output-property-font-family.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@
 block discarded – undo
43 43
 		// Add backup font.
44 44
 		if ( Kirki_Fonts::is_google_font( $family ) ) {
45 45
 
46
-			if ( '' === $backup && isset( $google_fonts_array[ $family ] ) && isset( $backup_fonts[ $google_fonts_array[ $family ]['category'] ] ) ) {
47
-				$backup = $backup_fonts[ $google_fonts_array[ $family ]['category'] ];
46
+			if ( '' === $backup && isset( $google_fonts_array[$family] ) && isset( $backup_fonts[$google_fonts_array[$family]['category']] ) ) {
47
+				$backup = $backup_fonts[$google_fonts_array[$family]['category']];
48 48
 			}
49 49
 
50 50
 			// Add double quotes if needed.
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
@@ -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();
@@ -247,10 +247,10 @@  discard block
 block discarded – undo
247 247
 							'transition',
248 248
 							'transition-property',
249 249
 						), true ) ) {
250
-							unset( $css[ $media_query ][ $element ][ $property ] );
251
-							$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
252
-							$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
253
-							$css[ $media_query ][ $element ][ $property ]              = $value;
250
+							unset( $css[$media_query][$element][$property] );
251
+							$css[$media_query][$element]['-webkit-' . $property] = $value;
252
+							$css[$media_query][$element]['-moz-' . $property]    = $value;
253
+							$css[$media_query][$element][$property]              = $value;
254 254
 						}
255 255
 
256 256
 						// Add -ms-* and -o-*.
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
260 260
 							'transition',
261 261
 							'transition-property',
262 262
 						), true ) ) {
263
-							unset( $css[ $media_query ][ $element ][ $property ] );
264
-							$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
265
-							$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
266
-							$css[ $media_query ][ $element ][ $property ]          = $value;
263
+							unset( $css[$media_query][$element][$property] );
264
+							$css[$media_query][$element]['-ms-' . $property] = $value;
265
+							$css[$media_query][$element]['-o-' . $property]  = $value;
266
+							$css[$media_query][$element][$property]          = $value;
267 267
 						}
268 268
 					}
269 269
 				}
Please login to merge, or discard this patch.
l10n.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@
 block discarded – undo
38 38
 
39 39
 			// If the theme's textdomain is loaded, assign the theme's translations
40 40
 			// to the "kirki" textdomain.
41
-			if ( isset( $l10n[ $theme_textdomain ] ) ) {
41
+			if ( isset( $l10n[$theme_textdomain] ) ) {
42 42
 				// @codingStandardsIgnoreLine
43
-				$l10n[ $domain ] = $l10n[ $theme_textdomain ];
43
+				$l10n[$domain] = $l10n[$theme_textdomain];
44 44
 			}
45 45
 
46 46
 			// Always override.  We only want the theme to handle translations.
Please login to merge, or discard this patch.
controls/dimensions/class-kirki-control-dimensions.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -79,14 +79,14 @@
 block discarded – undo
79 79
 		if ( is_array( $this->choices ) ) {
80 80
 			foreach ( $this->choices as $choice => $value ) {
81 81
 				if ( 'labels' !== $choice && true === $value ) {
82
-					$this->json['choices'][ $choice ] = true;
82
+					$this->json['choices'][$choice] = true;
83 83
 				}
84 84
 			}
85 85
 		}
86 86
 		if ( is_array( $this->json['default'] ) ) {
87 87
 			foreach ( $this->json['default'] as $key => $value ) {
88
-				if ( isset( $this->json['choices'][ $key ] ) && ! isset( $this->json['value'][ $key ] ) ) {
89
-					$this->json['value'][ $key ] = $value;
88
+				if ( isset( $this->json['choices'][$key] ) && ! isset( $this->json['value'][$key] ) ) {
89
+					$this->json['value'][$key] = $value;
90 90
 				}
91 91
 			}
92 92
 		}
Please login to merge, or discard this patch.
controls/repeater/class-kirki-control-repeater.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -111,12 +111,12 @@  discard block
 block discarded – undo
111 111
 
112 112
 		foreach ( $args['fields'] as $key => $value ) {
113 113
 			if ( ! isset( $value['default'] ) ) {
114
-				$args['fields'][ $key ]['default'] = '';
114
+				$args['fields'][$key]['default'] = '';
115 115
 			}
116 116
 			if ( ! isset( $value['label'] ) ) {
117
-				$args['fields'][ $key ]['label'] = '';
117
+				$args['fields'][$key]['label'] = '';
118 118
 			}
119
-			$args['fields'][ $key ]['id']      = $key;
119
+			$args['fields'][$key]['id'] = $key;
120 120
 
121 121
 			// We check if the filed is an uploaded media ( image , file, video, etc.. ).
122 122
 			if ( isset( $value['type'] ) ) {
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 					case 'cropped_image':
126 126
 					case 'upload':
127 127
 						// We add it to the list of fields that need some extra filtering/processing.
128
-						$media_fields_to_filter[ $key ] = true;
128
+						$media_fields_to_filter[$key] = true;
129 129
 						break;
130 130
 
131 131
 					case 'dropdown-pages':
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
140 140
 							)
141 141
 						);
142 142
 						// Hackily add in the data link parameter.
143
-						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][ $key ]['id'] ) . '"' . $this->get_link(), $dropdown );
144
-						$args['fields'][ $key ]['dropdown'] = $dropdown;
143
+						$dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][$key]['id'] ) . '"' . $this->get_link(), $dropdown );
144
+						$args['fields'][$key]['dropdown'] = $dropdown;
145 145
 						break;
146 146
 				}
147 147
 			}
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
 			}
582 582
 
583 583
 			// Validating row label field.
584
-			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][ esc_attr( $args['row_label']['field'] ) ] ) ) {
584
+			if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][esc_attr( $args['row_label']['field'] )] ) ) {
585 585
 				$this->row_label['field'] = esc_attr( $args['row_label']['field'] );
586 586
 			} else {
587 587
 				// If from field is not set correctly, making sure standard is set as the type.
Please login to merge, or discard this patch.
modules/webfonts/class-kirki-fonts-google.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -141,11 +141,11 @@  discard block
 block discarded – undo
141 141
 			}
142 142
 
143 143
 			// Add the requested google-font.
144
-			if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) {
145
-				$this->fonts[ $value['font-family'] ] = array();
144
+			if ( ! isset( $this->fonts[$value['font-family']] ) ) {
145
+				$this->fonts[$value['font-family']] = array();
146 146
 			}
147
-			if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) {
148
-				$this->fonts[ $value['font-family'] ][] = $value['variant'];
147
+			if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) {
148
+				$this->fonts[$value['font-family']][] = $value['variant'];
149 149
 			}
150 150
 			// Are we force-loading all variants?
151 151
 			if ( true === self::$force_load_all_variants ) {
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 
156 156
 			if ( ! empty( $args['choices']['variant'] ) ) {
157 157
 				foreach ( $args['choices']['variant'] as $extra_variant ) {
158
-					$this->fonts[ $value['font-family'] ][] = $extra_variant;
158
+					$this->fonts[$value['font-family']][] = $extra_variant;
159 159
 				}
160 160
 			}
161 161
 		} else {
@@ -175,12 +175,12 @@  discard block
 block discarded – undo
175 175
 					if ( is_string( $value ) ) {
176 176
 						if ( 'font-family' === $output['property'] ) {
177 177
 							if ( ! array_key_exists( $value, $this->fonts ) ) {
178
-								$this->fonts[ $value ] = array();
178
+								$this->fonts[$value] = array();
179 179
 							}
180 180
 						} elseif ( 'font-weight' === $output['property'] ) {
181 181
 							foreach ( $this->fonts as $font => $variants ) {
182 182
 								if ( ! in_array( $value, $variants, true ) ) {
183
-									$this->fonts[ $font ][] = $value;
183
+									$this->fonts[$font][] = $value;
184 184
 								}
185 185
 							}
186 186
 						} elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) {
@@ -220,31 +220,31 @@  discard block
 block discarded – undo
220 220
 			// Determine if this is indeed a google font or not.
221 221
 			// If it's not, then just remove it from the array.
222 222
 			if ( ! array_key_exists( $font, $this->google_fonts ) ) {
223
-				unset( $this->fonts[ $font ] );
223
+				unset( $this->fonts[$font] );
224 224
 				continue;
225 225
 			}
226 226
 
227 227
 			// Get all valid font variants for this font.
228 228
 			$font_variants = array();
229
-			if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
230
-				$font_variants = $this->google_fonts[ $font ]['variants'];
229
+			if ( isset( $this->google_fonts[$font]['variants'] ) ) {
230
+				$font_variants = $this->google_fonts[$font]['variants'];
231 231
 			}
232 232
 			foreach ( $variants as $variant ) {
233 233
 
234 234
 				// If this is not a valid variant for this font-family
235 235
 				// then unset it and move on to the next one.
236 236
 				if ( ! in_array( $variant, $font_variants, true ) ) {
237
-					$variant_key = array_search( $variant, $this->fonts[ $font ], true );
238
-					unset( $this->fonts[ $font ][ $variant_key ] );
237
+					$variant_key = array_search( $variant, $this->fonts[$font], true );
238
+					unset( $this->fonts[$font][$variant_key] );
239 239
 					continue;
240 240
 				}
241 241
 			}
242 242
 
243 243
 			// Check if the selected subsets exist, even in one of the selected fonts.
244 244
 			// If they don't, then they have to be removed otherwise the link will fail.
245
-			if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) {
245
+			if ( isset( $this->google_fonts[$font]['subsets'] ) ) {
246 246
 				foreach ( $this->subsets as $subset ) {
247
-					if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) {
247
+					if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) {
248 248
 						$valid_subsets[] = $subset;
249 249
 					}
250 250
 				}
Please login to merge, or discard this patch.