Completed
Pull Request — develop (#1608)
by Traian
02:48
created
controls/php/class-kirki-settings-repeater-setting.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,9 +67,9 @@
 block discarded – undo
67 67
 
68 68
 		// Make sure that every row is an array, not an object.
69 69
 		foreach ( $sanitized as $key => $_value ) {
70
-			$sanitized[ $key ] = (array) $_value;
70
+			$sanitized[$key] = (array) $_value;
71 71
 			if ( empty( $_value ) ) {
72
-				unset( $sanitized[ $key ] );
72
+				unset( $sanitized[$key] );
73 73
 			}
74 74
 		}
75 75
 
Please login to merge, or discard this patch.
controls/php/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.
controls/php/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.
modules/css/field/class-kirki-output-field-multicolor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 			$output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
48 48
 
49 49
 			// Create the styles.
50
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $sub_value . $output['suffix'];
50
+			$this->styles[$output['media_query']][$output['element']][$property] = $sub_value . $output['suffix'];
51 51
 
52 52
 		}
53 53
 	}
Please login to merge, or discard this patch.
core/class-kirki-l10n.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 	 * Returns an array of paths where translation files may be located.
94 94
 	 *
95 95
 	 * @access protected
96
-	 * @return array
96
+	 * @return string[]
97 97
 	 */
98 98
 	protected function get_paths() {
99 99
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -117,9 +117,9 @@
 block discarded – undo
117 117
 	public function override_load_textdomain( $override, $domain, $mofile ) {
118 118
 
119 119
 		global $l10n;
120
-		if ( isset( $l10n[ $this->get_theme_textdomain() ] ) ) {
120
+		if ( isset( $l10n[$this->get_theme_textdomain()] ) ) {
121 121
 			// @codingStandardsIgnoreLine WordPress.Variables.GlobalVariables.OverrideProhibited
122
-			$l10n['kirki'] = $l10n[ $this->get_theme_textdomain() ];
122
+			$l10n['kirki'] = $l10n[$this->get_theme_textdomain()];
123 123
 		}
124 124
 
125 125
 		// Check if the domain is "kirki".
Please login to merge, or discard this patch.
controls/php/class-kirki-control-background.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -200,10 +200,13 @@
 block discarded – undo
200 200
 			</div>
201 201
 			<?php if ( Kirki_Util::get_wp_version() >= 4.9 ) : ?>
202 202
 				<input class="background-hidden-value" type="hidden" {{{ data.link }}}>
203
-			<?php else : ?>
203
+			<?php else {
204
+	: ?>
204 205
 				<# valueJSON = JSON.stringify( data.value ).replace( /'/g, '&#39' ); #>
205 206
 				<input class="background-hidden-value" type="hidden" value='{{{ valueJSON }}}' {{{ data.link }}}>
206
-			<?php endif; ?>
207
+			<?php endif;
208
+}
209
+?>
207 210
 		<?php
208 211
 	}
209 212
 }
Please login to merge, or discard this patch.
controls/php/class-kirki-control-typography.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -336,7 +336,8 @@  discard block
 block discarded – undo
336 336
 		</div>
337 337
 		<?php if ( Kirki_Util::get_wp_version() >= 4.9 ) : ?>
338 338
 			<input class="typography-hidden-value" type="hidden" {{{ data.link }}}>
339
-		<?php else : ?>
339
+		<?php else {
340
+	: ?>
340 341
 			<#
341 342
 			if ( ! _.isUndefined( data.value['font-family'] ) ) {
342 343
 				data.value['font-family'] = data.value['font-family'].replace( /&quot;/g, '&#39' );
@@ -344,7 +345,9 @@  discard block
 block discarded – undo
344 345
 			valueJSON = JSON.stringify( data.value ).replace( /'/g, '&#39' );
345 346
 			#>
346 347
 			<input class="typography-hidden-value" type="hidden" value='{{{ valueJSON }}}' {{{ data.link }}}>
347
-		<?php endif; ?>
348
+		<?php endif;
349
+}
350
+?>
348 351
 		<?php
349 352
 	}
350 353
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -51,15 +51,15 @@  discard block
 block discarded – undo
51 51
 		parent::to_json();
52 52
 
53 53
 		foreach ( array_keys( $this->json['value'] ) as $key ) {
54
-			if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][ $key ] ) ) {
55
-				unset( $this->json['value'][ $key ] );
54
+			if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][$key] ) ) {
55
+				unset( $this->json['value'][$key] );
56 56
 			}
57 57
 		}
58 58
 
59 59
 		// Fix for https://github.com/aristath/kirki/issues/1405.
60 60
 		foreach ( array_keys( $this->json['value'] ) as $key ) {
61
-			if ( isset( $this->json['default'][ $key ] ) && false === $this->json['default'][ $key ] ) {
62
-				unset( $this->json['value'][ $key ] );
61
+			if ( isset( $this->json['default'][$key] ) && false === $this->json['default'][$key] ) {
62
+				unset( $this->json['value'][$key] );
63 63
 			}
64 64
 		}
65 65
 		$this->json['show_variants'] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			if ( is_string( $variant ) ) {
258 258
 				$final_variants[] = array(
259 259
 					'id'    => $variant,
260
-					'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant,
260
+					'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant,
261 261
 				);
262 262
 			} elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) {
263 263
 				$final_variants[] = $variant;
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 					if ( array_key_exists( $variant, $all_variants ) ) {
339 339
 						$available_variants[] = array(
340 340
 							'id' => $variant,
341
-							'label' => $all_variants[ $variant ],
341
+							'label' => $all_variants[$variant],
342 342
 						);
343 343
 					}
344 344
 				}
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 					if ( array_key_exists( $subset, $all_subsets ) ) {
351 351
 						$available_subsets[] = array(
352 352
 							'id' => $subset,
353
-							'label' => $all_subsets[ $subset ],
353
+							'label' => $all_subsets[$subset],
354 354
 						);
355 355
 					}
356 356
 				}
Please login to merge, or discard this patch.
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
 				$paths[] = $path . $filename;
104 104
 			}
105 105
 		}
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$previous_path = '';
115 115
 		for ( $i = 0; $i < $levels; $i++ ) {
116
-			$paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
117
-			$previous_path .= strtolower( $exploded[ $i ] ) . '/';
116
+			$paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[$i] ) . '/' . $filename;
117
+			$previous_path .= strtolower( $exploded[$i] ) . '/';
118 118
 		}
119 119
 		return $paths;
120 120
 	}
Please login to merge, or discard this patch.
controls/php/class-kirki-control-multicolor.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,9 +68,12 @@
 block discarded – undo
68 68
 		<div class="iris-target"></div>
69 69
 		<?php if ( Kirki_Util::get_wp_version() >= 4.9 ) : ?>
70 70
 			<input class="multicolor-hidden-value" type="hidden" {{{ data.link }}}>
71
-		<?php else : ?>
71
+		<?php else {
72
+	: ?>
72 73
 			<input class="multicolor-hidden-value" type="hidden" value='{{{ JSON.stringify( data.value ) }}}' {{{ data.link }}}>
73
-		<?php endif; ?>
74
+		<?php endif;
75
+}
76
+?>
74 77
 		<?php
75 78
 	}
76 79
 }
Please login to merge, or discard this patch.