Completed
Pull Request — develop (#1554)
by Aristeides
02:18
created
class-kirki-autoload.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 		}
55 55
 
56 56
 		// Check if we've got it cached and ready.
57
-		if ( isset( $this->cached_paths[ $class_name ] ) && file_exists( $this->cached_paths[ $class_name ] ) ) {
58
-			include_once $this->cached_paths[ $class_name ];
57
+		if ( isset( $this->cached_paths[$class_name] ) && file_exists( $this->cached_paths[$class_name] ) ) {
58
+			include_once $this->cached_paths[$class_name];
59 59
 			return;
60 60
 		}
61 61
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 		foreach ( $paths as $path ) {
65 65
 			$path = wp_normalize_path( $path );
66 66
 			if ( file_exists( $path ) ) {
67
-				$this->cached_paths[ $class_name ] = $path;
67
+				$this->cached_paths[$class_name] = $path;
68 68
 				include_once $path;
69 69
 				return;
70 70
 			}
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 			// Handle controls loading.
101 101
 			if ( 'Control' === $name_parts[0] || 'Settings' === $name_parts[0] ) {
102
-				$path  = dirname( __FILE__ ) . '/controls/php/';
102
+				$path = dirname( __FILE__ ) . '/controls/php/';
103 103
 
104 104
 				$paths[] = $path . $filename;
105 105
 			}
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 
115 115
 		$previous_path = '';
116 116
 		for ( $i = 0; $i < $levels; $i++ ) {
117
-			$paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
118
-			$previous_path .= strtolower( $exploded[ $i ] ) . '/';
117
+			$paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[$i] ) . '/' . $filename;
118
+			$previous_path .= strtolower( $exploded[$i] ) . '/';
119 119
 		}
120 120
 		return $paths;
121 121
 	}
Please login to merge, or discard this patch.
controls/php/class-kirki-control-typography.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -147,15 +147,15 @@  discard block
 block discarded – undo
147 147
 		}
148 148
 
149 149
 		foreach ( array_keys( $this->json['value'] ) as $key ) {
150
-			if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][ $key ] ) ) {
151
-				unset( $this->json['value'][ $key ] );
150
+			if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][$key] ) ) {
151
+				unset( $this->json['value'][$key] );
152 152
 			}
153 153
 		}
154 154
 
155 155
 		// Fix for https://github.com/aristath/kirki/issues/1405.
156 156
 		foreach ( array_keys( $this->json['value'] ) as $key ) {
157
-			if ( isset( $this->json['default'][ $key ] ) && false === $this->json['default'][ $key ] ) {
158
-				unset( $this->json['value'][ $key ] );
157
+			if ( isset( $this->json['default'][$key] ) && false === $this->json['default'][$key] ) {
158
+				unset( $this->json['value'][$key] );
159 159
 			}
160 160
 		}
161 161
 		$this->json['show_variants'] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 			if ( is_string( $variant ) ) {
339 339
 				$final_variants[] = array(
340 340
 					'id'    => $variant,
341
-					'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant,
341
+					'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant,
342 342
 				);
343 343
 			} elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) {
344 344
 				$final_variants[] = $variant;
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 					if ( array_key_exists( $variant, $all_variants ) ) {
420 420
 						$available_variants[] = array(
421 421
 							'id' => $variant,
422
-							'label' => $all_variants[ $variant ],
422
+							'label' => $all_variants[$variant],
423 423
 						);
424 424
 					}
425 425
 				}
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 					if ( array_key_exists( $subset, $all_subsets ) ) {
432 432
 						$available_subsets[] = array(
433 433
 							'id' => $subset,
434
-							'label' => $all_subsets[ $subset ],
434
+							'label' => $all_subsets[$subset],
435 435
 						);
436 436
 					}
437 437
 				}
Please login to merge, or discard this patch.