Relocates Font Face & Fonts Library to fonts dir (#53747)

Relocates the PHP files for Font Face and Fonts Library into`lib/experimental/fonts/`. Why? To align the directory structure with Core. Font Face and Fonts Library are both part of fonts management. WordPress Core has an existing `wp-includes/fonts/` directory. The `lib/experimental/fonts/` directory was intended to align to Core's fonts directory.
WordPress · Aug 16, 2023 · c14792d · c14792d
1 parent e29c0da
commit c14792d
Show file tree

Hide file tree

Showing 40 changed files with 33 additions and 63 deletions.
diff --git a/...er/class-gutenberg-fonts-api-bc-layer.php → ...er/class-gutenberg-fonts-api-bc-layer.php b/...er/class-gutenberg-fonts-api-bc-layer.php → ...er/class-gutenberg-fonts-api-bc-layer.php
diff --git a/...c-layer/class-wp-fonts-provider-local.php → ...c-layer/class-wp-fonts-provider-local.php b/...c-layer/class-wp-fonts-provider-local.php → ...c-layer/class-wp-fonts-provider-local.php
diff --git a/...onts/bc-layer/class-wp-fonts-provider.php → ...face/bc-layer/class-wp-fonts-provider.php b/...onts/bc-layer/class-wp-fonts-provider.php → ...face/bc-layer/class-wp-fonts-provider.php
diff --git a/...onts/bc-layer/class-wp-fonts-resolver.php → ...face/bc-layer/class-wp-fonts-resolver.php b/...onts/bc-layer/class-wp-fonts-resolver.php → ...face/bc-layer/class-wp-fonts-resolver.php
diff --git a/...l/fonts/bc-layer/class-wp-fonts-utils.php → ...nt-face/bc-layer/class-wp-fonts-utils.php b/...l/fonts/bc-layer/class-wp-fonts-utils.php → ...nt-face/bc-layer/class-wp-fonts-utils.php
diff --git a/...imental/fonts/bc-layer/class-wp-fonts.php → ...nts/font-face/bc-layer/class-wp-fonts.php b/...imental/fonts/bc-layer/class-wp-fonts.php → ...nts/font-face/bc-layer/class-wp-fonts.php
diff --git a/...tal/fonts/bc-layer/class-wp-web-fonts.php → ...font-face/bc-layer/class-wp-web-fonts.php b/...tal/fonts/bc-layer/class-wp-web-fonts.php → ...font-face/bc-layer/class-wp-web-fonts.php
diff --git a/...ayer/class-wp-webfonts-provider-local.php → ...ayer/class-wp-webfonts-provider-local.php b/...ayer/class-wp-webfonts-provider-local.php → ...ayer/class-wp-webfonts-provider-local.php
diff --git a/...s/bc-layer/class-wp-webfonts-provider.php → ...e/bc-layer/class-wp-webfonts-provider.php b/...s/bc-layer/class-wp-webfonts-provider.php → ...e/bc-layer/class-wp-webfonts-provider.php
diff --git a/...onts/bc-layer/class-wp-webfonts-utils.php → ...face/bc-layer/class-wp-webfonts-utils.php b/...onts/bc-layer/class-wp-webfonts-utils.php → ...face/bc-layer/class-wp-webfonts-utils.php
diff --git a/...ntal/fonts/bc-layer/class-wp-webfonts.php → .../font-face/bc-layer/class-wp-webfonts.php b/...ntal/fonts/bc-layer/class-wp-webfonts.php → .../font-face/bc-layer/class-wp-webfonts.php
diff --git a/.../fonts/bc-layer/webfonts-deprecations.php → ...t-face/bc-layer/webfonts-deprecations.php b/.../fonts/bc-layer/webfonts-deprecations.php → ...t-face/bc-layer/webfonts-deprecations.php
diff --git a/...tal/fonts/class-wp-font-face-resolver.php → ...font-face/class-wp-font-face-resolver.php b/...tal/fonts/class-wp-font-face-resolver.php → ...font-face/class-wp-font-face-resolver.php
diff --git a/...experimental/fonts/class-wp-font-face.php → ...al/fonts/font-face/class-wp-font-face.php b/...experimental/fonts/class-wp-font-face.php → ...al/fonts/font-face/class-wp-font-face.php
diff --git a/lib/experimental/fonts/fonts.php → lib/experimental/fonts/font-face/fonts.php b/lib/experimental/fonts/fonts.php → lib/experimental/fonts/font-face/fonts.php
diff --git a/...ts-library/class-wp-font-family-utils.php → ...ts-library/class-wp-font-family-utils.php b/...ts-library/class-wp-font-family-utils.php → ...ts-library/class-wp-font-family-utils.php
diff --git a/...al/fonts-library/class-wp-font-family.php → ...ts/fonts-library/class-wp-font-family.php b/...al/fonts-library/class-wp-font-family.php → ...ts/fonts-library/class-wp-font-family.php
diff --git a/.../fonts-library/class-wp-fonts-library.php → .../fonts-library/class-wp-fonts-library.php b/.../fonts-library/class-wp-fonts-library.php → .../fonts-library/class-wp-fonts-library.php
diff --git a/...lass-wp-rest-fonts-library-controller.php → ...lass-wp-rest-fonts-library-controller.php b/...lass-wp-rest-fonts-library-controller.php → ...lass-wp-rest-fonts-library-controller.php
diff --git a/...erimental/fonts-library/fonts-library.php → ...tal/fonts/fonts-library/fonts-library.php b/...erimental/fonts-library/fonts-library.php → ...tal/fonts/fonts-library/fonts-library.php
diff --git a/lib/load.php b/lib/load.php
@@ -160,30 +160,30 @@ 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/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 → ...fonts/font-face/wp-font-face-testcase.php b/phpunit/fonts/wp-font-face-testcase.php → ...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 → .../font-face/wp-font-face-tests-dataset.php b/phpunit/fonts/wp-font-face-tests-dataset.php → .../font-face/wp-font-face-tests-dataset.php
diff --git a/...onts/wpFontFace/generateAndPrint-test.php → ...face/wpFontFace/generateAndPrint-test.php b/...onts/wpFontFace/generateAndPrint-test.php → ...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/...ceResolver/getFontsFromThemeJson-test.php → ...ceResolver/getFontsFromThemeJson-test.php b/...ceResolver/getFontsFromThemeJson-test.php → ...ceResolver/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 → ...fonts/font-face/wpPrintFontFaces-test.php b/phpunit/fonts/wpPrintFontFaces-test.php → ...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().
  *

diff --git a/...wp-rest-fonts-library-controller-test.php → ...wp-rest-fonts-library-controller-test.php b/...wp-rest-fonts-library-controller-test.php → ...wp-rest-fonts-library-controller-test.php
diff --git a/...library/wpFontFamily/__construct-test.php → ...library/wpFontFamily/__construct-test.php b/...library/wpFontFamily/__construct-test.php → ...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 → ...fonts/fonts-library/wpFontFamily/base.php b/phpunit/fonts-library/wpFontFamily/base.php → ...fonts/fonts-library/wpFontFamily/base.php
diff --git a/...nts-library/wpFontFamily/getData-test.php → ...nts-library/wpFontFamily/getData-test.php b/...nts-library/wpFontFamily/getData-test.php → ...nts-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/...brary/wpFontFamily/getDataAsJson-test.php → ...brary/wpFontFamily/getDataAsJson-test.php b/...brary/wpFontFamily/getDataAsJson-test.php → ...brary/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/...library/wpFontFamily/getFontPost-test.php → ...library/wpFontFamily/getFontPost-test.php b/...library/wpFontFamily/getFontPost-test.php → ...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/...ibrary/wpFontFamily/hasFontFaces-test.php → ...ibrary/wpFontFamily/hasFontFaces-test.php b/...ibrary/wpFontFamily/hasFontFaces-test.php → ...ibrary/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/...nts-library/wpFontFamily/install-test.php → ...nts-library/wpFontFamily/install-test.php b/...nts-library/wpFontFamily/install-test.php → ...nts-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/...s-library/wpFontFamily/uninstall-test.php → ...s-library/wpFontFamily/uninstall-test.php b/...s-library/wpFontFamily/uninstall-test.php → ...s-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/...ilyUtils/getFilenameFromFontFace-test.php → ...ilyUtils/getFilenameFromFontFace-test.php b/...ilyUtils/getFilenameFromFontFace-test.php → ...ilyUtils/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/...pFontFamilyUtils/hasFontMimeType-test.php → ...pFontFamilyUtils/hasFontMimeType-test.php b/...pFontFamilyUtils/hasFontMimeType-test.php → ...pFontFamilyUtils/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/...wpFontFamilyUtils/mergeFontsData-test.php → ...wpFontFamilyUtils/mergeFontsData-test.php b/...wpFontFamilyUtils/mergeFontsData-test.php → ...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/...brary/wpFontsLibrary/getFontsDir-test.php → ...brary/wpFontsLibrary/getFontsDir-test.php b/...brary/wpFontsLibrary/getFontsDir-test.php → ...brary/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/...rary/wpFontsLibrary/setUploadDir-test.php → ...rary/wpFontsLibrary/setUploadDir-test.php b/...rary/wpFontsLibrary/setUploadDir-test.php → ...rary/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(