Closes #7189 Update self-host google fonts exclusion (#7194)

wp-media · Dec 19, 2024 · a60bcda · a60bcda
2 parents eca50d3 + 2591bff
commit a60bcda
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/inc/Engine/Media/Fonts/FontsTrait.php b/inc/Engine/Media/Fonts/FontsTrait.php
@@ -22,14 +22,14 @@ protected function get_exclusions(): array {
 	}
 
 	/**
-	 * Checks if a URL is excluded based on the provided exclusions.
+	 * Checks if a font is excluded based on the provided exclusions.
 	 *
-	 * @param string   $url        The URL to check.
+	 * @param string   $subject    The string to check.
 	 * @param string[] $exclusions The list of exclusions.
 	 *
 	 * @return bool True if the URL is excluded, false otherwise.
 	 */
-	protected function is_excluded( string $url, array $exclusions ): bool {
+	protected function is_excluded( string $subject, array $exclusions ): bool {
 		// Bail out early if there are no exclusions.
 		if ( empty( $exclusions ) ) {
 			return false;
@@ -53,6 +53,6 @@ function ( $exclusion ) {
 		$exclusions_str = implode( '|', $escaped_exclusions );
 
 		// Check the URL against the combined regex pattern.
-		return (bool) preg_match( '#(' . $exclusions_str . ')#i', $url );
+		return (bool) preg_match( '#(' . $exclusions_str . ')#i', $subject );
 	}
 }
diff --git a/inc/Engine/Media/Fonts/Frontend/Controller.php b/inc/Engine/Media/Fonts/Frontend/Controller.php
@@ -99,14 +99,14 @@ private function rewrite_fonts( $html ): string {
 		$total_fonts = $total_v1 + $total_v2;
 
 		foreach ( $v1_fonts as $font ) {
-			if ( $this->is_excluded( $font['url'], $exclusions ) ) {
+			if ( $this->is_excluded( $font[0], $exclusions ) ) {
 				continue;
 			}
 			$html = $this->replace_font( $font, $html );
 		}
 
 		foreach ( $v2_fonts as $font ) {
-			if ( $this->is_excluded( $font['url'], $exclusions ) ) {
+			if ( $this->is_excluded( $font[0], $exclusions ) ) {
 				continue;
 			}
 			$html = $this->replace_font( $font, $html );

diff --git a/inc/Engine/Optimization/GoogleFonts/Combine.php b/inc/Engine/Optimization/GoogleFonts/Combine.php
@@ -62,7 +62,7 @@ public function optimize( $html ): string {
 		$filtered_fonts = array_filter(
 			$fonts,
 			function ( $font ) use ( $exclusions ) {
-				return ! $this->is_excluded( $font['url'], $exclusions );
+				return ! $this->is_excluded( $font[0], $exclusions );
 			}
 			);
 

diff --git a/inc/Engine/Optimization/GoogleFonts/CombineV2.php b/inc/Engine/Optimization/GoogleFonts/CombineV2.php
@@ -45,7 +45,7 @@ public function optimize( $html ): string {
 		$filtered_tags = array_filter(
 			$font_tags,
 			function ( $tag ) use ( $exclusions ) {
-				return ! $this->is_excluded( $tag['url'], $exclusions );
+				return ! $this->is_excluded( $tag[0], $exclusions );
 			}
 			);
 

diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/expected_v1_v2_regex.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/expected_v1_v2_regex.php
@@ -12,6 +12,7 @@
 <link href="https://fonts.googleapis.com/css?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="http://example.org/wp-content/cache/fonts/1/google-fonts/css/b/4/d/9ffca0114d3acb6ab0b068feaf933.css" data-wpr-hosted-gf-parameters="family=Lato:wght@400;700&display=swap"/>
 <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap" rel="stylesheet">
+<link rel='stylesheet' id='astra-google-fonts-css' href='https://fonts.googleapis.com/css?family=Noto+Sans%3A400%2C700%7CMontserrat%3A700&#038;display=fallback&#038;ver=4.7.0' media='all' />
 <style>
 .roboto-font {
 	font-family: 'Roboto', sans-serif;

diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/input_v1_v2_regex.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/HTML/input_v1_v2_regex.php
@@ -12,6 +12,7 @@
 <link href="https://fonts.googleapis.com/css?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
 <link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap" rel="stylesheet">
 <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap" rel="stylesheet">
+<link rel='stylesheet' id='astra-google-fonts-css' href='https://fonts.googleapis.com/css?family=Noto+Sans%3A400%2C700%7CMontserrat%3A700&#038;display=fallback&#038;ver=4.7.0' media='all' />
 <style>
 .roboto-font {
 	font-family: 'Roboto', sans-serif;

diff --git a/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/rewriteFontsForOptimizations.php b/tests/Fixtures/inc/Engine/Media/Fonts/Frontend/Subscriber/rewriteFontsForOptimizations.php
@@ -151,7 +151,8 @@
 				],
 				'exclude_locally_host_fonts' => [
 					'family=Rob(.*)o',
-					'family(.*)Montserrat(.*)display=swap'
+					'family(.*)Montserrat(.*)display=swap',
+					'astra-google-(.*)-css',
 				]
 			],
 			'expected' => [