@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | // Fix for https://github.com/aristath/kirki/issues/1405. |
| 178 | 178 | foreach ( $this->json['value'] as $key => $val ) { |
| 179 | - if ( isset( $this->json['default'][ $key ] ) && false === $this->json['default'][ $key ] ) { |
|
| 180 | - unset( $this->json['value'][ $key ] ); |
|
| 179 | + if ( isset( $this->json['default'][$key] ) && false === $this->json['default'][$key] ) { |
|
| 180 | + unset( $this->json['value'][$key] ); |
|
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | $this->json['show_variants'] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true; |
@@ -361,7 +361,7 @@ discard block |
||
| 361 | 361 | if ( is_string( $variant ) ) { |
| 362 | 362 | $final_variants[] = array( |
| 363 | 363 | 'id' => $variant, |
| 364 | - 'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant, |
|
| 364 | + 'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant, |
|
| 365 | 365 | ); |
| 366 | 366 | } elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) { |
| 367 | 367 | $final_variants[] = $variant; |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | if ( array_key_exists( $variant, $all_variants ) ) { |
| 437 | 437 | $available_variants[] = array( |
| 438 | 438 | 'id' => $variant, |
| 439 | - 'label' => $all_variants[ $variant ], |
|
| 439 | + 'label' => $all_variants[$variant], |
|
| 440 | 440 | ); |
| 441 | 441 | } |
| 442 | 442 | } |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | if ( array_key_exists( $subset, $all_subsets ) ) { |
| 449 | 449 | $available_subsets[] = array( |
| 450 | 450 | 'id' => $subset, |
| 451 | - 'label' => $all_subsets[ $subset ], |
|
| 451 | + 'label' => $all_subsets[$subset], |
|
| 452 | 452 | ); |
| 453 | 453 | } |
| 454 | 454 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | if ( class_exists( $module_class ) ) { |
| 88 | 88 | // Use this syntax instead of $module_class::get_instance() |
| 89 | 89 | // for PHP 5.2 compatibility. |
| 90 | - self::$active_modules[ $key ] = call_user_func( array( $module_class, 'get_instance' ) ); |
|
| 90 | + self::$active_modules[$key] = call_user_func( array( $module_class, 'get_instance' ) ); |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | $key = array_search( $module, self::$modules, true ); |
| 122 | 122 | if ( false !== $key ) { |
| 123 | - unset( self::$modules[ $key ] ); |
|
| 123 | + unset( self::$modules[$key] ); |
|
| 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. |
@@ -179,7 +179,7 @@ |
||
| 179 | 179 | case 'letter-spacing': |
| 180 | 180 | case 'word-spacing': |
| 181 | 181 | case 'line-height': |
| 182 | - $value[ $key ] = Kirki_Sanitize_Values::css_dimension( $val ); |
|
| 182 | + $value[$key] = Kirki_Sanitize_Values::css_dimension( $val ); |
|
| 183 | 183 | break; |
| 184 | 184 | case 'text-align': |
| 185 | 185 | if ( ! in_array( $val, array( 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) { |
@@ -38,14 +38,14 @@ |
||
| 38 | 38 | |
| 39 | 39 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
| 40 | 40 | |
| 41 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = $value['start']['color']; |
|
| 41 | + $this->styles[$output['media_query']][$output['element']]['background'] = $value['start']['color']; |
|
| 42 | 42 | switch ( $value['mode'] ) { |
| 43 | 43 | |
| 44 | 44 | case 'linear': |
| 45 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = 'linear-gradient(' . intval( $value['angle'] ) . 'deg, ' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)'; |
|
| 45 | + $this->styles[$output['media_query']][$output['element']]['background'] = 'linear-gradient(' . intval( $value['angle'] ) . 'deg, ' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)'; |
|
| 46 | 46 | break; |
| 47 | 47 | case 'radial': |
| 48 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = 'radial-gradient(ellipse at center,' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)'; |
|
| 48 | + $this->styles[$output['media_query']][$output['element']]['background'] = 'radial-gradient(ellipse at center,' . $value['start']['color'] . ' ' . $value['start']['position'] . '%,' . $value['end']['color'] . ' ' . $value['end']['position'] . '%)'; |
|
| 49 | 49 | break; |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -67,9 +67,9 @@ |
||
| 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 | |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | // Check if we've got it cached and ready. |
| 67 | - if ( isset( $this->cached_paths[ $class_name ] ) && file_exists( $this->cached_paths[ $class_name ] ) ) { |
|
| 68 | - include_once $this->cached_paths[ $class_name ]; |
|
| 67 | + if ( isset( $this->cached_paths[$class_name] ) && file_exists( $this->cached_paths[$class_name] ) ) { |
|
| 68 | + include_once $this->cached_paths[$class_name]; |
|
| 69 | 69 | return; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | foreach ( $paths as $path ) { |
| 75 | 75 | $path = wp_normalize_path( $path ); |
| 76 | 76 | if ( file_exists( $path ) ) { |
| 77 | - $this->cached_paths[ $class_name ] = $path; |
|
| 77 | + $this->cached_paths[$class_name] = $path; |
|
| 78 | 78 | include_once $path; |
| 79 | 79 | return; |
| 80 | 80 | } |
@@ -134,8 +134,8 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | $previous_path = ''; |
| 136 | 136 | for ( $i = 0; $i < $levels; $i++ ) { |
| 137 | - $paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename; |
|
| 138 | - $previous_path .= strtolower( $exploded[ $i ] ) . '/'; |
|
| 137 | + $paths[] = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[$i] ) . '/' . $filename; |
|
| 138 | + $previous_path .= strtolower( $exploded[$i] ) . '/'; |
|
| 139 | 139 | } |
| 140 | 140 | return $paths; |
| 141 | 141 | } |
@@ -130,8 +130,8 @@ |
||
| 130 | 130 | // Are we force-loading all subsets? |
| 131 | 131 | if ( true === Kirki_Fonts_Google::$force_load_all_subsets ) { |
| 132 | 132 | |
| 133 | - if ( isset( $this->googlefonts->fonts[ $font ]['subsets'] ) ) { |
|
| 134 | - foreach ( $this->googlefonts->fonts[ $font ]['subsets'] as $subset ) { |
|
| 133 | + if ( isset( $this->googlefonts->fonts[$font]['subsets'] ) ) { |
|
| 134 | + foreach ( $this->googlefonts->fonts[$font]['subsets'] as $subset ) { |
|
| 135 | 135 | $this->subsets[] = $subset; |
| 136 | 136 | } |
| 137 | 137 | } |
@@ -142,10 +142,10 @@ discard block |
||
| 142 | 142 | $js_var['index_key'] = $key; |
| 143 | 143 | $callback = $this->get_callback( $args ); |
| 144 | 144 | if ( is_callable( $callback ) ) { |
| 145 | - $field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
| 145 | + $field['scripts'][$key] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
| 146 | 146 | continue; |
| 147 | 147 | } |
| 148 | - $field['scripts'][ $key ] = $this->script_var( $js_var ); |
|
| 148 | + $field['scripts'][$key] = $this->script_var( $js_var ); |
|
| 149 | 149 | } |
| 150 | 150 | $combo_extra_script = ''; |
| 151 | 151 | $combo_css_script = ''; |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | */ |
| 178 | 178 | protected function script_html_var( $args ) { |
| 179 | 179 | |
| 180 | - $script = ( isset( $args['choice'] ) ) ? "newval=newval['{$args['choice']}'];" : ''; |
|
| 180 | + $script = ( isset( $args['choice'] ) ) ? "newval=newval['{$args['choice']}'];" : ''; |
|
| 181 | 181 | |
| 182 | 182 | // Apply the value_pattern. |
| 183 | 183 | if ( isset( $args['value_pattern'] ) && '' !== $args['value_pattern'] ) { |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | $property_script = ''; |
| 252 | 252 | |
| 253 | 253 | // Define choice. |
| 254 | - $choice = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : ''; |
|
| 254 | + $choice = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : ''; |
|
| 255 | 255 | |
| 256 | 256 | $value_key = 'newval' . $args['index_key']; |
| 257 | 257 | $property_script .= $value_key . '=newval;'; |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | 'font-weight' => 'fontWeight', |
| 343 | 343 | 'font-style' => 'fontStyle', |
| 344 | 344 | ); |
| 345 | - $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) ); |
|
| 345 | + $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[$args['choice']] ) ); |
|
| 346 | 346 | $script .= ( ! $choice_condition ) ? $webfont_loader : ''; |
| 347 | 347 | foreach ( $css_build_array as $property => $var ) { |
| 348 | 348 | if ( $choice_condition && $property !== $args['choice'] ) { |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | 'units' => '', |
| 454 | 454 | 'js_callback' => array( '', '' ), |
| 455 | 455 | 'value_pattern' => '', |
| 456 | - )); |
|
| 456 | + ) ); |
|
| 457 | 457 | |
| 458 | 458 | // Element should be a string. |
| 459 | 459 | if ( is_array( $args['element'] ) ) { |