Font Library: filter fonts upload directory

lib/experimental/fonts/font-library/class-wp-font-family.php

@@ -599,9 +599,9 @@ private function create_or_update_font_post() {
 	 */
 	public function install( $files = null ) {
 		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-		add_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
+		add_filter( 'upload_dir', array( 'WP_Font_Library', 'fonts_dir' ) );
 		$were_assets_written = $this->download_or_move_font_faces( $files );
-		remove_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
+		remove_filter( 'upload_dir', array( 'WP_Font_Library', 'fonts_dir' ) );
 		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
 
 		if ( ! $were_assets_written ) {

lib/experimental/fonts/font-library/class-wp-font-library.php

@@ -141,40 +141,72 @@ public static function get_font_collection( $id ) {
 	}
 
 	/**
-	 * Gets the upload directory for fonts.
+	 * Returns an array containing the current fonts upload directory's path and URL.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return string Path of the upload directory for fonts.
+	 * @param array $defaults {
+	 *     Array of information about the upload directory.
+	 *
+	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
+	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
+	 *     @type string       $subdir  Subdirectory
+	 *     @type string       $basedir Path without subdir.
+	 *     @type string       $baseurl URL path without subdir.
+	 *     @type string|false $error   False or error message.
+	 * }
+	 *
+	 * @return array $defaults {
+	 *     Array of information about the upload directory.
+	 *
+	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
+	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
+	 *     @type string       $subdir  Subdirectory
+	 *     @type string       $basedir Path without subdir.
+	 *     @type string       $baseurl URL path without subdir.
+	 *     @type string|false $error   False or error message.
+	 * }
 	 */
-	public static function get_fonts_dir() {
-		return path_join( WP_CONTENT_DIR, 'fonts' );
+	public static function fonts_dir( $defaults = array() ) {
+		$site_path = self::get_multi_site_fonts_sub_dir();
+
+		// Sets the defaults.
+		$defaults['path']    = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$defaults['url']     = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$defaults['subdir']  = '';
+		$defaults['basedir'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$defaults['baseurl'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$defaults['error']   = false;
+
+		// Filters the fonts directory data.
+		return apply_filters( 'fonts_dir', $defaults );
 	}
 
 	/**
-	 * Sets the upload directory for fonts.
+	 * Gets sub-dir for fonts, using the blog ID if multi-site, empty otherwise.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array $defaults {
-	 *     Default upload directory.
+	 * @return string site sub-dir path.
+	 */
+	private static function get_multi_site_fonts_sub_dir() {
+		$font_sub_dir = '';
+		if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
+			$font_sub_dir = '/sites/' . get_current_blog_id();
+		}
+		return $font_sub_dir;
+	}
+
+	/**
+	 * Gets the upload directory for fonts.
 	 *
-	 *     @type string $path    Path to the directory.
-	 *     @type string $url     URL for the directory.
-	 *     @type string $subdir  Sub-directory of the directory.
-	 *     @type string $basedir Base directory.
-	 *     @type string $baseurl Base URL.
-	 * }
-	 * @return array Modified upload directory.
+	 * @since 6.5.0
+	 *
+	 * @return string Path of the upload directory for fonts.
 	 */
-	public static function set_upload_dir( $defaults ) {
-		$defaults['basedir'] = WP_CONTENT_DIR;
-		$defaults['baseurl'] = content_url();
-		$defaults['subdir']  = '/fonts';
-		$defaults['path']    = self::get_fonts_dir();
-		$defaults['url']     = $defaults['baseurl'] . '/fonts';
-
-		return $defaults;
+	public static function get_fonts_dir() {
+		$fonts_dir_settings = self::fonts_dir();
+		return $fonts_dir_settings['path'];
 	}
 
 	/**

phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Test WP_Font_Library::fonts_dir().
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ *
+ * @group fonts
+ * @group font-library
+ *
+ * @covers WP_Font_Library::fonts_dir
+ */
+class Tests_Fonts_WpFontLibrary_FontsDir extends WP_Font_Library_UnitTestCase {
+	private $dir_defaults;
+
+	public function __construct() {
+		parent::__construct();
+		$this->dir_defaults = array(
+			'path'    => path_join( WP_CONTENT_DIR, 'fonts' ),
+			'url'     => content_url( 'fonts' ),
+			'subdir'  => '',
+			'basedir' => path_join( WP_CONTENT_DIR, 'fonts' ),
+			'baseurl' => content_url( 'fonts' ),
+			'error'   => false,
+		);
+	}
+
+	public function test_fonts_dir() {
+		$fonts_dir = WP_Font_Library::fonts_dir();
+		$this->assertEquals( $fonts_dir, $this->dir_defaults );
+	}
+
+	public function test_fonts_dir_with_filter() {
+		// Define a callback function to pass to the filter.
+		function set_new_values( $defaults ) {
+			$defaults['path']    = '/custom-path/fonts/my-custom-subdir';
+			$defaults['url']     = 'http://example.com/custom-path/fonts/my-custom-subdir';
+			$defaults['subdir']  = 'my-custom-subdir';
+			$defaults['basedir'] = '/custom-path/fonts';
+			$defaults['baseurl'] = 'http://example.com/custom-path/fonts';
+			$defaults['error']   = false;
+			return $defaults;
+		}
+
+		// Add the filter.
+		add_filter( 'fonts_dir', 'set_new_values' );
+
+		// Gets the fonts dir.
+		$fonts_dir = WP_Font_Library::fonts_dir();
+
+		$expected = array(
+			'path'    => '/custom-path/fonts/my-custom-subdir',
+			'url'     => 'http://example.com/custom-path/fonts/my-custom-subdir',
+			'subdir'  => 'my-custom-subdir',
+			'basedir' => '/custom-path/fonts',
+			'baseurl' => 'http://example.com/custom-path/fonts',
+			'error'   => false,
+		);
+
+		$this->assertEquals( $fonts_dir, $expected, 'The fonts_dir() method should return the expected values.' );
+
+		// Remove the filter.
+		remove_filter( 'fonts_dir', 'set_new_values' );
+
+		// Gets the fonts dir.
+		$fonts_dir = WP_Font_Library::fonts_dir();
+
+		$this->assertEquals( $fonts_dir, $this->dir_defaults, 'The fonts_dir() method should return the default values.' );
+	}
+}