| @@ -223,9 +223,9 @@ | ||
| 223 | 223 | * @since 6.6.0 Added support for 'default-font-sizes' and 'default-spacing-sizes' theme supports. |
| 224 | 224 | * Added registration and merging of block style variations from partial theme.json files and the block styles registry. |
| 225 | 225 | * |
| 226 | 226 | * @param array $deprecated Deprecated. Not used. |
| 227 | - * @param array $options { | |
| 227 | + * @param array $options { | |
| 228 | 228 | * Options arguments. |
| 229 | 229 | * |
| 230 | 230 | * @type bool $with_supports Whether to include theme supports in the data. Default true. |
| 231 | 231 | * } |
| @@ -296,15 +296,8 @@ | ||
| 296 | 296 | $parent_theme->merge( static::$theme ); |
| 297 | 297 | static::$theme = $parent_theme; |
| 298 | 298 | } |
| 299 | 299 | } |
| 300 | - | |
| 301 | - // BEGIN OF EXPERIMENTAL CODE. Not to backport to core. | |
| 302 | - if ( ! class_exists( 'WP_Font_Face' ) && class_exists( 'WP_Fonts_Resolver' ) ) { | |
| 303 | - static::$theme = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( static::$theme ); | |
| 304 | - } | |
| 305 | - // END OF EXPERIMENTAL CODE. | |
| 306 | - | |
| 307 | 300 | } |
| 308 | 301 | |
| 309 | 302 | if ( ! $options['with_supports'] ) { |
| 310 | 303 | return static::$theme; |
| @@ -926,9 +919,9 @@ | ||
| 926 | 919 | * Adds variations sourced from block style variations files to the supplied theme.json data. |
| 927 | 920 | * |
| 928 | 921 | * @since 6.6.0 |
| 929 | 922 | * |
| 930 | - * @param array $data Array following the theme.json specification. | |
| 923 | + * @param array $data Array following the theme.json specification. | |
| 931 | 924 | * @param array $variations Shared block style variations. |
| 932 | 925 | * @return array Theme json data including shared block style variation definitions. |
| 933 | 926 | */ |
| 934 | 927 | private static function inject_variations_from_block_style_variation_files( $data, $variations ) { |
| @@ -968,9 +961,9 @@ | ||
| 968 | 961 | * Adds variations sourced from the block styles registry to the supplied theme.json data. |
| 969 | 962 | * |
| 970 | 963 | * @since 6.6.0 |
| 971 | 964 | * |
| 972 | - * @param array $data Array following the theme.json specification. | |
| 965 | + * @param array $data Array following the theme.json specification. | |
| 973 | 966 | * @return array Theme json data including variations from the block styles registry. |
| 974 | 967 | */ |
| 975 | 968 | private static function inject_variations_from_block_styles_registry( $data ) { |
| 976 | 969 | $registry = WP_Block_Styles_Registry::get_instance(); |
