Move Fonts Library to compat dir for 6.5 (#58608)

Co-authored-by: getdave <get_dave@git.wordpress.org> Co-authored-by: youknowriad <youknowriad@git.wordpress.org> Co-authored-by: anton-vlasenko <antonvlasenko@git.wordpress.org> Co-authored-by: hellofromtonya <hellofromtonya@git.wordpress.org>
WordPress · Feb 2, 2024 · e44172e · e44172e
1 parent 9bc6a57
commit e44172e
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 19 deletions.
diff --git a/...font-library/class-wp-font-collection.php → ...ss-6.5/fonts/class-wp-font-collection.php b/...font-library/class-wp-font-collection.php → ...ss-6.5/fonts/class-wp-font-collection.php
diff --git a/...ts/font-library/class-wp-font-library.php → ...press-6.5/fonts/class-wp-font-library.php b/...ts/font-library/class-wp-font-library.php → ...press-6.5/fonts/class-wp-font-library.php
diff --git a/...onts/font-library/class-wp-font-utils.php → ...rdpress-6.5/fonts/class-wp-font-utils.php b/...onts/font-library/class-wp-font-utils.php → ...rdpress-6.5/fonts/class-wp-font-utils.php
diff --git a/...s-wp-rest-font-collections-controller.php → ...s-wp-rest-font-collections-controller.php b/...s-wp-rest-font-collections-controller.php → ...s-wp-rest-font-collections-controller.php
diff --git a/...y/class-wp-rest-font-faces-controller.php → ...s/class-wp-rest-font-faces-controller.php b/...y/class-wp-rest-font-faces-controller.php → ...s/class-wp-rest-font-faces-controller.php
diff --git a/...lass-wp-rest-font-families-controller.php → ...lass-wp-rest-font-families-controller.php b/...lass-wp-rest-font-families-controller.php → ...lass-wp-rest-font-families-controller.php
diff --git a/...ental/fonts/font-library/font-library.php → lib/compat/wordpress-6.5/fonts/fonts.php b/...ental/fonts/font-library/font-library.php → lib/compat/wordpress-6.5/fonts/fonts.php
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/...face/bc-layer/class-wp-fonts-provider.php → ...face/bc-layer/class-wp-fonts-provider.php b/...face/bc-layer/class-wp-fonts-provider.php → ...face/bc-layer/class-wp-fonts-provider.php
diff --git a/...face/bc-layer/class-wp-fonts-resolver.php → ...face/bc-layer/class-wp-fonts-resolver.php b/...face/bc-layer/class-wp-fonts-resolver.php → ...face/bc-layer/class-wp-fonts-resolver.php
diff --git a/...nt-face/bc-layer/class-wp-fonts-utils.php → ...nt-face/bc-layer/class-wp-fonts-utils.php b/...nt-face/bc-layer/class-wp-fonts-utils.php → ...nt-face/bc-layer/class-wp-fonts-utils.php
diff --git a/...nts/font-face/bc-layer/class-wp-fonts.php → ...tal/font-face/bc-layer/class-wp-fonts.php b/...nts/font-face/bc-layer/class-wp-fonts.php → ...tal/font-face/bc-layer/class-wp-fonts.php
diff --git a/...font-face/bc-layer/class-wp-web-fonts.php → ...font-face/bc-layer/class-wp-web-fonts.php b/...font-face/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/...e/bc-layer/class-wp-webfonts-provider.php → ...e/bc-layer/class-wp-webfonts-provider.php b/...e/bc-layer/class-wp-webfonts-provider.php → ...e/bc-layer/class-wp-webfonts-provider.php
diff --git a/...face/bc-layer/class-wp-webfonts-utils.php → ...face/bc-layer/class-wp-webfonts-utils.php b/...face/bc-layer/class-wp-webfonts-utils.php → ...face/bc-layer/class-wp-webfonts-utils.php
diff --git a/.../font-face/bc-layer/class-wp-webfonts.php → .../font-face/bc-layer/class-wp-webfonts.php b/.../font-face/bc-layer/class-wp-webfonts.php → .../font-face/bc-layer/class-wp-webfonts.php
diff --git a/...t-face/bc-layer/webfonts-deprecations.php → ...t-face/bc-layer/webfonts-deprecations.php b/...t-face/bc-layer/webfonts-deprecations.php → ...t-face/bc-layer/webfonts-deprecations.php
diff --git a/lib/load.php b/lib/load.php
@@ -137,13 +137,13 @@ function gutenberg_is_experiment_enabled( $name ) {
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.
 
 // Loads the Font Library.
-require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-font-utils.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
-require __DIR__ . '/experimental/fonts/font-library/font-library.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-font-collection.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-font-library.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-font-utils.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-rest-font-families-controller.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-rest-font-faces-controller.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/class-wp-rest-font-collections-controller.php';
+require __DIR__ . '/compat/wordpress-6.5/fonts/fonts.php';
 
 // Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core.
 if ( ! class_exists( 'WP_Font_Face' ) ) {
@@ -160,18 +160,18 @@ function gutenberg_is_experiment_enabled( $name ) {
 
 // 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/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';
+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';