diff --git a/lib/class-wp-theme-json-resolver-gutenberg.php b/lib/class-wp-theme-json-resolver-gutenberg.php index 284666442c1f3a..f849c7e59b5ca5 100644 --- a/lib/class-wp-theme-json-resolver-gutenberg.php +++ b/lib/class-wp-theme-json-resolver-gutenberg.php @@ -297,13 +297,6 @@ public static function get_theme_data( $deprecated = array(), $options = array() static::$theme = $parent_theme; } } - - // BEGIN OF EXPERIMENTAL CODE. Not to backport to core. - if ( ! class_exists( 'WP_Font_Face' ) && class_exists( 'WP_Fonts_Resolver' ) ) { - static::$theme = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( static::$theme ); - } - // END OF EXPERIMENTAL CODE. - } if ( ! $options['with_supports'] ) { diff --git a/lib/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php b/lib/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php deleted file mode 100644 index 4f11987ba049c6..00000000000000 --- a/lib/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php +++ /dev/null @@ -1,49 +0,0 @@ -` element for wrapping the `@font-face` CSS. - * - * @since X.X.X - * @deprecated 16.3.0 Get style element is not supported. - * - * @return string Empty string. - */ - protected function get_style_element() { - _deprecated_function( __METHOD__, 'Gutenberg 16.3.0' ); - return ''; - } - } -} diff --git a/lib/experimental/font-face/bc-layer/class-wp-fonts-resolver.php b/lib/experimental/font-face/bc-layer/class-wp-fonts-resolver.php deleted file mode 100644 index e02948b73d5df7..00000000000000 --- a/lib/experimental/font-face/bc-layer/class-wp-fonts-resolver.php +++ /dev/null @@ -1,63 +0,0 @@ -get_registered_font_families(). - * @deprecated 16.3.0 Register is not supported. - * - * @return array Empty array. - */ - public function get_registered_font_families() { - _deprecated_function( __METHOD__, 'Gutenberg 15.8.0' ); - return array(); - } - - /** - * Gets the list of registered fonts. - * - * @since 6.0.0 - * @deprecated 14.9.1 Use wp_fonts()->get_registered(). - * @deprecated 16.3.0 Register is not supported. - * - * @return array Empty array. - */ - public function get_registered_webfonts() { - _deprecated_function( __METHOD__, 'Gutenberg 14.9.1' ); - - return array(); - } - - /** - * Gets the list of enqueued fonts. - * - * @since 6.0.0 - * @deprecated 14.9.1 Use wp_fonts()->get_enqueued(). - * @deprecated 16.3.0 Enqueue is not supported. - * - * @return array Empty array. - */ - public function get_enqueued_webfonts() { - _deprecated_function( __METHOD__, 'Gutenberg 14.9.1' ); - return array(); - } - - /** - * Gets the list of all fonts. - * - * @since X.X.X - * @deprecated GB 14.9.1 Use wp_fonts()->get_registered(). - * @deprecated 16.3.0 This method is not supported. - * - * @return array[] - */ - public function get_all_webfonts() { - _deprecated_function( __METHOD__, 'Gutenberg 14.9.1', 'wp_fonts()->get_registered()' ); - return array(); - } - - /** - * Registers a webfont. - * - * @since 6.0.0 - * @deprecated GB 14.9.1 Use wp_register_fonts(). - * @deprecated 16.3.0 Register is not supported. - * - * @return bool False. - */ - public function register_webfont() { - _deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_register_fonts()' ); - return false; - } - - /** - * Enqueue a font-family that has been already registered. - * - * @since XX.X - * @deprecated 14.9.1 Use wp_enqueue_fonts(). - * @deprecated 16.3.0 Register is not supported. - * - * @return bool False. - */ - public function enqueue_webfont() { - _deprecated_function( __METHOD__, 'Gutenberg 14.9.1' ); - return false; - } - } -} diff --git a/lib/experimental/font-face/bc-layer/webfonts-deprecations.php b/lib/experimental/font-face/bc-layer/webfonts-deprecations.php deleted file mode 100644 index fb5e6b315dbdaf..00000000000000 --- a/lib/experimental/font-face/bc-layer/webfonts-deprecations.php +++ /dev/null @@ -1,291 +0,0 @@ -get_providers(). - * @deprecated 16.3.0 Providers are not supported. - * - * @return array Empty array. - */ - function wp_get_webfont_providers() { - _deprecated_function( __FUNCTION__, '14.9.1' ); - - return array(); - } -} - -if ( ! function_exists( 'wp_register_webfont_provider' ) ) { - /** - * Registers a custom font service provider. - * - * @since X.X.X - * @deprecated 15.1 Use wp_register_font_provider() instead. - * @deprecated 16.3.0 Providers are not supported. - * - * @return bool False. - */ - function wp_register_webfont_provider() { - _deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_register_font_provider' ); - return false; - } -} - -if ( ! function_exists( 'wp_print_webfonts' ) ) { - /** - * Invokes each provider to process and print its styles. - * - * @since 14.9.1 - * @deprecated 15.1 Use wp_print_fonts() instead. - * @deprecated 16.3.0 Webfonts API is not supported. - * - * @return array Empty array. - */ - function wp_print_webfonts() { - _deprecated_function( __FUNCTION__, 'Gutenberg 15.1', 'wp_print_font_faces' ); - return array(); - } -} - -if ( ! function_exists( 'wp_fonts' ) ) { - /** - * Initialize $wp_fonts if it has not been set. - * - * @since X.X.X - * @deprecated 16.3.0 Use Font Library and Font Face. Fonts API is not supported. - * - * @global WP_Fonts $wp_fonts - * - * @return WP_Fonts WP_Fonts instance. - */ - function wp_fonts() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - - global $wp_fonts; - - if ( ! ( $wp_fonts instanceof WP_Fonts ) ) { - $wp_fonts = new WP_Fonts(); - } - - return $wp_fonts; - } -} - -if ( ! function_exists( 'wp_register_fonts' ) ) { - /** - * Registers one or more font-families and each of their variations. - * - * @since X.X.X - * @deprecated 16.3.0 Register is not supported. - * - * @return array Empty array. - */ - function wp_register_fonts() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - return array(); - } -} - -if ( ! function_exists( 'wp_enqueue_fonts' ) ) { - /** - * Enqueues one or more font family and all of its variations. - * - * @since X.X.X - * @deprecated 16.3.0 Enqueue is not supported. - */ - function wp_enqueue_fonts() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - } -} - -if ( ! function_exists( 'wp_enqueue_font_variations' ) ) { - /** - * Enqueues a specific set of font variations. - * - * @since X.X.X - * @deprecated 16.3.0 Enqueue is not supported. - */ - function wp_enqueue_font_variations() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - } -} - -if ( ! function_exists( 'wp_deregister_font_family' ) ) { - /** - * Deregisters a font family and all of its registered variations. - * - * @since X.X.X - * @deprecated 16.3.0 Deregister is not supported. - */ - function wp_deregister_font_family() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - } -} - -if ( ! function_exists( 'wp_deregister_font_variation' ) ) { - /** - * Deregisters a font variation. - * - * @since X.X.X - * @deprecated 16.3.0 Deregister is not supported. - */ - function wp_deregister_font_variation() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - } -} - -if ( ! function_exists( 'wp_register_font_provider' ) ) { - /** - * Registers a custom font service provider. - * - * @since X.X.X - * @deprecated 16.3.0 Providers are not supported. - * - * @return bool False. - */ - function wp_register_font_provider() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3' ); - return false; - } -} - -if ( ! function_exists( 'wp_print_fonts' ) ) { - /** - * Invokes each provider to process and print its styles. - * - * @since X.X.X - * @deprecated 16.3.0 For classic themes, use wp_print_font_faces(). For all other sites, - * Font Face will automatically print all fonts in theme.json merged data layer, - * including in theme and user activated fonts from the Font Library. - * - * @return array Empty array. - */ - function wp_print_fonts() { - _deprecated_function( __FUNCTION__, 'Gutenberg 16.3', 'wp_print_font_faces' ); - return array(); - } -} diff --git a/lib/load.php b/lib/load.php index 1cabfae4f3e5fc..19e67688241c12 100644 --- a/lib/load.php +++ b/lib/load.php @@ -133,21 +133,6 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/experimental/workflow-palette.php'; } -// Load the BC Layer to avoid fatal errors of extenders using the Fonts API. -// @core-merge: do not merge the BC layer files into WordPress Core. -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-provider.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-utils.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-provider-local.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-fonts-resolver.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php'; -require __DIR__ . '/experimental/font-face/bc-layer/webfonts-deprecations.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-utils.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-provider.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts-provider-local.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-webfonts.php'; -require __DIR__ . '/experimental/font-face/bc-layer/class-wp-web-fonts.php'; - // Plugin specific code. require __DIR__ . '/script-loader.php'; require __DIR__ . '/global-styles-and-settings.php'; diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c8dc2d34b0fed9..bd94cce0bf6ede 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -20,7 +20,6 @@ ms-required - fontsapi diff --git a/phpunit/data/fonts/OpenSans-Regular.otf b/phpunit/data/fonts/OpenSans-Regular.otf deleted file mode 100644 index 8db0f64c67ddd5..00000000000000 Binary files a/phpunit/data/fonts/OpenSans-Regular.otf and /dev/null differ diff --git a/phpunit/data/fonts/OpenSans-Regular.ttf b/phpunit/data/fonts/OpenSans-Regular.ttf deleted file mode 100644 index ae716936e9e4c1..00000000000000 Binary files a/phpunit/data/fonts/OpenSans-Regular.ttf and /dev/null differ diff --git a/phpunit/data/fonts/OpenSans-Regular.woff b/phpunit/data/fonts/OpenSans-Regular.woff deleted file mode 100644 index bd0f824b207d60..00000000000000 Binary files a/phpunit/data/fonts/OpenSans-Regular.woff and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2 deleted file mode 100644 index e8f46699012bbe..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold.woff2 deleted file mode 100644 index 9a7696df2ade09..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Bold.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Medium.ttf b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Medium.ttf deleted file mode 100644 index aa3c2a2cabb099..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Medium.ttf and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-MediumItalic.ttf b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-MediumItalic.ttf deleted file mode 100644 index 4365309cf2ccd3..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-MediumItalic.ttf and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2 deleted file mode 100644 index 773b7277fbb297..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular.woff2 deleted file mode 100644 index b8f0bd8ae02f18..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/DMSans-Regular.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/LICENSE.txt b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/LICENSE.txt deleted file mode 100644 index 02d522fe581f57..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/dm-sans/LICENSE.txt +++ /dev/null @@ -1,94 +0,0 @@ -Copyright 2014-2017 Indian Type Foundry (info@indiantypefoundry.com). Copyright 2019 Google LLC. -Copyright 2014-2018 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. Copyright 2019 Google LLC. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OFL.txt b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OFL.txt deleted file mode 100644 index 57eeaca60ab1cd..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.ttf b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.ttf deleted file mode 100644 index f7328a583fb7a5..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.ttf and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.ttf b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.ttf deleted file mode 100644 index ad86e00ccddbfa..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.ttf and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/LICENSE.md b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/LICENSE.md deleted file mode 100644 index 7cd3e749de2ab1..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/LICENSE.md +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2014 - 2021 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. - -This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, - in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, - redistributed and/or sold with any software, provided that each copy - contains the above copyright notice and this license. These can be - included either as stand-alone text files, human-readable headers or - in the appropriate machine-readable metadata fields within text or - binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font - Name(s) unless explicit written permission is granted by the corresponding - Copyright Holder. This restriction only applies to the primary font name as - presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font - Software shall not be used to promote, endorse or advertise any - Modified Version, except to acknowledge the contribution(s) of the - Copyright Holder(s) and the Author(s) or with their explicit written - permission. - -5) The Font Software, modified or unmodified, in part or in whole, - must be distributed entirely under this license, and must not be - distributed under any other license. The requirement for fonts to - remain under this license does not apply to any document created - using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.otf.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.otf.woff2 deleted file mode 100644 index 23878491546624..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.otf.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2 deleted file mode 100644 index 4cbd4c351f178d..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.otf.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.otf.woff2 deleted file mode 100644 index 28701e68424b15..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.otf.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2 b/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2 deleted file mode 100644 index 3b74d300ad0032..00000000000000 Binary files a/phpunit/data/themedir1/fonts-block-theme/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2 and /dev/null differ diff --git a/phpunit/data/themedir1/fonts-block-theme/style.css b/phpunit/data/themedir1/fonts-block-theme/style.css deleted file mode 100644 index f2d153ec7d673f..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/style.css +++ /dev/null @@ -1,7 +0,0 @@ -/* -Theme Name: Block Theme with defined Typography Fonts. -Theme URI: https://wordpress.org/ -Description: For testing purposes only. -Version: 1.0.0 -Text Domain: fonts-block-theme -*/ diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json deleted file mode 100644 index c24a4a85a4f673..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-duplicate-fonts.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 3, - "title": "Variation: duplicate fonts", - "settings": { - "typography": { - "fontFamilies": [ - { - "fontFamily": "\"DM Sans\", sans-serif", - "name": "DM Sans", - "slug": "dm-sans", - "fontFace": [ - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "400", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Regular.woff2" - ] - }, - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "700", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Bold.woff2" - ] - } - ] - } - ] - } - }, - "styles": { - "typography": { - "fontFamily": "var(--wp--preset--font-family--dm-sans)" - } - } -} diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json deleted file mode 100644 index dfc83f3726d798..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-family.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 3, - "title": "Variation: new font family", - "settings": { - "typography": { - "fontFamilies": [ - { - "fontFamily": "\"Open Sans\", serif", - "name": "Open Sans", - "slug": "open-sans", - "fontFace": [ - { - "fontFamily": "Open Sans", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "400", - "src": [ - "file:./assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.ttf" - ] - }, - { - "fontFamily": "Open Sans", - "fontStretch": "normal", - "fontStyle": "italic", - "fontWeight": "400", - "src": [ - "file:./assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.ttf" - ] - } - ] - } - ] - } - }, - "styles": { - "typography": { - "fontFamily": "var(--wp--preset--font-family--open-sans)" - } - } -} diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json deleted file mode 100644 index 95cb7b88d0fb78..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-new-font-variations.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 3, - "title": "Variation: new font variations", - "settings": { - "typography": { - "fontFamilies": [ - { - "fontFamily": "\"DM Sans\", sans-serif", - "name": "DM Sans", - "slug": "dm-sans", - "fontFace": [ - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "500", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Medium.woff2" - ] - }, - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "italic", - "fontWeight": "500", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Medium-Italic.woff2" - ] - } - ] - } - ] - } - }, - "styles": { - "typography": { - "fontFamily": "var(--wp--preset--font-family--dm-sans)" - } - } -} diff --git a/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json b/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json deleted file mode 100644 index fcdd368ec691b8..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/styles/variation-no-fonts.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": 3, - "title": "Variation - no fonts", - "styles": { - "typography": { - "fontFamily": "var(--wp--preset--font-family--dm-sans)" - } - } -} diff --git a/phpunit/data/themedir1/fonts-block-theme/theme.json b/phpunit/data/themedir1/fonts-block-theme/theme.json deleted file mode 100644 index e69d83e924c1bc..00000000000000 --- a/phpunit/data/themedir1/fonts-block-theme/theme.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "$schema": "../../../../schemas/json/theme.json", - "version": 3, - "settings": { - "appearanceTools": true, - "color": { - "palette": [ - { - "slug": "light", - "name": "Light", - "color": "#f5f7f9" - }, - { - "slug": "dark", - "name": "Dark", - "color": "#000" - } - ] - }, - "typography": { - "dropCap": false, - "fluid": true, - "fontFamilies": [ - { - "fontFace": [ - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "400", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Regular.woff2" - ] - }, - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "italic", - "fontWeight": "400", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Regular-Italic.woff2" - ] - }, - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "700", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Bold.woff2" - ] - }, - { - "fontFamily": "DM Sans", - "fontStretch": "normal", - "fontStyle": "italic", - "fontWeight": "700", - "src": [ - "file:./assets/fonts/dm-sans/DMSans-Bold-Italic.woff2" - ] - } - ], - "fontFamily": "\"DM Sans\", sans-serif", - "name": "DM Sans", - "slug": "dm-sans" - }, - { - "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", - "name": "System Font", - "slug": "system-font" - }, - { - "fontFace": [ - { - "fontFamily": "Source Serif Pro", - "fontStretch": "normal", - "fontStyle": "normal", - "fontWeight": "200 900", - "src": [ - "file:./assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2" - ] - }, - { - "fontFamily": "Source Serif Pro", - "fontStretch": "normal", - "fontStyle": "italic", - "fontWeight": "200 900", - "src": [ - "file:./assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2" - ] - } - ], - "fontFamily": "\"Source Serif Pro\", serif", - "name": "Source Serif Pro", - "slug": "source-serif-pro" - } - ] - }, - "useRootPaddingAwareAlignments": true - }, - "styles": { - "typography": { - "fontFamily": "var(--wp--preset--font-family--system-font)" - } - }, - "templateParts": [ - { - "name": "small-header", - "title": "Small Header", - "area": "header" - } - ] -} diff --git a/phpunit/fixtures/mock-provider.php b/phpunit/fixtures/mock-provider.php deleted file mode 100644 index 5d5d2286a1209d..00000000000000 --- a/phpunit/fixtures/mock-provider.php +++ /dev/null @@ -1,26 +0,0 @@ -fonts ); - return implode( '; ', $handles ); - } - - /** - * Gets the `