reduce the scope of the function

WordPress · Nov 24, 2023 · a414e3f · a414e3f
1 parent 1e69e75
commit a414e3f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
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
@@ -92,24 +92,19 @@ public static function has_font_mime_type( $filepath ) {
 	}
 
 	/**
-	 * Format font slug and family.
+	 * Format font family to make it CSS ready.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array $font The font to format.
-	 * @return array The formatted font.
+	 * @param string $font_family Font family attribute.
+	 * @return string The formatted font family attribute.
 	 */
-	public static function format_slug_and_family( $font ) {
-		// Ensure slugs are kebab-cased and font families are wrapped in quotes.
-		if ( isset( $font['slug'] ) ) {
-			$font['slug'] = _wp_to_kebab_case( $font['slug'] );
-		}
-
-		if ( isset( $font['fontFamily'] ) ) {
-			$font_families         = explode( ',', $font['fontFamily'] );
+	public static function format_font_family( $font_family ) {
+		if ( $font_family ) {
+			$font_families         = explode( ',', $font_family );
 			$wrapped_font_families = array_map(
-				function ( $font_family ) {
-					$trimmed = trim( $font_family );
+				function ( $family ) {
+					$trimmed = trim( $family );
 					if ( ! empty( $trimmed ) && strpos( $trimmed, ' ' ) !== false && strpos( $trimmed, "'" ) === false && strpos( $trimmed, '"' ) === false ) {
 							return "'" . $trimmed . "'";
 					}
@@ -119,12 +114,12 @@ function ( $font_family ) {
 			);
 
 			if ( count( $wrapped_font_families ) === 1 ) {
-				$font['fontFamily'] = $wrapped_font_families[0];
+				$font_family = $wrapped_font_families[0];
 			} else {
-				$font['fontFamily'] = implode( ', ', $wrapped_font_families );
+				$font_family = implode( ', ', $wrapped_font_families );
 			}
 		}
 
-		return $font;
+		return $font_family;
 	}
 }
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
@@ -318,7 +318,8 @@ private function sanitize() {
 			? $theme_data['settings']['typography']['fontFamilies'][0]
 			: array();
 
-		$sanitized_font = WP_Font_Family_Utils::format_slug_and_family( $sanitized_font );
+		$sanitized_font['slug'] = _wp_to_kebab_case( $sanitized_font['slug'] );
+		$sanitized_font['fontFamily'] = WP_Font_Family_Utils::format_font_family( $sanitized_font['fontFamily'] );
 		$this->data     = $sanitized_font;
 		return $this->data;
 	}