Font Library: Add REST API Controllers.

.github/workflows/test-coverage.yml

@@ -152,8 +152,9 @@ jobs:
 
       - name: Upload single site report to Codecov
         if: ${{ ! matrix.multisite && github.event_name != 'pull_request' }}
-        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: wp-code-coverage-single-clover-${{ github.sha }}.xml
           flags: single,php
           fail_ci_if_error: true
@@ -167,8 +168,9 @@ jobs:
 
       - name: Upload multisite report to Codecov
         if: ${{ matrix.multisite && github.event_name != 'pull_request' }}
-        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: wp-code-coverage-multisite-clover-${{ github.sha }}.xml
           flags: multisite,php
           fail_ci_if_error: true

src/wp-admin/includes/class-file-upload-upgrader.php

@@ -70,24 +70,7 @@ public function __construct( $form, $urlholder ) {
 			}
 
 			if ( 'pluginzip' === $form || 'themezip' === $form ) {
-				$archive_is_valid = false;
-
-				/** This filter is documented in wp-admin/includes/file.php */
-				if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
-					$archive          = new ZipArchive();
-					$archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
-
-					if ( true === $archive_is_valid ) {
-						$archive->close();
-					}
-				} else {
-					require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
-
-					$archive          = new PclZip( $file['file'] );
-					$archive_is_valid = is_array( $archive->properties() );
-				}
-
-				if ( true !== $archive_is_valid ) {
+				if ( ! wp_zip_file_is_valid( $file['file'] ) ) {
 					wp_delete_file( $file['file'] );
 					wp_die( __( 'Incompatible Archive.' ) );
 				}

src/wp-admin/includes/file.php

@@ -1563,6 +1563,37 @@ function wp_trusted_keys() {
 	return apply_filters( 'wp_trusted_keys', $trusted_keys );
 }
 
+/**
+ * Determines whether the given file is a valid ZIP file.
+ *
+ * This function does not test to ensure that a file exists. Non-existent files
+ * are not valid ZIPs, so those will also return false.
+ *
+ * @since 6.4.4
+ *
+ * @param string $file Full path to the ZIP file.
+ * @return bool Whether the file is a valid ZIP file.
+ */
+function wp_zip_file_is_valid( $file ) {
+	/** This filter is documented in wp-admin/includes/file.php */
+	if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+		$archive          = new ZipArchive();
+		$archive_is_valid = $archive->open( $file, ZipArchive::CHECKCONS );
+		if ( true === $archive_is_valid ) {
+			$archive->close();
+			return true;
+		}
+	}
+
+	// Fall through to PclZip if ZipArchive is not available, or encountered an error opening the file.
+	require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
+
+	$archive          = new PclZip( $file );
+	$archive_is_valid = is_array( $archive->properties() );
+
+	return $archive_is_valid;
+}
+
 /**
  * Unzips a specified ZIP file to a location on the filesystem via the WordPress
  * Filesystem Abstraction.

src/wp-includes/class-wp-matchesmapregex.php

@@ -63,8 +63,8 @@ public function __construct( $subject, $matches ) {
 	 * @return string
 	 */
 	public static function apply( $subject, $matches ) {
-		$oSelf = new WP_MatchesMapRegex( $subject, $matches );
-		return $oSelf->output;
+		$result = new WP_MatchesMapRegex( $subject, $matches );
+		return $result->output;
 	}
 
 	/**

src/wp-includes/class-wp-scripts.php

@@ -524,33 +524,6 @@ public function get_inline_script_data( $handle, $position = 'after' ) {
 		return trim( implode( "\n", $data ), "\n" );
 	}
 
-	/**
-	 * Gets unaliased dependencies.
-	 *
-	 * An alias is a dependency whose src is false. It is used as a way to bundle multiple dependencies in a single
-	 * handle. This in effect flattens an alias dependency tree.
-	 *
-	 * @since 6.3.0
-	 *
-	 * @param string[] $deps Dependency handles.
-	 * @return string[] Unaliased handles.
-	 */
-	private function get_unaliased_deps( array $deps ) {
-		$flattened = array();
-		foreach ( $deps as $dep ) {
-			if ( ! isset( $this->registered[ $dep ] ) ) {
-				continue;
-			}
-
-			if ( $this->registered[ $dep ]->src ) {
-				$flattened[] = $dep;
-			} elseif ( $this->registered[ $dep ]->deps ) {
-				array_push( $flattened, ...$this->get_unaliased_deps( $this->registered[ $dep ]->deps ) );
-			}
-		}
-		return $flattened;
-	}
-
 	/**
 	 * Gets tags for inline scripts registered for a specific handle.
 	 *

src/wp-includes/default-filters.php

@@ -748,5 +748,7 @@
 
 // Font management.
 add_action( 'wp_head', 'wp_print_font_faces', 50 );
+add_action( 'deleted_post', '_wp_after_delete_font_family', 10, 2 );
+add_action( 'before_delete_post', '_wp_before_delete_font_face', 10, 2 );
 
 unset( $filter, $action );

src/wp-includes/fonts.php

@@ -51,3 +51,140 @@ function wp_print_font_faces( $fonts = array() ) {
 	$wp_font_face = new WP_Font_Face();
 	$wp_font_face->generate_and_print( $fonts );
 }
+
+/**
+ * Registers a new Font Collection in the Font Library.
+ *
+ * @since 6.5.0
+ *
+ * @param string       $slug Font collection slug. May only contain alphanumeric characters, dashes,
+ *                     and underscores. See sanitize_title().
+ * @param array|string $data_or_file {
+ *     Font collection data array or a path/URL to a JSON file containing the font collection.
+ *
+ *     @link https://schemas.wp.org/trunk/font-collection.json
+ *
+ *     @type string $name           Required. Name of the font collection shown in the Font Library.
+ *     @type string $description    Optional. A short descriptive summary of the font collection. Default empty.
+ *     @type array  $font_families  Required. Array of font family definitions that are in the collection.
+ *     @type array  $categories     Optional. Array of categories, each with a name and slug, that are used by the
+ *                                  fonts in the collection. Default empty.
+ * }
+ * @return WP_Font_Collection|WP_Error A font collection if it was registered
+ *                                     successfully, or WP_Error object on failure.
+ */
+function wp_register_font_collection( $slug, $data_or_file ) {
+	return WP_Font_Library::get_instance()->register_font_collection( $slug, $data_or_file );
+}
+
+/**
+ * Unregisters a font collection from the Font Library.
+ *
+ * @since 6.5.0
+ *
+ * @param string $slug Font collection slug.
+ * @return bool True if the font collection was unregistered successfully, else false.
+ */
+function wp_unregister_font_collection( $slug ) {
+	return WP_Font_Library::get_instance()->unregister_font_collection( $slug );
+}
+
+/**
+ * Returns an array containing the current fonts upload directory's path and URL.
+ *
+ * @since 6.5.0
+ *
+ * @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.
+ * }
+ */
+function wp_get_font_dir( $defaults = array() ) {
+	$site_path = '';
+	if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
+		$site_path = '/sites/' . get_current_blog_id();
+	}
+
+	// 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.
+	 *
+	 * This filter allows developers to modify the fonts directory data.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $defaults The original fonts directory data.
+	 */
+	return apply_filters( 'font_dir', $defaults );
+}
+
+/**
+ * Deletes child font faces when a font family is deleted.
+ *
+ * @access private
+ * @since 6.5.0
+ *
+ * @param int     $post_id Post ID.
+ * @param WP_Post $post    Post object.
+ */
+function _wp_after_delete_font_family( $post_id, $post ) {
+	if ( 'wp_font_family' !== $post->post_type ) {
+		return;
+	}
+
+	$font_faces = get_children(
+		array(
+			'post_parent' => $post_id,
+			'post_type'   => 'wp_font_face',
+		)
+	);
+
+	foreach ( $font_faces as $font_face ) {
+		wp_delete_post( $font_face->ID, true );
+	}
+}
+
+/**
+ * Deletes associated font files when a font face is deleted.
+ *
+ * @access private
+ * @since 6.5.0
+ *
+ * @param int     $post_id Post ID.
+ * @param WP_Post $post    Post object.
+ */
+function _wp_before_delete_font_face( $post_id, $post ) {
+	if ( 'wp_font_face' !== $post->post_type ) {
+		return;
+	}
+
+	$font_files = get_post_meta( $post_id, '_wp_font_face_file', false );
+	$font_dir   = wp_get_font_dir()['path'];
+
+	foreach ( $font_files as $font_file ) {
+		wp_delete_file( $font_dir . '/' . $font_file );
+	}
+}