@@ -68,9 +68,9 @@ |
||
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 |
@@ -86,26 +86,26 @@ discard block |
||
86 | 86 | |
87 | 87 | // Make sure the row is formatted as an array. |
88 | 88 | if ( ! is_array( $row_value ) ) { |
89 | - $value[ $row_id ] = array(); |
|
89 | + $value[$row_id] = array(); |
|
90 | 90 | continue; |
91 | 91 | } |
92 | 92 | // Start parsing sub-fields in rows. |
93 | 93 | foreach ( $row_value as $subfield_id => $subfield_value ) { |
94 | 94 | // Make sure this is a valid subfield. |
95 | 95 | // If it's not, then unset it. |
96 | - if ( ! isset( $this->fields[ $subfield_id ] ) ) { |
|
97 | - unset( $value[ $row_id ][ $subfield_id ] ); |
|
96 | + if ( ! isset( $this->fields[$subfield_id] ) ) { |
|
97 | + unset( $value[$row_id][$subfield_id] ); |
|
98 | 98 | } |
99 | 99 | // Get the subfield-type. |
100 | - if ( ! isset( $this->fields[ $subfield_id ]['type'] ) ) { |
|
100 | + if ( ! isset( $this->fields[$subfield_id]['type'] ) ) { |
|
101 | 101 | continue; |
102 | 102 | } |
103 | - $subfield_type = $this->fields[ $subfield_id ]['type']; |
|
103 | + $subfield_type = $this->fields[$subfield_id]['type']; |
|
104 | 104 | |
105 | 105 | // Allow using a sanitize-callback on a per-field basis. |
106 | - if ( isset( $this->fields[ $subfield_id ]['sanitize_callback'] ) ) { |
|
106 | + if ( isset( $this->fields[$subfield_id]['sanitize_callback'] ) ) { |
|
107 | 107 | |
108 | - $subfield_value = call_user_func( $this->fields[ $subfield_id ]['sanitize_callback'], $subfield_value ); |
|
108 | + $subfield_value = call_user_func( $this->fields[$subfield_id]['sanitize_callback'], $subfield_value ); |
|
109 | 109 | |
110 | 110 | } else { |
111 | 111 | |
@@ -142,15 +142,15 @@ discard block |
||
142 | 142 | $subfield_value = (string) intval( $subfield_value ); |
143 | 143 | break; |
144 | 144 | case 'select': |
145 | - if ( isset( $this->fields[ $subfield_id ]['multiple'] ) ) { |
|
146 | - if ( true === $this->fields[ $subfield_id ]['multiple'] ) { |
|
145 | + if ( isset( $this->fields[$subfield_id]['multiple'] ) ) { |
|
146 | + if ( true === $this->fields[$subfield_id]['multiple'] ) { |
|
147 | 147 | $multiple = 2; |
148 | 148 | } |
149 | - $multiple = (int) $this->fields[ $subfield_id ]['multiple']; |
|
149 | + $multiple = (int) $this->fields[$subfield_id]['multiple']; |
|
150 | 150 | if ( 1 < $multiple ) { |
151 | 151 | $subfield_value = (array) $subfield_value; |
152 | 152 | foreach ( $subfield_value as $sub_subfield_key => $sub_subfield_value ) { |
153 | - $subfield_value[ $sub_subfield_key ] = esc_attr( $sub_subfield_value ); |
|
153 | + $subfield_value[$sub_subfield_key] = esc_attr( $sub_subfield_value ); |
|
154 | 154 | } |
155 | 155 | } else { |
156 | 156 | $subfield_value = esc_attr( $subfield_value ); |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | |
167 | 167 | } // End switch(). |
168 | 168 | } // End if(). |
169 | - $value[ $row_id ][ $subfield_id ] = $subfield_value; |
|
169 | + $value[$row_id][$subfield_id] = $subfield_value; |
|
170 | 170 | } // End foreach(). |
171 | 171 | } // End foreach(). |
172 | 172 |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | |
109 | 109 | // Are we force-loading all variants? |
110 | 110 | if ( true === Kirki_Fonts_Google::$force_load_all_variants ) { |
111 | - if ( isset( $this->google_fonts[ $font ]['variants'] ) ) { |
|
112 | - $variants = $this->google_fonts[ $font ]['variants']; |
|
111 | + if ( isset( $this->google_fonts[$font]['variants'] ) ) { |
|
112 | + $variants = $this->google_fonts[$font]['variants']; |
|
113 | 113 | } |
114 | 114 | } |
115 | 115 | $variants = implode( ',', $variants ); |
@@ -124,8 +124,8 @@ discard block |
||
124 | 124 | // Are we force-loading all subsets? |
125 | 125 | if ( true === Kirki_Fonts_Google::$force_load_all_subsets ) { |
126 | 126 | |
127 | - if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) { |
|
128 | - foreach ( $this->google_fonts[ $font ]['subsets'] as $subset ) { |
|
127 | + if ( isset( $this->google_fonts[$font]['subsets'] ) ) { |
|
128 | + foreach ( $this->google_fonts[$font]['subsets'] as $subset ) { |
|
129 | 129 | $this->subsets[] = $subset; |
130 | 130 | } |
131 | 131 | } |
@@ -95,7 +95,7 @@ discard block |
||
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 |
||
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 | } |
@@ -142,15 +142,15 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | // Add the requested google-font. |
145 | - if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) { |
|
146 | - $this->fonts[ $value['font-family'] ] = array(); |
|
145 | + if ( ! isset( $this->fonts[$value['font-family']] ) ) { |
|
146 | + $this->fonts[$value['font-family']] = array(); |
|
147 | 147 | } |
148 | - if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) { |
|
149 | - $this->fonts[ $value['font-family'] ][] = $value['variant']; |
|
148 | + if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) { |
|
149 | + $this->fonts[$value['font-family']][] = $value['variant']; |
|
150 | 150 | } |
151 | 151 | if ( ! empty( $args['choices']['variant'] ) ) { |
152 | 152 | foreach ( $args['choices']['variant'] as $extra_variant ) { |
153 | - $this->fonts[ $value['font-family'] ][] = $extra_variant; |
|
153 | + $this->fonts[$value['font-family']][] = $extra_variant; |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | } else { |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | |
170 | 170 | if ( 'font-family' === $output['property'] ) { |
171 | 171 | if ( ! array_key_exists( $value, $this->fonts ) ) { |
172 | - $this->fonts[ $value ] = array(); |
|
172 | + $this->fonts[$value] = array(); |
|
173 | 173 | } |
174 | 174 | } elseif ( 'font-weight' === $output['property'] ) { |
175 | 175 | foreach ( $this->fonts as $font => $variants ) { |
176 | 176 | if ( ! in_array( $value, $variants, true ) ) { |
177 | - $this->fonts[ $font ][] = $value; |
|
177 | + $this->fonts[$font][] = $value; |
|
178 | 178 | } |
179 | 179 | } |
180 | 180 | } elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) { |
@@ -213,31 +213,31 @@ discard block |
||
213 | 213 | // Determine if this is indeed a google font or not. |
214 | 214 | // If it's not, then just remove it from the array. |
215 | 215 | if ( ! array_key_exists( $font, $this->google_fonts ) ) { |
216 | - unset( $this->fonts[ $font ] ); |
|
216 | + unset( $this->fonts[$font] ); |
|
217 | 217 | continue; |
218 | 218 | } |
219 | 219 | |
220 | 220 | // Get all valid font variants for this font. |
221 | 221 | $font_variants = array(); |
222 | - if ( isset( $this->google_fonts[ $font ]['variants'] ) ) { |
|
223 | - $font_variants = $this->google_fonts[ $font ]['variants']; |
|
222 | + if ( isset( $this->google_fonts[$font]['variants'] ) ) { |
|
223 | + $font_variants = $this->google_fonts[$font]['variants']; |
|
224 | 224 | } |
225 | 225 | foreach ( $variants as $variant ) { |
226 | 226 | |
227 | 227 | // If this is not a valid variant for this font-family |
228 | 228 | // then unset it and move on to the next one. |
229 | 229 | if ( ! in_array( $variant, $font_variants, true ) ) { |
230 | - $variant_key = array_search( $variant, $this->fonts[ $font ] ); |
|
231 | - unset( $this->fonts[ $font ][ $variant_key ] ); |
|
230 | + $variant_key = array_search( $variant, $this->fonts[$font] ); |
|
231 | + unset( $this->fonts[$font][$variant_key] ); |
|
232 | 232 | continue; |
233 | 233 | } |
234 | 234 | } |
235 | 235 | |
236 | 236 | // Check if the selected subsets exist, even in one of the selected fonts. |
237 | 237 | // If they don't, then they have to be removed otherwise the link will fail. |
238 | - if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) { |
|
238 | + if ( isset( $this->google_fonts[$font]['subsets'] ) ) { |
|
239 | 239 | foreach ( $this->subsets as $subset ) { |
240 | - if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) { |
|
240 | + if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) { |
|
241 | 241 | $valid_subsets[] = $subset; |
242 | 242 | } |
243 | 243 | } |
@@ -45,7 +45,7 @@ |
||
45 | 45 | // @codingStandardsIgnoreLine |
46 | 46 | $single_meta = get_user_meta( get_current_user_id(), $id_base, true ); |
47 | 47 | |
48 | - if ( isset( $user_meta[ $id_base ] ) ) { |
|
48 | + if ( isset( $user_meta[$id_base] ) ) { |
|
49 | 49 | return $single_meta; |
50 | 50 | } |
51 | 51 | return $default; |
@@ -68,12 +68,12 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | if ( false === $config_id ) { |
392 | 392 | return $translation_strings; |
393 | 393 | } |
394 | - return $translation_strings[ $config_id ]; |
|
394 | + return $translation_strings[$config_id]; |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | /** |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | if ( is_string( $variant ) ) { |
411 | 411 | $final_variants[] = array( |
412 | 412 | 'id' => $variant, |
413 | - 'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant, |
|
413 | + 'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant, |
|
414 | 414 | ); |
415 | 415 | } elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) { |
416 | 416 | $final_variants[] = $variant; |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | if ( array_key_exists( $variant, $all_variants ) ) { |
485 | 485 | $available_variants[] = array( |
486 | 486 | 'id' => $variant, |
487 | - 'label' => $all_variants[ $variant ], |
|
487 | + 'label' => $all_variants[$variant], |
|
488 | 488 | ); |
489 | 489 | } |
490 | 490 | } |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | if ( array_key_exists( $subset, $all_subsets ) ) { |
495 | 495 | $available_subsets[] = array( |
496 | 496 | 'id' => $subset, |
497 | - 'label' => $all_subsets[ $subset ], |
|
497 | + 'label' => $all_subsets[$subset], |
|
498 | 498 | ); |
499 | 499 | } |
500 | 500 | } |
@@ -49,50 +49,37 @@ |
||
49 | 49 | $back_obj = ( $back ) ? ariColor::newColor( $back ) : false; |
50 | 50 | if ( $back ) { |
51 | 51 | $text_on_back = ( 60 > $back_obj->lightness ) ? |
52 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : |
|
53 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode ); |
|
52 | + $back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode ); |
|
54 | 53 | $border_on_back = ( 80 < $back_obj->lightness ) ? |
55 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : |
|
56 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode ); |
|
54 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode ); |
|
57 | 55 | $back_on_back = ( 90 < $back_obj->lightness ) ? |
58 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : |
|
59 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode ); |
|
56 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode ); |
|
60 | 57 | $hover_on_back = ( 90 < $back_obj->lightness ) ? |
61 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : |
|
62 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
|
58 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
|
63 | 59 | $arrows_on_back = ( 50 > $back_obj->lightness ) ? |
64 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : |
|
65 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
|
60 | + $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
|
66 | 61 | $back_disabled_obj = ( 35 < $back_obj->lightness ) ? |
67 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : |
|
68 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 30 ); |
|
62 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 30 ); |
|
69 | 63 | $back_disabled = $back_disabled_obj->toCSS( $back_disabled_obj->mode ); |
70 | 64 | $text_on_back_disabled = ( 60 > $back_disabled_obj->lightness ) ? |
71 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : |
|
72 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode ); |
|
65 | + $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode ); |
|
73 | 66 | $border_on_back_disabled = ( 50 < $back_disabled_obj->lightness ) ? |
74 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : |
|
75 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode ); |
|
67 | + $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode ); |
|
76 | 68 | } |
77 | 69 | $accent = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false; |
78 | 70 | $accent_obj = ( $accent ) ? ariColor::newColor( $accent ) : false; |
79 | 71 | if ( $accent ) { |
80 | 72 | $text_on_accent = ( 60 > $accent_obj->lightness ) ? |
81 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : |
|
82 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
|
73 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
|
83 | 74 | $border_on_accent = ( 50 < $accent_obj->lightness ) ? |
84 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : |
|
85 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode ); |
|
75 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode ); |
|
86 | 76 | $accent_disabled_obj = ( 35 < $accent_obj->lightness ) ? |
87 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : |
|
88 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 ); |
|
77 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 ); |
|
89 | 78 | $accent_disabled = $accent_disabled_obj->toCSS( $accent_disabled_obj->mode ); |
90 | 79 | $text_on_accent_disabled = ( 60 > $accent_disabled_obj->lightness ) ? |
91 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : |
|
92 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode ); |
|
80 | + $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode ); |
|
93 | 81 | $border_on_accent_disabled = ( 50 < $accent_disabled_obj->lightness ) ? |
94 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : |
|
95 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode ); |
|
82 | + $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode ); |
|
96 | 83 | } |
97 | 84 | |
98 | 85 | if ( $back ) { |