From b1e5f67a7e4b3493eaf9b4df8d4aee2abadbb4f3 Mon Sep 17 00:00:00 2001 From: hellofromtonya Date: Thu, 17 Aug 2023 13:22:07 -0500 Subject: [PATCH 1/4] Rename to singular --- .../class-wp-font-family-utils.php | 4 ++-- .../class-wp-font-family.php | 10 ++++----- .../class-wp-font-library.php} | 4 ++-- ...class-wp-rest-font-library-controller.php} | 22 +++++++++---------- .../font-library.php} | 14 ++++++------ lib/load.php | 19 +++++++++------- phpunit.xml.dist | 2 +- ...-wp-rest-font-library-controller-test.php} | 8 +++---- .../wpFontFamily/__construct-test.php | 2 +- .../wpFontFamily/base.php | 0 .../wpFontFamily/getData-test.php | 2 +- .../wpFontFamily/getDataAsJson-test.php | 2 +- .../wpFontFamily/getFontPost-test.php | 2 +- .../wpFontFamily/hasFontFaces-test.php | 2 +- .../wpFontFamily/install-test.php | 2 +- .../wpFontFamily/uninstall-test.php | 2 +- .../getFilenameFromFontFace-test.php | 2 +- .../hasFontMimeType-test.php | 2 +- .../wpFontFamilyUtils/mergeFontsData-test.php | 2 +- .../wpFontLibrary/getFontsDir-test.php | 18 +++++++++++++++ .../wpFontLibrary}/setUploadDir-test.php | 12 +++++----- .../wpFontsLibrary/getFontsDir-test.php | 18 --------------- 22 files changed, 77 insertions(+), 74 deletions(-) rename lib/experimental/fonts/{fonts-library => font-library}/class-wp-font-family-utils.php (93%) rename lib/experimental/fonts/{fonts-library => font-library}/class-wp-font-family.php (97%) rename lib/experimental/fonts/{fonts-library/class-wp-fonts-library.php => font-library/class-wp-font-library.php} (95%) rename lib/experimental/fonts/{fonts-library/class-wp-rest-fonts-library-controller.php => font-library/class-wp-rest-font-library-controller.php} (92%) rename lib/experimental/fonts/{fonts-library/fonts-library.php => font-library/font-library.php} (66%) rename phpunit/fonts/{fonts-library/class-wp-rest-fonts-library-controller-test.php => font-library/class-wp-rest-font-library-controller-test.php} (98%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/__construct-test.php (98%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/base.php (100%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/getData-test.php (99%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/getDataAsJson-test.php (98%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/getFontPost-test.php (97%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/hasFontFaces-test.php (98%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/install-test.php (99%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamily/uninstall-test.php (99%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamilyUtils/getFilenameFromFontFace-test.php (98%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamilyUtils/hasFontMimeType-test.php (98%) rename phpunit/fonts/{fonts-library => font-library}/wpFontFamilyUtils/mergeFontsData-test.php (99%) create mode 100644 phpunit/fonts/font-library/wpFontLibrary/getFontsDir-test.php rename phpunit/fonts/{fonts-library/wpFontsLibrary => font-library/wpFontLibrary}/setUploadDir-test.php (65%) delete mode 100644 phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php diff --git a/lib/experimental/fonts/fonts-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php similarity index 93% rename from lib/experimental/fonts/fonts-library/class-wp-font-family-utils.php rename to lib/experimental/fonts/font-library/class-wp-font-family-utils.php index ef239936b8e5a3..bf5fc36306a175 100644 --- a/lib/experimental/fonts/fonts-library/class-wp-font-family-utils.php +++ b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php @@ -85,8 +85,8 @@ public static function merge_fonts_data( $font1, $font2 ) { * @return bool True if the file has a font MIME type, false otherwise. */ public static function has_font_mime_type( $filepath ) { - $filetype = wp_check_filetype( $filepath, WP_Fonts_Library::ALLOWED_FONT_MIME_TYPES ); + $filetype = wp_check_filetype( $filepath, WP_Font_Library::ALLOWED_FONT_MIME_TYPES ); - return in_array( $filetype['type'], WP_Fonts_Library::ALLOWED_FONT_MIME_TYPES, true ); + return in_array( $filetype['type'], WP_Font_Library::ALLOWED_FONT_MIME_TYPES, true ); } } diff --git a/lib/experimental/fonts/fonts-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php similarity index 97% rename from lib/experimental/fonts/fonts-library/class-wp-font-family.php rename to lib/experimental/fonts/font-library/class-wp-font-family.php index 363bbe9b479284..449b13583be27d 100644 --- a/lib/experimental/fonts/fonts-library/class-wp-font-family.php +++ b/lib/experimental/fonts/font-library/class-wp-font-family.php @@ -5,7 +5,7 @@ * This file contains the Font Family class definition. * * @package WordPress - * @subpackage Fonts Library + * @subpackage Font Library * @since 6.4.0 */ @@ -135,7 +135,7 @@ public function uninstall() { */ private static function delete_asset( $src ) { $filename = basename( $src ); - $file_path = path_join( WP_Fonts_Library::get_fonts_dir(), $filename ); + $file_path = path_join( WP_Font_Library::get_fonts_dir(), $filename ); wp_delete_file( $file_path ); @@ -513,7 +513,7 @@ private function update_font_post( $post ) { } /** - * Creates a post for a font in the fonts library if it doesn't exist, + * Creates a post for a font in the Font Library if it doesn't exist, * or updates it if it does. * * @since 6.4.0 @@ -541,9 +541,9 @@ private function create_or_update_font_post() { * @return array|WP_Error An array of font family data on success, WP_Error otherwise. */ public function install( $files = null ) { - add_filter( 'upload_dir', array( 'WP_Fonts_Library', 'set_upload_dir' ) ); + add_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) ); $were_assets_written = $this->download_or_move_font_faces( $files ); - remove_filter( 'upload_dir', array( 'WP_Fonts_Library', 'set_upload_dir' ) ); + remove_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) ); if ( ! $were_assets_written ) { return new WP_Error( diff --git a/lib/experimental/fonts/fonts-library/class-wp-fonts-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php similarity index 95% rename from lib/experimental/fonts/fonts-library/class-wp-fonts-library.php rename to lib/experimental/fonts/font-library/class-wp-font-library.php index f0482ae9a864af..7a765fd00d34a2 100644 --- a/lib/experimental/fonts/fonts-library/class-wp-fonts-library.php +++ b/lib/experimental/fonts/font-library/class-wp-font-library.php @@ -9,7 +9,7 @@ * @since 6.4.0 */ -if ( class_exists( 'WP_Fonts_Library' ) ) { +if ( class_exists( 'WP_Font_Library' ) ) { return; } @@ -18,7 +18,7 @@ * * @since 6.4.0 */ -class WP_Fonts_Library { +class WP_Font_Library { const ALLOWED_FONT_MIME_TYPES = array( 'otf' => 'font/otf', diff --git a/lib/experimental/fonts/fonts-library/class-wp-rest-fonts-library-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-library-controller.php similarity index 92% rename from lib/experimental/fonts/fonts-library/class-wp-rest-fonts-library-controller.php rename to lib/experimental/fonts/font-library/class-wp-rest-font-library-controller.php index d4abfec476b663..027c5ba694e31c 100644 --- a/lib/experimental/fonts/fonts-library/class-wp-rest-fonts-library-controller.php +++ b/lib/experimental/fonts/font-library/class-wp-rest-font-library-controller.php @@ -9,7 +9,7 @@ * @since 6.4.0 */ -if ( class_exists( 'WP_REST_Fonts_Library_Controller' ) ) { +if ( class_exists( 'WP_REST_Font_Library_Controller' ) ) { return; } @@ -18,7 +18,7 @@ * * @since 6.4.0 */ -class WP_REST_Fonts_Library_Controller extends WP_REST_Controller { +class WP_REST_Font_Library_Controller extends WP_REST_Controller { /** * Constructor. @@ -43,7 +43,7 @@ public function register_routes() { array( 'methods' => WP_REST_Server::EDITABLE, 'callback' => array( $this, 'install_fonts' ), - 'permission_callback' => array( $this, 'update_fonts_library_permissions_check' ), + 'permission_callback' => array( $this, 'update_font_library_permissions_check' ), 'args' => array( 'fontFamilies' => array( 'required' => true, @@ -62,7 +62,7 @@ public function register_routes() { array( 'methods' => WP_REST_Server::DELETABLE, 'callback' => array( $this, 'uninstall_fonts' ), - 'permission_callback' => array( $this, 'update_fonts_library_permissions_check' ), + 'permission_callback' => array( $this, 'update_font_library_permissions_check' ), 'args' => $this->uninstall_schema(), ), ) @@ -216,7 +216,7 @@ public function uninstall_schema() { } /** - * Removes font families from the fonts library and all their assets. + * Removes font families from the Font Library and all their assets. * * @since 6.4.0 * @@ -240,17 +240,17 @@ public function uninstall_fonts( $request ) { } /** - * Checks whether the user has permissions to update the fonts library. + * Checks whether the user has permissions to update the Font Library. * * @since 6.4.0 * * @return true|WP_Error True if the request has write access for the item, WP_Error object otherwise. */ - public function update_fonts_library_permissions_check() { + public function update_font_library_permissions_check() { if ( ! current_user_can( 'edit_theme_options' ) ) { return new WP_Error( - 'rest_cannot_update_fonts_library', - __( 'Sorry, you are not allowed to update the fonts library on this site.', 'gutenberg' ), + 'rest_cannot_update_font_library', + __( 'Sorry, you are not allowed to update the Font Library on this site.', 'gutenberg' ), array( 'status' => rest_authorization_required_code(), ) @@ -277,13 +277,13 @@ public function update_fonts_library_permissions_check() { * Installs new fonts. * * Takes a request containing new fonts to install, downloads their assets, and adds them - * to the fonts library. + * to the Font Library. * * @since 6.4.0 * * @param WP_REST_Request $request The request object containing the new fonts to install * in the request parameters. - * @return WP_REST_Response|WP_Error The updated fonts library post content. + * @return WP_REST_Response|WP_Error The updated Font Library post content. */ public function install_fonts( $request ) { // Get new fonts to install. diff --git a/lib/experimental/fonts/fonts-library/fonts-library.php b/lib/experimental/fonts/font-library/font-library.php similarity index 66% rename from lib/experimental/fonts/fonts-library/fonts-library.php rename to lib/experimental/fonts/font-library/font-library.php index 359442f231fc70..96a33923917ec8 100644 --- a/lib/experimental/fonts/fonts-library/fonts-library.php +++ b/lib/experimental/fonts/font-library/font-library.php @@ -1,11 +1,11 @@ true, @@ -29,9 +29,9 @@ function gutenberg_init_fonts_library() { register_post_type( 'wp_font_family', $args ); // @core-merge: This code will go into Core's `create_initial_rest_routes()`. - $fonts_library_controller = new WP_REST_Fonts_Library_Controller(); - $fonts_library_controller->register_routes(); + $font_library_controller = new WP_REST_Font_Library_Controller(); + $font_library_controller->register_routes(); } -add_action( 'rest_api_init', 'gutenberg_init_fonts_library' ); +add_action( 'rest_api_init', 'gutenberg_init_font_library' ); diff --git a/lib/load.php b/lib/load.php index 03416c87887694..e9bd73d0514608 100644 --- a/lib/load.php +++ b/lib/load.php @@ -154,18 +154,21 @@ function gutenberg_is_experiment_enabled( $name ) { remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler. /* - * If the Fonts Library is available, load the Font Face files, else load the Fonts API. + * If the Font Library is available, load the Font Face files, else load the Fonts API. * This strategy is temporary until the Fonts Library is merged. It's used here to allow * the Font Face (redesigned Fonts API) to be merged before the Fonts Library while * keeping Fonts API available for sites that are using it. */ -if ( defined( 'FONTS_LIBRARY_ENABLE' ) && FONTS_LIBRARY_ENABLE ) { - // Loads the Fonts Library. - 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 ( + ( defined( 'FONT_LIBRARY_ENABLE' ) && FONT_LIBRARY_ENABLE ) || + ( defined( 'FONTS_LIBRARY_ENABLE' ) && FONTS_LIBRARY_ENABLE ) +) { + // Loads the Font Library. + require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php'; + require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php'; + require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php'; + require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-library-controller.php'; + require __DIR__ . '/experimental/fonts/font-library/font-library.php'; if ( ! class_exists( 'WP_Font_Face' ) ) { require __DIR__ . '/experimental/fonts/font-face/class-wp-font-face.php'; diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5cf01a02fef695..8e8a0fb2f09215 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,7 +9,7 @@ > - + diff --git a/phpunit/fonts/fonts-library/class-wp-rest-fonts-library-controller-test.php b/phpunit/fonts/font-library/class-wp-rest-font-library-controller-test.php similarity index 98% rename from phpunit/fonts/fonts-library/class-wp-rest-fonts-library-controller-test.php rename to phpunit/fonts/font-library/class-wp-rest-font-library-controller-test.php index 1bbce5f7cb9202..f55d221acba965 100644 --- a/phpunit/fonts/fonts-library/class-wp-rest-fonts-library-controller-test.php +++ b/phpunit/fonts/font-library/class-wp-rest-font-library-controller-test.php @@ -1,15 +1,15 @@ assertStringEndsWith( '/wp-content/uploads/fonts', WP_Font_Library::get_fonts_dir() ); + } +} diff --git a/phpunit/fonts/fonts-library/wpFontsLibrary/setUploadDir-test.php b/phpunit/fonts/font-library/wpFontLibrary/setUploadDir-test.php similarity index 65% rename from phpunit/fonts/fonts-library/wpFontsLibrary/setUploadDir-test.php rename to phpunit/fonts/font-library/wpFontLibrary/setUploadDir-test.php index ad038260caa42f..6d159d261f2f42 100644 --- a/phpunit/fonts/fonts-library/wpFontsLibrary/setUploadDir-test.php +++ b/phpunit/fonts/font-library/wpFontLibrary/setUploadDir-test.php @@ -1,16 +1,16 @@ '/var/www/html/wp-content/uploads/fonts', 'url' => 'http://example.com/wp-content/uploads/fonts', ); - $this->assertSame( $expected, WP_Fonts_Library::set_upload_dir( $defaults ) ); + $this->assertSame( $expected, WP_Font_Library::set_upload_dir( $defaults ) ); } } diff --git a/phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php b/phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php deleted file mode 100644 index 4ed6616c813d04..00000000000000 --- a/phpunit/fonts/fonts-library/wpFontsLibrary/getFontsDir-test.php +++ /dev/null @@ -1,18 +0,0 @@ -assertStringEndsWith( '/wp-content/uploads/fonts', WP_Fonts_Library::get_fonts_dir() ); - } -} From c5085a534a294be9b0a9648b7d5e97c95520729f Mon Sep 17 00:00:00 2001 From: hellofromtonya Date: Thu, 17 Aug 2023 14:03:08 -0500 Subject: [PATCH 2/4] More renameing in docblocks --- .../fonts/font-face/bc-layer/webfonts-deprecations.php | 4 ++-- .../fonts/font-library/class-wp-font-family-utils.php | 4 ++-- .../fonts/font-library/class-wp-font-family.php | 2 +- .../fonts/font-library/class-wp-font-library.php | 8 ++++---- .../class-wp-rest-font-library-controller.php | 8 ++++---- lib/load.php | 4 ++-- .../fonts/font-library/wpFontFamily/__construct-test.php | 2 +- phpunit/fonts/font-library/wpFontFamily/base.php | 2 +- phpunit/fonts/font-library/wpFontFamily/getData-test.php | 2 +- .../font-library/wpFontFamily/getDataAsJson-test.php | 2 +- .../fonts/font-library/wpFontFamily/getFontPost-test.php | 2 +- .../fonts/font-library/wpFontFamily/hasFontFaces-test.php | 2 +- phpunit/fonts/font-library/wpFontFamily/install-test.php | 2 +- .../fonts/font-library/wpFontFamily/uninstall-test.php | 2 +- .../wpFontFamilyUtils/getFilenameFromFontFace-test.php | 2 +- .../wpFontFamilyUtils/hasFontMimeType-test.php | 2 +- .../wpFontFamilyUtils/mergeFontsData-test.php | 2 +- .../fonts/font-library/wpFontLibrary/getFontsDir-test.php | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php b/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php index 4de2e6221d50bf..2534d8db165273 100644 --- a/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php +++ b/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php @@ -176,7 +176,7 @@ function wp_print_webfonts() { * Initialize $wp_fonts if it has not been set. * * @since X.X.X - * @deprecated 16.3.0 Use Fonts Library and Font Face. Fonts API is not supported. + * @deprecated 16.3.0 Use Font Library and Font Face. Fonts API is not supported. * * @global WP_Fonts $wp_fonts * @@ -280,7 +280,7 @@ function wp_register_font_provider() { * @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 Fonts Library. + * including in theme and user activated fonts from the Font Library. * * @return array Empty array. */ diff --git a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php index bf5fc36306a175..607360d0c7e66b 100644 --- a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php +++ b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php @@ -5,7 +5,7 @@ * This file contains utils fot Font Family class. * * @package WordPress - * @subpackage Fonts Library + * @subpackage Font Library * @since 6.4.0 */ @@ -14,7 +14,7 @@ } /** - * A class of utilities for working with the Fonts Library. + * A class of utilities for working with the Font Library. * * @since 6.4.0 */ diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php index 449b13583be27d..76ffcd402ac9d3 100644 --- a/lib/experimental/fonts/font-library/class-wp-font-family.php +++ b/lib/experimental/fonts/font-library/class-wp-font-family.php @@ -14,7 +14,7 @@ } /** - * Fonts Library class. + * Font Library class. * * @since 6.4.0 */ diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php index 7a765fd00d34a2..6459a91873feaf 100644 --- a/lib/experimental/fonts/font-library/class-wp-font-library.php +++ b/lib/experimental/fonts/font-library/class-wp-font-library.php @@ -1,11 +1,11 @@ Date: Thu, 17 Aug 2023 16:05:27 -0300 Subject: [PATCH 3/4] missing names in singular --- changelog.txt | 2 +- .../fonts/font-face/bc-layer/webfonts-deprecations.php | 4 ++-- .../fonts/font-library/class-wp-font-family-utils.php | 4 ++-- .../fonts/font-library/class-wp-font-family.php | 2 +- .../fonts/font-library/class-wp-font-library.php | 8 ++++---- .../class-wp-rest-font-library-controller.php | 8 ++++---- lib/load.php | 4 ++-- .../fonts/font-library/wpFontFamily/__construct-test.php | 2 +- phpunit/fonts/font-library/wpFontFamily/base.php | 2 +- phpunit/fonts/font-library/wpFontFamily/getData-test.php | 4 ++-- .../font-library/wpFontFamily/getDataAsJson-test.php | 2 +- .../fonts/font-library/wpFontFamily/getFontPost-test.php | 2 +- .../fonts/font-library/wpFontFamily/hasFontFaces-test.php | 2 +- phpunit/fonts/font-library/wpFontFamily/install-test.php | 2 +- .../fonts/font-library/wpFontFamily/uninstall-test.php | 2 +- .../wpFontFamilyUtils/getFilenameFromFontFace-test.php | 2 +- .../wpFontFamilyUtils/hasFontMimeType-test.php | 2 +- .../wpFontFamilyUtils/mergeFontsData-test.php | 2 +- .../fonts/font-library/wpFontLibrary/getFontsDir-test.php | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/changelog.txt b/changelog.txt index fdf70081364e9e..0149b4c2b7bf5b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -229,7 +229,7 @@ ### Experiments -- Fonts Library: Backend. ([52704](https://github.com/WordPress/gutenberg/pull/52704)) +- Font Library: Backend. ([52704](https://github.com/WordPress/gutenberg/pull/52704)) #### Block API - /add custom connections inspector control. ([53241](https://github.com/WordPress/gutenberg/pull/53241)) diff --git a/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php b/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php index 4de2e6221d50bf..2534d8db165273 100644 --- a/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php +++ b/lib/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php @@ -176,7 +176,7 @@ function wp_print_webfonts() { * Initialize $wp_fonts if it has not been set. * * @since X.X.X - * @deprecated 16.3.0 Use Fonts Library and Font Face. Fonts API is not supported. + * @deprecated 16.3.0 Use Font Library and Font Face. Fonts API is not supported. * * @global WP_Fonts $wp_fonts * @@ -280,7 +280,7 @@ function wp_register_font_provider() { * @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 Fonts Library. + * including in theme and user activated fonts from the Font Library. * * @return array Empty array. */ diff --git a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php index bf5fc36306a175..607360d0c7e66b 100644 --- a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php +++ b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php @@ -5,7 +5,7 @@ * This file contains utils fot Font Family class. * * @package WordPress - * @subpackage Fonts Library + * @subpackage Font Library * @since 6.4.0 */ @@ -14,7 +14,7 @@ } /** - * A class of utilities for working with the Fonts Library. + * A class of utilities for working with the Font Library. * * @since 6.4.0 */ diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php index 449b13583be27d..76ffcd402ac9d3 100644 --- a/lib/experimental/fonts/font-library/class-wp-font-family.php +++ b/lib/experimental/fonts/font-library/class-wp-font-family.php @@ -14,7 +14,7 @@ } /** - * Fonts Library class. + * Font Library class. * * @since 6.4.0 */ diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php index 7a765fd00d34a2..6459a91873feaf 100644 --- a/lib/experimental/fonts/font-library/class-wp-font-library.php +++ b/lib/experimental/fonts/font-library/class-wp-font-library.php @@ -1,11 +1,11 @@ Date: Thu, 17 Aug 2023 14:12:35 -0500 Subject: [PATCH 4/4] Rename constant in multisite.xml --- phpunit/multisite.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpunit/multisite.xml b/phpunit/multisite.xml index 23de57aa1d9bd8..03b0b5314bc507 100644 --- a/phpunit/multisite.xml +++ b/phpunit/multisite.xml @@ -10,7 +10,7 @@ - +