Apply fixes from WordPress/gutenberg#58675

WordPress · Feb 5, 2024 · 507f1d9 · 507f1d9
1 parent 3f6dce8
commit 507f1d9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 25 deletions.
diff --git a/src/wp-includes/fonts/class-wp-font-collection.php b/src/wp-includes/fonts/class-wp-font-collection.php
@@ -46,10 +46,10 @@ final class WP_Font_Collection {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param string        $slug         Font collection slug.
-	 * @param array|string  $data_or_file Font collection data array or a path/URL to a JSON file
-	 *                                    containing the font collection.
-	 *                                    See {@see wp_register_font_collection()} for the supported fields.
+	 * @param string       $slug         Font collection slug.
+	 * @param array|string $data_or_file Font collection data array or a path/URL to a JSON file
+	 *                                   containing the font collection.
+	 *                                   See {@see wp_register_font_collection()} for the supported fields.
 	 */
 	public function __construct( $slug, $data_or_file ) {
 		$this->slug = sanitize_title( $slug );
@@ -160,7 +160,7 @@ private function load_from_url( $url ) {
 
 			$data = json_decode( wp_remote_retrieve_body( $response ), true );
 			if ( empty( $data ) ) {
-				return new WP_Error( 'font_collection_decode_error', __( 'Error decoding the font collection data from the REST response JSON.' ) );
+				return new WP_Error( 'font_collection_decode_error', __( 'Error decoding the font collection data from the HTTP response JSON.' ) );
 			}
 
 			// Make sure the data is valid before storing it in a transient.
@@ -191,8 +191,8 @@ private function sanitize_and_validate_data( $data ) {
 		foreach ( $required_properties as $property ) {
 			if ( empty( $data[ $property ] ) ) {
 				$message = sprintf(
-				// translators: 1: Font collection slug, 2: Missing property name.
-					__( 'Font collection "%1$s" has missing or empty property: "%2$s."' ),
+					// translators: 1: Font collection slug, 2: Missing property name, e.g. "font_families".
+					__( 'Font collection "%1$s" has missing or empty property: "%2$s".' ),
 					$this->slug,
 					$property
 				);
@@ -224,25 +224,25 @@ private static function get_sanitization_schema() {
 						'preview'    => 'sanitize_url',
 						'fontFace'   => array(
 							array(
-								'fontFamily'          => 'sanitize_text_field',
-								'fontStyle'           => 'sanitize_text_field',
-								'fontWeight'          => 'sanitize_text_field',
-								'src'                 => function ( $value ) {
+								'fontFamily'            => 'sanitize_text_field',
+								'fontStyle'             => 'sanitize_text_field',
+								'fontWeight'            => 'sanitize_text_field',
+								'src'                   => function ( $value ) {
 									return is_array( $value )
 										? array_map( 'sanitize_text_field', $value )
 										: sanitize_text_field( $value );
 								},
-								'preview'             => 'sanitize_url',
-								'fontDisplay'         => 'sanitize_text_field',
-								'fontStretch'         => 'sanitize_text_field',
-								'ascentOverride'      => 'sanitize_text_field',
-								'descentOverride'     => 'sanitize_text_field',
-								'fontVariant'         => 'sanitize_text_field',
-								'fontFeatureSettings' => 'sanitize_text_field',
+								'preview'               => 'sanitize_url',
+								'fontDisplay'           => 'sanitize_text_field',
+								'fontStretch'           => 'sanitize_text_field',
+								'ascentOverride'        => 'sanitize_text_field',
+								'descentOverride'       => 'sanitize_text_field',
+								'fontVariant'           => 'sanitize_text_field',
+								'fontFeatureSettings'   => 'sanitize_text_field',
 								'fontVariationSettings' => 'sanitize_text_field',
-								'lineGapOverride'     => 'sanitize_text_field',
-								'sizeAdjust'          => 'sanitize_text_field',
-								'unicodeRange'        => 'sanitize_text_field',
+								'lineGapOverride'       => 'sanitize_text_field',
+								'sizeAdjust'            => 'sanitize_text_field',
+								'unicodeRange'          => 'sanitize_text_field',
 							),
 						),
 					),

diff --git a/src/wp-includes/fonts/class-wp-font-utils.php b/src/wp-includes/fonts/class-wp-font-utils.php
@@ -42,7 +42,7 @@ public static function sanitize_font_family( $font_family ) {
 		$wrapped_font_families = array_map(
 			function ( $family ) {
 				$trimmed = trim( $family );
-				if ( ! empty( $trimmed ) && false !== strpos( $trimmed, ' ' ) && false === strpos( $trimmed, "'" ) && false === strpos( $trimmed, '"' ) ) {
+				if ( ! empty( $trimmed ) && str_contains( $trimmed, ' ' ) && ! str_contains( $trimmed, "'" ) && ! str_contains( $trimmed, '"' ) ) {
 						return '"' . $trimmed . '"';
 				}
 				return $trimmed;
@@ -213,13 +213,17 @@ private static function apply_sanitizer( $value, $sanitizer ) {
 	}
 
 	/**
-	 * Provide the expected mime-type value for font files per-PHP release. Due to differences in the values returned these values differ between PHP versions.
+	 * Returns the expected mime-type values for font files, depending on PHP version.
 	 *
-	 * This is necessary until a collection of valid mime-types per-file extension can be provided to 'upload_mimes' filter.
+	 * This is needed because font mime types vary by PHP version, so checking the PHP version
+	 * is necessary until a list of valid mime-types for each file extension can be provided to
+	 * the 'upload_mimes' filter.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return Array A collection of mime types keyed by file extension.
+	 * @access private
+	 *
+	 * @return array A collection of mime types keyed by file extension.
 	 */
 	public static function get_allowed_font_mime_types() {
 		$php_7_ttf_mime_type = PHP_VERSION_ID >= 70300 ? 'application/font-sfnt' : 'application/x-font-ttf';