@@ -188,7 +188,7 @@ discard block  | 
                                                    ||
| 188 | 188 |  			foreach ( Kirki::$panels as $panel_args ) { | 
                                                        
| 189 | 189 | // Extra checks for nested panels.  | 
                                                        
| 190 | 190 |  				if ( isset( $panel_args['panel'] ) ) { | 
                                                        
| 191 | -					if ( isset( Kirki::$panels[ $panel_args['panel'] ] ) ) { | 
                                                        |
| 191 | +					if ( isset( Kirki::$panels[$panel_args['panel']] ) ) { | 
                                                        |
| 192 | 192 | // Set the type to nested.  | 
                                                        
| 193 | 193 | $panel_args['type'] = 'kirki-nested';  | 
                                                        
| 194 | 194 | }  | 
                                                        
@@ -210,11 +210,11 @@ discard block  | 
                                                    ||
| 210 | 210 |  			foreach ( Kirki::$sections as $section_args ) { | 
                                                        
| 211 | 211 | // Extra checks for nested sections.  | 
                                                        
| 212 | 212 |  				if ( isset( $section_args['section'] ) ) { | 
                                                        
| 213 | -					if ( isset( Kirki::$sections[ $section_args['section'] ] ) ) { | 
                                                        |
| 213 | +					if ( isset( Kirki::$sections[$section_args['section']] ) ) { | 
                                                        |
| 214 | 214 | // Set the type to nested.  | 
                                                        
| 215 | 215 | $section_args['type'] = 'kirki-nested';  | 
                                                        
| 216 | 216 | // We need to check if the parent section is nested inside a panel.  | 
                                                        
| 217 | - $parent_section = Kirki::$sections[ $section_args['section'] ];  | 
                                                        |
| 217 | + $parent_section = Kirki::$sections[$section_args['section']];  | 
                                                        |
| 218 | 218 |  						if ( isset( $parent_section['panel'] ) ) { | 
                                                        
| 219 | 219 | $section_args['panel'] = $parent_section['panel'];  | 
                                                        
| 220 | 220 | }  | 
                                                        
@@ -118,9 +118,9 @@  | 
                                                    ||
| 118 | 118 | // If we have a variable_callback defined then get the value of the option  | 
                                                        
| 119 | 119 | // and run it through the callback function.  | 
                                                        
| 120 | 120 | // If no callback is defined (false) then just get the value.  | 
                                                        
| 121 | - $variables[ $variable_name ] = Kirki::get_option( $field['settings'] );  | 
                                                        |
| 121 | + $variables[$variable_name] = Kirki::get_option( $field['settings'] );  | 
                                                        |
| 122 | 122 |  						if ( $variable_callback ) { | 
                                                        
| 123 | - $variables[ $variable_name ] = call_user_func( $field_variable['callback'], Kirki::get_option( $field['settings'] ) );  | 
                                                        |
| 123 | + $variables[$variable_name] = call_user_func( $field_variable['callback'], Kirki::get_option( $field['settings'] ) );  | 
                                                        |
| 124 | 124 | }  | 
                                                        
| 125 | 125 | }  | 
                                                        
| 126 | 126 | }  | 
                                                        
@@ -77,25 +77,25 @@  | 
                                                    ||
| 77 | 77 |  		foreach ( array( 'start', 'end' ) as $context ) { | 
                                                        
| 78 | 78 | |
| 79 | 79 | // Make sure value is array.  | 
                                                        
| 80 | -			if ( ! isset( $value[ $context ] ) ) { | 
                                                        |
| 81 | - $value[ $context ] = array();  | 
                                                        |
| 80 | +			if ( ! isset( $value[$context] ) ) { | 
                                                        |
| 81 | + $value[$context] = array();  | 
                                                        |
| 82 | 82 | }  | 
                                                        
| 83 | 83 | |
| 84 | 84 | // Make sure color is defined.  | 
                                                        
| 85 | -			if ( ! isset( $value[ $context ]['color'] ) ) { | 
                                                        |
| 86 | - $value[ $context ]['color'] = '';  | 
                                                        |
| 85 | +			if ( ! isset( $value[$context]['color'] ) ) { | 
                                                        |
| 86 | + $value[$context]['color'] = '';  | 
                                                        |
| 87 | 87 | }  | 
                                                        
| 88 | 88 | // Sanitize colors.  | 
                                                        
| 89 | - $color_obj = ariColor::newColor( $value[ $context ]['color'] );  | 
                                                        |
| 90 | - $value[ $context ]['color'] = $color_obj->toCSS( $color_obj->mode );  | 
                                                        |
| 89 | + $color_obj = ariColor::newColor( $value[$context]['color'] );  | 
                                                        |
| 90 | + $value[$context]['color'] = $color_obj->toCSS( $color_obj->mode );  | 
                                                        |
| 91 | 91 | |
| 92 | 92 | // Make sure position is defined.  | 
                                                        
| 93 | -			if ( ! isset( $value[ $context ]['position'] ) ) { | 
                                                        |
| 94 | - $value[ $context ]['position'] = 0;  | 
                                                        |
| 93 | +			if ( ! isset( $value[$context]['position'] ) ) { | 
                                                        |
| 94 | + $value[$context]['position'] = 0;  | 
                                                        |
| 95 | 95 | };  | 
                                                        
| 96 | 96 | // Sanitize positions.  | 
                                                        
| 97 | - $value[ $context ]['position'] = (int) $value[ $context ]['position'];  | 
                                                        |
| 98 | - $value[ $context ]['position'] = max( min( $value[ $context ]['position'], 100 ), 0 );  | 
                                                        |
| 97 | + $value[$context]['position'] = (int) $value[$context]['position'];  | 
                                                        |
| 98 | + $value[$context]['position'] = max( min( $value[$context]['position'], 100 ), 0 );  | 
                                                        |
| 99 | 99 | }  | 
                                                        
| 100 | 100 | |
| 101 | 101 | // Make siure angle exists.  | 
                                                        
@@ -327,13 +327,13 @@ discard block  | 
                                                    ||
| 327 | 327 | |
| 328 | 328 | // Get the config arguments, and merge them with the defaults.  | 
                                                        
| 329 | 329 | $config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();  | 
                                                        
| 330 | -		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) { | 
                                                        |
| 331 | - $config_defaults = Kirki::$config[ $this->kirki_config ];  | 
                                                        |
| 330 | +		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) { | 
                                                        |
| 331 | + $config_defaults = Kirki::$config[$this->kirki_config];  | 
                                                        |
| 332 | 332 | }  | 
                                                        
| 333 | 333 | $config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array();  | 
                                                        
| 334 | 334 |  		foreach ( $config_defaults as $key => $value ) { | 
                                                        
| 335 | -			if ( isset( $defaults[ $key ] ) && ! empty( $value ) && $value != $defaults[ $key ] ) { | 
                                                        |
| 336 | - $defaults[ $key ] = $value;  | 
                                                        |
| 335 | +			if ( isset( $defaults[$key] ) && ! empty( $value ) && $value != $defaults[$key] ) { | 
                                                        |
| 336 | + $defaults[$key] = $value;  | 
                                                        |
| 337 | 337 | }  | 
                                                        
| 338 | 338 | }  | 
                                                        
| 339 | 339 | |
@@ -370,8 +370,8 @@ discard block  | 
                                                    ||
| 370 | 370 | // Remove any whitelisted properties from above.  | 
                                                        
| 371 | 371 | // These will get a free pass, completely unfiltered.  | 
                                                        
| 372 | 372 |  		foreach ( $whitelisted_properties as $key => $default_value ) { | 
                                                        
| 373 | -			if ( isset( $properties[ $key ] ) ) { | 
                                                        |
| 374 | - unset( $properties[ $key ] );  | 
                                                        |
| 373 | +			if ( isset( $properties[$key] ) ) { | 
                                                        |
| 374 | + unset( $properties[$key] );  | 
                                                        |
| 375 | 375 | }  | 
                                                        
| 376 | 376 | }  | 
                                                        
| 377 | 377 | |
@@ -403,7 +403,7 @@ discard block  | 
                                                    ||
| 403 | 403 | // Get all arguments with their values.  | 
                                                        
| 404 | 404 | $args = get_object_vars( $this );  | 
                                                        
| 405 | 405 |  		foreach ( $args as $key => $default_value ) { | 
                                                        
| 406 | - $args[ $key ] = $this->$key;  | 
                                                        |
| 406 | + $args[$key] = $this->$key;  | 
                                                        |
| 407 | 407 | }  | 
                                                        
| 408 | 408 | |
| 409 | 409 | // Add the whitelisted properties through the back door.  | 
                                                        
@@ -411,11 +411,11 @@ discard block  | 
                                                    ||
| 411 | 411 |  			if ( ! isset( $this->$key ) ) { | 
                                                        
| 412 | 412 | $this->$key = $default_value;  | 
                                                        
| 413 | 413 | }  | 
                                                        
| 414 | - $args[ $key ] = $this->$key;  | 
                                                        |
| 414 | + $args[$key] = $this->$key;  | 
                                                        |
| 415 | 415 | }  | 
                                                        
| 416 | 416 | |
| 417 | 417 | // Add the field to the static $fields variable properly indexed.  | 
                                                        
| 418 | - Kirki::$fields[ $this->settings ] = $args;  | 
                                                        |
| 418 | + Kirki::$fields[$this->settings] = $args;  | 
                                                        |
| 419 | 419 | |
| 420 | 420 | }  | 
                                                        
| 421 | 421 | |
@@ -518,7 +518,7 @@ discard block  | 
                                                    ||
| 518 | 518 | }  | 
                                                        
| 519 | 519 |  		foreach ( $this->partial_refresh as $id => $args ) { | 
                                                        
| 520 | 520 |  			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) { | 
                                                        
| 521 | - unset( $this->partial_refresh[ $id ] );  | 
                                                        |
| 521 | + unset( $this->partial_refresh[$id] );  | 
                                                        |
| 522 | 522 | continue;  | 
                                                        
| 523 | 523 | }  | 
                                                        
| 524 | 524 | }  | 
                                                        
@@ -546,10 +546,10 @@ discard block  | 
                                                    ||
| 546 | 546 | }  | 
                                                        
| 547 | 547 | $settings = array();  | 
                                                        
| 548 | 548 |  		foreach ( $this->settings as $setting_key => $setting_value ) { | 
                                                        
| 549 | - $settings[ sanitize_key( $setting_key ) ] = esc_attr( $setting_value );  | 
                                                        |
| 549 | + $settings[sanitize_key( $setting_key )] = esc_attr( $setting_value );  | 
                                                        |
| 550 | 550 | // If we're using serialized options then we need to spice this up.  | 
                                                        
| 551 | 551 |  			if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) { | 
                                                        
| 552 | - $settings[ sanitize_key( $setting_key ) ] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']';  | 
                                                        |
| 552 | + $settings[sanitize_key( $setting_key )] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']';  | 
                                                        |
| 553 | 553 | }  | 
                                                        
| 554 | 554 | }  | 
                                                        
| 555 | 555 | $this->settings = $settings;  | 
                                                        
@@ -646,7 +646,7 @@ discard block  | 
                                                    ||
| 646 | 646 | );  | 
                                                        
| 647 | 647 | |
| 648 | 648 |  		if ( array_key_exists( $this->type, $default_callbacks ) ) { | 
                                                        
| 649 | - $this->sanitize_callback = $default_callbacks[ $this->type ];  | 
                                                        |
| 649 | + $this->sanitize_callback = $default_callbacks[$this->type];  | 
                                                        |
| 650 | 650 | }  | 
                                                        
| 651 | 651 | |
| 652 | 652 | }  | 
                                                        
@@ -102,8 +102,8 @@ discard block  | 
                                                    ||
| 102 | 102 |  				if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) { | 
                                                        
| 103 | 103 | $option_type = 'theme_mod';  | 
                                                        
| 104 | 104 | $option_name = false;  | 
                                                        
| 105 | -					if ( isset( Kirki::$config[ $this->config_id ] ) ) { | 
                                                        |
| 106 | - $config = Kirki::$config[ $this->config_id ];  | 
                                                        |
| 105 | +					if ( isset( Kirki::$config[$this->config_id] ) ) { | 
                                                        |
| 106 | + $config = Kirki::$config[$this->config_id];  | 
                                                        |
| 107 | 107 | $option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod';  | 
                                                        
| 108 | 108 |  						if ( 'option' === $option_type || 'site_option' === $option_type ) { | 
                                                        
| 109 | 109 | $option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false;  | 
                                                        
@@ -119,16 +119,16 @@ discard block  | 
                                                    ||
| 119 | 119 |  								if ( is_array( $options ) ) { | 
                                                        
| 120 | 120 |  									if ( $option_name ) { | 
                                                        
| 121 | 121 | $subkey = str_replace( array( $option_name, '[', ']' ), '', $replace );  | 
                                                        
| 122 | - $replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : '';  | 
                                                        |
| 122 | + $replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : '';  | 
                                                        |
| 123 | 123 | break;  | 
                                                        
| 124 | 124 | }  | 
                                                        
| 125 | - $replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : '';  | 
                                                        |
| 125 | + $replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : '';  | 
                                                        |
| 126 | 126 | break;  | 
                                                        
| 127 | 127 | }  | 
                                                        
| 128 | 128 | $replacement = get_option( $replace );  | 
                                                        
| 129 | 129 | break;  | 
                                                        
| 130 | 130 | case 'site_option':  | 
                                                        
| 131 | - $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace );  | 
                                                        |
| 131 | + $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace );  | 
                                                        |
| 132 | 132 | break;  | 
                                                        
| 133 | 133 | case 'user_meta':  | 
                                                        
| 134 | 134 | $user_id = get_current_user_id();  | 
                                                        
@@ -183,7 +183,7 @@ discard block  | 
                                                    ||
| 183 | 183 | }  | 
                                                        
| 184 | 184 | // If 'choice' is defined check for sub-values too.  | 
                                                        
| 185 | 185 | // Fixes https://github.com/aristath/kirki/issues/1416.  | 
                                                        
| 186 | -						if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { | 
                                                        |
| 186 | +						if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude == $value[$output['choice']] ) { | 
                                                        |
| 187 | 187 | $skip = true;  | 
                                                        
| 188 | 188 | }  | 
                                                        
| 189 | 189 | }  | 
                                                        
@@ -229,9 +229,9 @@ discard block  | 
                                                    ||
| 229 | 229 | return;  | 
                                                        
| 230 | 230 | }  | 
                                                        
| 231 | 231 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';  | 
                                                        
| 232 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';  | 
                                                        |
| 233 | - $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : '';  | 
                                                        |
| 234 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';  | 
                                                        |
| 232 | + $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';  | 
                                                        |
| 233 | + $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : '';  | 
                                                        |
| 234 | + $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';  | 
                                                        |
| 235 | 235 | |
| 236 | 236 | // Properties that can accept multiple values.  | 
                                                        
| 237 | 237 | // Useful for example for gradients where all browsers use the "background-image" property  | 
                                                        
@@ -240,13 +240,13 @@ discard block  | 
                                                    ||
| 240 | 240 | 'background-image',  | 
                                                        
| 241 | 241 | );  | 
                                                        
| 242 | 242 |  		if ( in_array( $output['property'], $accepts_multiple, true ) ) { | 
                                                        
| 243 | -			if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { | 
                                                        |
| 244 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ];  | 
                                                        |
| 243 | +			if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { | 
                                                        |
| 244 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']];  | 
                                                        |
| 245 | 245 | }  | 
                                                        
| 246 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix'];  | 
                                                        |
| 246 | + $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix'];  | 
                                                        |
| 247 | 247 | return;  | 
                                                        
| 248 | 248 | }  | 
                                                        
| 249 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix'];  | 
                                                        |
| 249 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix'];  | 
                                                        |
| 250 | 250 | }  | 
                                                        
| 251 | 251 | |
| 252 | 252 | /**  | 
                                                        
@@ -266,7 +266,7 @@ discard block  | 
                                                    ||
| 266 | 266 | 'background-position' => 'Kirki_Output_Property_Background_Position',  | 
                                                        
| 267 | 267 | ) );  | 
                                                        
| 268 | 268 |  		if ( array_key_exists( $property, $properties ) ) { | 
                                                        
| 269 | - $classname = $properties[ $property ];  | 
                                                        |
| 269 | + $classname = $properties[$property];  | 
                                                        |
| 270 | 270 | $obj = new $classname( $property, $value );  | 
                                                        
| 271 | 271 | return $obj->get_value();  | 
                                                        
| 272 | 272 | }  | 
                                                        
@@ -182,7 +182,7 @@  | 
                                                    ||
| 182 | 182 | case 'letter-spacing':  | 
                                                        
| 183 | 183 | case 'word-spacing':  | 
                                                        
| 184 | 184 | case 'line-height':  | 
                                                        
| 185 | - $value[ $key ] = Kirki_Sanitize_Values::css_dimension( $val );  | 
                                                        |
| 185 | + $value[$key] = Kirki_Sanitize_Values::css_dimension( $val );  | 
                                                        |
| 186 | 186 | break;  | 
                                                        
| 187 | 187 | case 'text-align':  | 
                                                        
| 188 | 188 |  				 	if ( ! in_array( $val, array( 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) { |