From 11c4e43de7afabc3e07e33665b8288c3dc4154d6 Mon Sep 17 00:00:00 2001 From: hellofromtonya Date: Wed, 16 Aug 2023 14:15:03 -0500 Subject: [PATCH 1/2] Moves Font Face --- .../class-gutenberg-fonts-api-bc-layer.php | 0 .../class-wp-fonts-provider-local.php | 0 .../bc-layer/class-wp-fonts-provider.php | 0 .../bc-layer/class-wp-fonts-resolver.php | 0 .../bc-layer/class-wp-fonts-utils.php | 0 .../bc-layer/class-wp-fonts.php | 0 .../bc-layer/class-wp-web-fonts.php | 0 .../class-wp-webfonts-provider-local.php | 0 .../bc-layer/class-wp-webfonts-provider.php | 0 .../bc-layer/class-wp-webfonts-utils.php | 0 .../bc-layer/class-wp-webfonts.php | 0 .../bc-layer/webfonts-deprecations.php | 0 .../class-wp-font-face-resolver.php | 0 .../{ => font-face}/class-wp-font-face.php | 0 .../fonts/{ => font-face}/fonts.php | 0 lib/load.php | 30 +++++++++---------- .../{ => font-face}/wp-font-face-testcase.php | 2 +- .../wp-font-face-tests-dataset.php | 0 .../wpFontFace/generateAndPrint-test.php | 10 ------- .../getFontsFromThemeJson-test.php | 10 ------- .../{ => font-face}/wpPrintFontFaces-test.php | 10 ------- 21 files changed, 16 insertions(+), 46 deletions(-) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-gutenberg-fonts-api-bc-layer.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-fonts-provider-local.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-fonts-provider.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-fonts-resolver.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-fonts-utils.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-fonts.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-web-fonts.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-webfonts-provider-local.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-webfonts-provider.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-webfonts-utils.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/class-wp-webfonts.php (100%) rename lib/experimental/fonts/{ => font-face}/bc-layer/webfonts-deprecations.php (100%) rename lib/experimental/fonts/{ => font-face}/class-wp-font-face-resolver.php (100%) rename lib/experimental/fonts/{ => font-face}/class-wp-font-face.php (100%) rename lib/experimental/fonts/{ => font-face}/fonts.php (100%) rename phpunit/fonts/{ => font-face}/wp-font-face-testcase.php (98%) rename phpunit/fonts/{ => font-face}/wp-font-face-tests-dataset.php (100%) rename phpunit/fonts/{ => font-face}/wpFontFace/generateAndPrint-test.php (74%) rename phpunit/fonts/{ => font-face}/wpFontFaceResolver/getFontsFromThemeJson-test.php (88%) rename phpunit/fonts/{ => font-face}/wpPrintFontFaces-test.php (79%) diff --git a/lib/experimental/fonts/bc-layer/class-gutenberg-fonts-api-bc-layer.php b/lib/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-gutenberg-fonts-api-bc-layer.php rename to lib/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-fonts-provider-local.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-fonts-provider-local.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-fonts-provider.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-fonts-provider.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-fonts-resolver.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-fonts-resolver.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-fonts-utils.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-fonts-utils.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-fonts.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-fonts.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-fonts.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-fonts.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-web-fonts.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-web-fonts.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-webfonts-provider-local.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-webfonts-provider-local.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-webfonts-provider.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-webfonts-provider.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-webfonts-utils.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-webfonts-utils.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php diff --git a/lib/experimental/fonts/bc-layer/class-wp-webfonts.php b/lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php similarity index 100% rename from lib/experimental/fonts/bc-layer/class-wp-webfonts.php rename to lib/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php diff --git a/lib/experimental/fonts/bc-layer/webfonts-deprecations.php b/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php similarity index 100% rename from lib/experimental/fonts/bc-layer/webfonts-deprecations.php rename to lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php diff --git a/lib/experimental/fonts/class-wp-font-face-resolver.php b/lib/experimental/fonts/font-face/class-wp-font-face-resolver.php similarity index 100% rename from lib/experimental/fonts/class-wp-font-face-resolver.php rename to lib/experimental/fonts/font-face/class-wp-font-face-resolver.php diff --git a/lib/experimental/fonts/class-wp-font-face.php b/lib/experimental/fonts/font-face/class-wp-font-face.php similarity index 100% rename from lib/experimental/fonts/class-wp-font-face.php rename to lib/experimental/fonts/font-face/class-wp-font-face.php diff --git a/lib/experimental/fonts/fonts.php b/lib/experimental/fonts/font-face/fonts.php similarity index 100% rename from lib/experimental/fonts/fonts.php rename to lib/experimental/fonts/font-face/fonts.php diff --git a/lib/load.php b/lib/load.php index 27e1b4f5e3efcb..0509d176dba540 100644 --- a/lib/load.php +++ b/lib/load.php @@ -167,23 +167,23 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/experimental/fonts-library/fonts-library.php'; if ( ! class_exists( 'WP_Font_Face' ) ) { - require __DIR__ . '/experimental/fonts/class-wp-font-face.php'; - require __DIR__ . '/experimental/fonts/class-wp-font-face-resolver.php'; - require __DIR__ . '/experimental/fonts/fonts.php'; + require __DIR__ . '/experimental/fonts/font-face/class-wp-font-face.php'; + require __DIR__ . '/experimental/fonts/font-face/class-wp-font-face-resolver.php'; + require __DIR__ . '/experimental/fonts/font-face/fonts.php'; // Load the BC Layer. Do no backport to WP Core. - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-fonts-provider.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-fonts-utils.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-fonts.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-fonts-provider-local.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-fonts-resolver.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-gutenberg-fonts-api-bc-layer.php'; - require __DIR__ . '/experimental/fonts/bc-layer/webfonts-deprecations.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-webfonts-utils.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-webfonts-provider.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-webfonts-provider-local.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-webfonts.php'; - require __DIR__ . '/experimental/fonts/bc-layer/class-wp-web-fonts.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php'; + require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php'; } } elseif ( ! class_exists( 'WP_Fonts' ) ) { // Fonts API files. diff --git a/phpunit/fonts/wp-font-face-testcase.php b/phpunit/fonts/font-face/wp-font-face-testcase.php similarity index 98% rename from phpunit/fonts/wp-font-face-testcase.php rename to phpunit/fonts/font-face/wp-font-face-testcase.php index 7f2603fbab6631..f36b00833e69c8 100644 --- a/phpunit/fonts/wp-font-face-testcase.php +++ b/phpunit/fonts/font-face/wp-font-face-testcase.php @@ -62,7 +62,7 @@ public static function set_up_before_class() { parent::set_up_before_class(); if ( self::$requires_switch_theme_fixtures ) { - self::$theme_root = realpath( __DIR__ . '/../data/themedir1' ); + self::$theme_root = realpath( __DIR__ . '/../../data/themedir1' ); } } diff --git a/phpunit/fonts/wp-font-face-tests-dataset.php b/phpunit/fonts/font-face/wp-font-face-tests-dataset.php similarity index 100% rename from phpunit/fonts/wp-font-face-tests-dataset.php rename to phpunit/fonts/font-face/wp-font-face-tests-dataset.php diff --git a/phpunit/fonts/wpFontFace/generateAndPrint-test.php b/phpunit/fonts/font-face/wpFontFace/generateAndPrint-test.php similarity index 74% rename from phpunit/fonts/wpFontFace/generateAndPrint-test.php rename to phpunit/fonts/font-face/wpFontFace/generateAndPrint-test.php index 302395d8fead6f..2b31b387694817 100644 --- a/phpunit/fonts/wpFontFace/generateAndPrint-test.php +++ b/phpunit/fonts/font-face/wpFontFace/generateAndPrint-test.php @@ -8,16 +8,6 @@ require_once __DIR__ . '/../wp-font-face-tests-dataset.php'; -/* - * This code is only needed if the Font API is enabled. - * @todo remove this code when Font Library is merged into Gutenberg. - */ -if ( ! class_exists( 'WP_Font_Face' ) ) { - require_once __DIR__ . '/../../../lib/experimental/fonts/class-wp-font-face.php'; - require_once __DIR__ . '/../../../lib/experimental/fonts/class-wp-font-face-resolver.php'; - require_once __DIR__ . '/../../../lib/experimental/fonts/fonts.php'; -} - /** * Test WP_Font_Face::generate_and_print(). * diff --git a/phpunit/fonts/wpFontFaceResolver/getFontsFromThemeJson-test.php b/phpunit/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson-test.php similarity index 88% rename from phpunit/fonts/wpFontFaceResolver/getFontsFromThemeJson-test.php rename to phpunit/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson-test.php index 74c0f0a4f3c423..3a5626ef6eaa12 100644 --- a/phpunit/fonts/wpFontFaceResolver/getFontsFromThemeJson-test.php +++ b/phpunit/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson-test.php @@ -8,16 +8,6 @@ require_once __DIR__ . '/../wp-font-face-testcase.php'; -/* - * This code is only needed if the Font API is enabled. - * @todo remove this code when Font Library is merged into Gutenberg. - */ -if ( ! class_exists( 'WP_Font_Face' ) ) { - require_once __DIR__ . '/../../../lib/experimental/fonts/class-wp-font-face.php'; - require_once __DIR__ . '/../../../lib/experimental/fonts/class-wp-font-face-resolver.php'; - require_once __DIR__ . '/../../../lib/experimental/fonts/fonts.php'; -} - /** * Tests WP_Font_Face_Resolver::get_fonts_from_theme_json(). * diff --git a/phpunit/fonts/wpPrintFontFaces-test.php b/phpunit/fonts/font-face/wpPrintFontFaces-test.php similarity index 79% rename from phpunit/fonts/wpPrintFontFaces-test.php rename to phpunit/fonts/font-face/wpPrintFontFaces-test.php index aa44dd4f71b0d6..c6d4203fd50532 100644 --- a/phpunit/fonts/wpPrintFontFaces-test.php +++ b/phpunit/fonts/font-face/wpPrintFontFaces-test.php @@ -8,16 +8,6 @@ require_once __DIR__ . '/wp-font-face-testcase.php'; -/* - * This code is only needed if the Font API is enabled. - * @todo remove this code when Font Library is merged into Gutenberg. - */ -if ( ! class_exists( 'WP_Font_Face' ) ) { - require_once __DIR__ . '/../../../lib/experimental/fonts/class-wp-font-face.php'; - require_once __DIR__ . '/../../../lib/experimental/fonts/class-wp-font-face-resolver.php'; - require_once __DIR__ . '/../../../lib/experimental/fonts/fonts.php'; -} - /** * Test wp_print_font_faces(). * From c89b07c9d47fd755a0f03480cce5789daea74e16 Mon Sep 17 00:00:00 2001 From: hellofromtonya Date: Wed, 16 Aug 2023 14:18:43 -0500 Subject: [PATCH 2/2] Moves Fonts Library --- .../fonts-library/class-wp-font-family-utils.php | 0 .../{ => fonts}/fonts-library/class-wp-font-family.php | 0 .../fonts-library/class-wp-fonts-library.php | 0 .../class-wp-rest-fonts-library-controller.php | 0 .../{ => fonts}/fonts-library/fonts-library.php | 0 lib/load.php | 10 +++++----- .../class-wp-rest-fonts-library-controller-test.php | 0 .../fonts-library/wpFontFamily/__construct-test.php | 2 +- .../{ => fonts}/fonts-library/wpFontFamily/base.php | 0 .../fonts-library/wpFontFamily/getData-test.php | 2 +- .../fonts-library/wpFontFamily/getDataAsJson-test.php | 2 +- .../fonts-library/wpFontFamily/getFontPost-test.php | 2 +- .../fonts-library/wpFontFamily/hasFontFaces-test.php | 2 +- .../fonts-library/wpFontFamily/install-test.php | 2 +- .../fonts-library/wpFontFamily/uninstall-test.php | 2 +- .../wpFontFamilyUtils/getFilenameFromFontFace-test.php | 2 +- .../wpFontFamilyUtils/hasFontMimeType-test.php | 2 +- .../wpFontFamilyUtils/mergeFontsData-test.php | 2 +- .../fonts-library/wpFontsLibrary/getFontsDir-test.php | 2 +- .../fonts-library/wpFontsLibrary/setUploadDir-test.php | 2 +- 20 files changed, 17 insertions(+), 17 deletions(-) rename lib/experimental/{ => fonts}/fonts-library/class-wp-font-family-utils.php (100%) rename lib/experimental/{ => fonts}/fonts-library/class-wp-font-family.php (100%) rename lib/experimental/{ => fonts}/fonts-library/class-wp-fonts-library.php (100%) rename lib/experimental/{ => fonts}/fonts-library/class-wp-rest-fonts-library-controller.php (100%) rename lib/experimental/{ => fonts}/fonts-library/fonts-library.php (100%) rename phpunit/{ => fonts}/fonts-library/class-wp-rest-fonts-library-controller-test.php (100%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/__construct-test.php (94%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/base.php (100%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/getData-test.php (97%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/getDataAsJson-test.php (96%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/getFontPost-test.php (92%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/hasFontFaces-test.php (95%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/install-test.php (98%) rename phpunit/{ => fonts}/fonts-library/wpFontFamily/uninstall-test.php (98%) rename phpunit/{ => fonts}/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php (94%) rename phpunit/{ => fonts}/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php (94%) rename phpunit/{ => fonts}/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php (98%) rename phpunit/{ => fonts}/fonts-library/wpFontsLibrary/getFontsDir-test.php (81%) rename phpunit/{ => fonts}/fonts-library/wpFontsLibrary/setUploadDir-test.php (90%) diff --git a/lib/experimental/fonts-library/class-wp-font-family-utils.php b/lib/experimental/fonts/fonts-library/class-wp-font-family-utils.php similarity index 100% rename from lib/experimental/fonts-library/class-wp-font-family-utils.php rename to lib/experimental/fonts/fonts-library/class-wp-font-family-utils.php diff --git a/lib/experimental/fonts-library/class-wp-font-family.php b/lib/experimental/fonts/fonts-library/class-wp-font-family.php similarity index 100% rename from lib/experimental/fonts-library/class-wp-font-family.php rename to lib/experimental/fonts/fonts-library/class-wp-font-family.php diff --git a/lib/experimental/fonts-library/class-wp-fonts-library.php b/lib/experimental/fonts/fonts-library/class-wp-fonts-library.php similarity index 100% rename from lib/experimental/fonts-library/class-wp-fonts-library.php rename to lib/experimental/fonts/fonts-library/class-wp-fonts-library.php diff --git a/lib/experimental/fonts-library/class-wp-rest-fonts-library-controller.php b/lib/experimental/fonts/fonts-library/class-wp-rest-fonts-library-controller.php similarity index 100% rename from lib/experimental/fonts-library/class-wp-rest-fonts-library-controller.php rename to lib/experimental/fonts/fonts-library/class-wp-rest-fonts-library-controller.php diff --git a/lib/experimental/fonts-library/fonts-library.php b/lib/experimental/fonts/fonts-library/fonts-library.php similarity index 100% rename from lib/experimental/fonts-library/fonts-library.php rename to lib/experimental/fonts/fonts-library/fonts-library.php diff --git a/lib/load.php b/lib/load.php index 0509d176dba540..ec3cddf56d257f 100644 --- a/lib/load.php +++ b/lib/load.php @@ -160,11 +160,11 @@ function gutenberg_is_experiment_enabled( $name ) { */ if ( defined( 'FONTS_LIBRARY_ENABLE' ) && FONTS_LIBRARY_ENABLE ) { // Loads the Fonts Library. - require __DIR__ . '/experimental/fonts-library/class-wp-fonts-library.php'; - require __DIR__ . '/experimental/fonts-library/class-wp-font-family-utils.php'; - require __DIR__ . '/experimental/fonts-library/class-wp-font-family.php'; - require __DIR__ . '/experimental/fonts-library/class-wp-rest-fonts-library-controller.php'; - require __DIR__ . '/experimental/fonts-library/fonts-library.php'; + require __DIR__ . '/experimental/fonts/fonts-library/class-wp-fonts-library.php'; + require __DIR__ . '/experimental/fonts/fonts-library/class-wp-font-family-utils.php'; + require __DIR__ . '/experimental/fonts/fonts-library/class-wp-font-family.php'; + require __DIR__ . '/experimental/fonts/fonts-library/class-wp-rest-fonts-library-controller.php'; + require __DIR__ . '/experimental/fonts/fonts-library/fonts-library.php'; if ( ! class_exists( 'WP_Font_Face' ) ) { require __DIR__ . '/experimental/fonts/font-face/class-wp-font-face.php'; diff --git a/phpunit/fonts-library/class-wp-rest-fonts-library-controller-test.php b/phpunit/fonts/fonts-library/class-wp-rest-fonts-library-controller-test.php similarity index 100% rename from phpunit/fonts-library/class-wp-rest-fonts-library-controller-test.php rename to phpunit/fonts/fonts-library/class-wp-rest-fonts-library-controller-test.php diff --git a/phpunit/fonts-library/wpFontFamily/__construct-test.php b/phpunit/fonts/fonts-library/wpFontFamily/__construct-test.php similarity index 94% rename from phpunit/fonts-library/wpFontFamily/__construct-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/__construct-test.php index 1b1e8706f1c682..04de15cd823dae 100644 --- a/phpunit/fonts-library/wpFontFamily/__construct-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/__construct-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family::__construct */ -class Tests_FontsLibrary_WpFontFamily_Construct extends WP_UnitTestCase { +class Tests_Fonts_WpFontFamily_Construct extends WP_UnitTestCase { public function test_should_initialize_data() { $property = new ReflectionProperty( WP_Font_Family::class, 'data' ); diff --git a/phpunit/fonts-library/wpFontFamily/base.php b/phpunit/fonts/fonts-library/wpFontFamily/base.php similarity index 100% rename from phpunit/fonts-library/wpFontFamily/base.php rename to phpunit/fonts/fonts-library/wpFontFamily/base.php diff --git a/phpunit/fonts-library/wpFontFamily/getData-test.php b/phpunit/fonts/fonts-library/wpFontFamily/getData-test.php similarity index 97% rename from phpunit/fonts-library/wpFontFamily/getData-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/getData-test.php index d377ee4a095fe8..a2d3cc7070f442 100644 --- a/phpunit/fonts-library/wpFontFamily/getData-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/getData-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family::get_data */ -class Tests_FontsLibrary_WpFontsLibrary_GetData extends WP_UnitTestCase { +class Tests_Fonts_WpFontsLibrary_GetData extends WP_UnitTestCase { /** * @dataProvider data_should_get_data diff --git a/phpunit/fonts-library/wpFontFamily/getDataAsJson-test.php b/phpunit/fonts/fonts-library/wpFontFamily/getDataAsJson-test.php similarity index 96% rename from phpunit/fonts-library/wpFontFamily/getDataAsJson-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/getDataAsJson-test.php index 06408bb325b6dc..ac942cfeaaa99b 100644 --- a/phpunit/fonts-library/wpFontFamily/getDataAsJson-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/getDataAsJson-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family::get_data_as_json */ -class Tests_FontsLibrary_WpFontFamily_GetDataAsJson extends WP_UnitTestCase { +class Tests_Fonts_WpFontFamily_GetDataAsJson extends WP_UnitTestCase { /** * @dataProvider data_should_get_data_as_json diff --git a/phpunit/fonts-library/wpFontFamily/getFontPost-test.php b/phpunit/fonts/fonts-library/wpFontFamily/getFontPost-test.php similarity index 92% rename from phpunit/fonts-library/wpFontFamily/getFontPost-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/getFontPost-test.php index e3a1c9f49e739d..cfc58b065b7445 100644 --- a/phpunit/fonts-library/wpFontFamily/getFontPost-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/getFontPost-test.php @@ -14,7 +14,7 @@ * * @covers WP_Font_Family::get_font_post */ -class Tests_FontsLibrary_WpFontFamily_GetFontPost extends WP_Font_Family_UnitTestCase { +class Tests_Fonts_WpFontFamily_GetFontPost extends WP_Font_Family_UnitTestCase { public function test_should_return_post() { // Set up the post. diff --git a/phpunit/fonts-library/wpFontFamily/hasFontFaces-test.php b/phpunit/fonts/fonts-library/wpFontFamily/hasFontFaces-test.php similarity index 95% rename from phpunit/fonts-library/wpFontFamily/hasFontFaces-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/hasFontFaces-test.php index d7d4fedce24c64..9e262626171c8b 100644 --- a/phpunit/fonts-library/wpFontFamily/hasFontFaces-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/hasFontFaces-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family::has_font_faces */ -class Tests_FontsLibrary_WpFontFamily_HasFontFaces extends WP_UnitTestCase { +class Tests_Fonts_WpFontFamily_HasFontFaces extends WP_UnitTestCase { public function test_should_return_true_when_check_succeeds() { $font_data = array( diff --git a/phpunit/fonts-library/wpFontFamily/install-test.php b/phpunit/fonts/fonts-library/wpFontFamily/install-test.php similarity index 98% rename from phpunit/fonts-library/wpFontFamily/install-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/install-test.php index 4e9855e868e74a..ee2ff77a9f3a30 100644 --- a/phpunit/fonts-library/wpFontFamily/install-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/install-test.php @@ -14,7 +14,7 @@ * * @covers WP_Font_Family::install */ -class Tests_FontsLibrary_WpFontFamily_Install extends WP_Font_Family_UnitTestCase { +class Tests_Fonts_WpFontFamily_Install extends WP_Font_Family_UnitTestCase { /** * @dataProvider data_should_not_download_when_no_fontface diff --git a/phpunit/fonts-library/wpFontFamily/uninstall-test.php b/phpunit/fonts/fonts-library/wpFontFamily/uninstall-test.php similarity index 98% rename from phpunit/fonts-library/wpFontFamily/uninstall-test.php rename to phpunit/fonts/fonts-library/wpFontFamily/uninstall-test.php index 27e6444dedd4ac..c4288de3a8666b 100644 --- a/phpunit/fonts-library/wpFontFamily/uninstall-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamily/uninstall-test.php @@ -14,7 +14,7 @@ * * @covers WP_Font_Family::uninstall */ -class Tests_FontsLibrary_WpFontFamily_Uninstall extends WP_Font_Family_UnitTestCase { +class Tests_Fonts_WpFontFamily_Uninstall extends WP_Font_Family_UnitTestCase { public function test_should_return_error_when_font_not_found() { // Set up. diff --git a/phpunit/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php b/phpunit/fonts/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php similarity index 94% rename from phpunit/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php rename to phpunit/fonts/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php index 99467c42451be4..2ae4c3e5cedcf1 100644 --- a/phpunit/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamilyUtils/getFilenameFromFontFace-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family_Utils::get_filename_from_font_face */ -class Tests_FontsLibrary_WpFontsFamilyUtils_GetFilenameFromFontFace extends WP_UnitTestCase { +class Tests_Fonts_WpFontsFamilyUtils_GetFilenameFromFontFace extends WP_UnitTestCase { /** * @dataProvider data_should_get_filename diff --git a/phpunit/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php b/phpunit/fonts/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php similarity index 94% rename from phpunit/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php rename to phpunit/fonts/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php index 623dae4937bd90..582ff8dd650e2e 100644 --- a/phpunit/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamilyUtils/hasFontMimeType-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family_Utils::has_font_mime_type */ -class Tests_FontsLibrary_WpFontsFamilyUtils_HasFontMimeType extends WP_UnitTestCase { +class Tests_Fonts_WpFontsFamilyUtils_HasFontMimeType extends WP_UnitTestCase { /** * @dataProvider data_should_succeed_when_has_mime_type diff --git a/phpunit/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php b/phpunit/fonts/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php similarity index 98% rename from phpunit/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php rename to phpunit/fonts/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php index 29e7eff1dac97a..d3fc0d26e406a9 100644 --- a/phpunit/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php +++ b/phpunit/fonts/fonts-library/wpFontFamilyUtils/mergeFontsData-test.php @@ -10,7 +10,7 @@ * * @covers WP_Font_Family_Utils::merge_fonts_data */ -class Tests_FontsLibrary_WpFontsFamilyUtils_MergeFontsData extends WP_UnitTestCase { +class Tests_Fonts_WpFontsFamilyUtils_MergeFontsData extends WP_UnitTestCase { /** * @dataProvider data_should_fail_merge diff --git a/phpunit/fonts-library/wpFontsLibrary/getFontsDir-test.php b/phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php similarity index 81% rename from phpunit/fonts-library/wpFontsLibrary/getFontsDir-test.php rename to phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php index dd64a4a3ba60a3..4ed6616c813d04 100644 --- a/phpunit/fonts-library/wpFontsLibrary/getFontsDir-test.php +++ b/phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php @@ -10,7 +10,7 @@ * * @covers WP_Fonts_Library::get_fonts_dir */ -class Tests_FontsLibrary_WpFontsLibrary_GetFontsDir extends WP_UnitTestCase { +class Tests_Fonts_WpFontsLibrary_GetFontsDir extends WP_UnitTestCase { public function test_get_fonts_dir() { $this->assertStringEndsWith( '/wp-content/uploads/fonts', WP_Fonts_Library::get_fonts_dir() ); diff --git a/phpunit/fonts-library/wpFontsLibrary/setUploadDir-test.php b/phpunit/fonts/fonts-library/wpFontsLibrary/setUploadDir-test.php similarity index 90% rename from phpunit/fonts-library/wpFontsLibrary/setUploadDir-test.php rename to phpunit/fonts/fonts-library/wpFontsLibrary/setUploadDir-test.php index 65d1612659fa8e..ad038260caa42f 100644 --- a/phpunit/fonts-library/wpFontsLibrary/setUploadDir-test.php +++ b/phpunit/fonts/fonts-library/wpFontsLibrary/setUploadDir-test.php @@ -10,7 +10,7 @@ * * @covers WP_Fonts_Library::set_upload_dir */ -class Tests_FontsLibrary_WpFontsLibrary_SetUploadDir extends WP_UnitTestCase { +class Tests_Fonts_WpFontsLibrary_SetUploadDir extends WP_UnitTestCase { public function test_should_set_fonts_upload_dir() { $defaults = array(