Move formatting functions to utils.

WordPress · Nov 20, 2023 · efa7602 · efa7602
1 parent 52d3e7f
commit efa7602
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 25 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
@@ -90,4 +90,41 @@ public static function has_font_mime_type( $filepath ) {
 
 		return in_array( $filetype['type'], $allowed_mime_types, true );
 	}
+
+	/**
+	 * Format font slug and family.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $font The font to format.
+	 * @return array The formatted font.
+	 */
+	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'] );
+			$wrapped_font_families = array_map(
+				function ( $font_family ) {
+					$trimmed = trim( $font_family );
+					if ( ! empty( $trimmed ) && strpos( $trimmed, ' ' ) !== false && strpos( $trimmed, "'" ) === false && strpos( $trimmed, '"' ) === false ) {
+							return "'" . $trimmed . "'";
+					}
+					return $trimmed;
+				},
+				$font_families
+			);
+
+			if ( count( $wrapped_font_families ) === 1 ) {
+				$font['fontFamily'] = $wrapped_font_families[0];
+			} else {
+				$font['fontFamily'] = implode( ', ', $wrapped_font_families );
+			}
+		}
+
+		return $font;
+	}
 }
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
@@ -314,31 +314,8 @@ private function sanitize() {
 			? $theme_data['settings']['typography']['fontFamilies'][0]
 			: array();
 
-		// Ensure slugs are kebab-cased and font families are wrapped in quotes.
-		if ( isset( $sanitized_font['slug'] ) ) {
-			$sanitized_font['slug'] = _wp_to_kebab_case( $sanitized_font['slug'] );
-		}
-
-		if ( isset( $sanitized_font['fontFamily'] ) ) {
-			$font_families         = explode( ',', $sanitized_font['fontFamily'] );
-			$wrapped_font_families = array_map(
-				function ( $font_family ) {
-					$trimmed = trim( $font_family );
-					if ( ! empty( $trimmed ) && strpos( $trimmed, ' ' ) !== false && strpos( $trimmed, "'" ) === false && strpos( $trimmed, '"' ) === false ) {
-							return "'" . $trimmed . "'";
-					}
-					return $trimmed;
-				},
-				$font_families
-			);
-
-			if ( count( $wrapped_font_families ) === 1 ) {
-				$sanitized_font['fontFamily'] = $wrapped_font_families[0];
-			} else {
-				$sanitized_font['fontFamily'] = implode( ', ', $wrapped_font_families );
-			}
-		}
-		$this->data = $sanitized_font;
+		$sanitized_font = WP_Font_Family_Utils::format_slug_and_family( $sanitized_font );
+		$this->data     = $sanitized_font;
 		return $this->data;
 	}