@@ -141,11 +141,11 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // Add the requested google-font. |
| 144 | - if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) { |
|
| 145 | - $this->fonts[ $value['font-family'] ] = array(); |
|
| 144 | + if ( ! isset( $this->fonts[$value['font-family']] ) ) { |
|
| 145 | + $this->fonts[$value['font-family']] = array(); |
|
| 146 | 146 | } |
| 147 | - if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) { |
|
| 148 | - $this->fonts[ $value['font-family'] ][] = $value['variant']; |
|
| 147 | + if ( ! in_array( $value['variant'], $this->fonts[$value['font-family']], true ) ) { |
|
| 148 | + $this->fonts[$value['font-family']][] = $value['variant']; |
|
| 149 | 149 | } |
| 150 | 150 | // Are we force-loading all variants? |
| 151 | 151 | if ( true === self::$force_load_all_variants ) { |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | |
| 156 | 156 | if ( ! empty( $args['choices']['variant'] ) ) { |
| 157 | 157 | foreach ( $args['choices']['variant'] as $extra_variant ) { |
| 158 | - $this->fonts[ $value['font-family'] ][] = $extra_variant; |
|
| 158 | + $this->fonts[$value['font-family']][] = $extra_variant; |
|
| 159 | 159 | } |
| 160 | 160 | } |
| 161 | 161 | } else { |
@@ -175,12 +175,12 @@ discard block |
||
| 175 | 175 | if ( is_string( $value ) ) { |
| 176 | 176 | if ( 'font-family' === $output['property'] ) { |
| 177 | 177 | if ( ! array_key_exists( $value, $this->fonts ) ) { |
| 178 | - $this->fonts[ $value ] = array(); |
|
| 178 | + $this->fonts[$value] = array(); |
|
| 179 | 179 | } |
| 180 | 180 | } elseif ( 'font-weight' === $output['property'] ) { |
| 181 | 181 | foreach ( $this->fonts as $font => $variants ) { |
| 182 | 182 | if ( ! in_array( $value, $variants, true ) ) { |
| 183 | - $this->fonts[ $font ][] = $value; |
|
| 183 | + $this->fonts[$font][] = $value; |
|
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } elseif ( 'font-subset' === $output['property'] || 'subset' === $output['property'] || 'subsets' === $output['property'] ) { |
@@ -220,31 +220,31 @@ discard block |
||
| 220 | 220 | // Determine if this is indeed a google font or not. |
| 221 | 221 | // If it's not, then just remove it from the array. |
| 222 | 222 | if ( ! array_key_exists( $font, $this->google_fonts ) ) { |
| 223 | - unset( $this->fonts[ $font ] ); |
|
| 223 | + unset( $this->fonts[$font] ); |
|
| 224 | 224 | continue; |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | // Get all valid font variants for this font. |
| 228 | 228 | $font_variants = array(); |
| 229 | - if ( isset( $this->google_fonts[ $font ]['variants'] ) ) { |
|
| 230 | - $font_variants = $this->google_fonts[ $font ]['variants']; |
|
| 229 | + if ( isset( $this->google_fonts[$font]['variants'] ) ) { |
|
| 230 | + $font_variants = $this->google_fonts[$font]['variants']; |
|
| 231 | 231 | } |
| 232 | 232 | foreach ( $variants as $variant ) { |
| 233 | 233 | |
| 234 | 234 | // If this is not a valid variant for this font-family |
| 235 | 235 | // then unset it and move on to the next one. |
| 236 | 236 | if ( ! in_array( $variant, $font_variants, true ) ) { |
| 237 | - $variant_key = array_search( $variant, $this->fonts[ $font ], true ); |
|
| 238 | - unset( $this->fonts[ $font ][ $variant_key ] ); |
|
| 237 | + $variant_key = array_search( $variant, $this->fonts[$font], true ); |
|
| 238 | + unset( $this->fonts[$font][$variant_key] ); |
|
| 239 | 239 | continue; |
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | // Check if the selected subsets exist, even in one of the selected fonts. |
| 244 | 244 | // If they don't, then they have to be removed otherwise the link will fail. |
| 245 | - if ( isset( $this->google_fonts[ $font ]['subsets'] ) ) { |
|
| 245 | + if ( isset( $this->google_fonts[$font]['subsets'] ) ) { |
|
| 246 | 246 | foreach ( $this->subsets as $subset ) { |
| 247 | - if ( in_array( $subset, $this->google_fonts[ $font ]['subsets'], true ) ) { |
|
| 247 | + if ( in_array( $subset, $this->google_fonts[$font]['subsets'], true ) ) { |
|
| 248 | 248 | $valid_subsets[] = $subset; |
| 249 | 249 | } |
| 250 | 250 | } |
@@ -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 | |
@@ -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. |
@@ -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 | } |