Changeset 57720 for trunk/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php

Timestamp:

02/27/2024 12:04:55 PM (9 months ago)

Author:

youknowriad

Message:

Font face resolver: print font faces from font families defined in all theme.json origins.

This commit updates the theme.json style generation to allow a font family name to be repeated across theme.json origins (default, theme, custom).

Props mmaattiiaass, hellofromtonya, arthur791004, ironprogrammer.
Fixes #60605.

File:

• trunk/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php (modified) (3 diffs)

trunk/tests/phpunit/tests/fonts/font-face/wpFontFaceResolver/getFontsFromThemeJson.php

@@ -39 +39 @@
 
     /**
+     * @ticket 60605
+     */
+    public function test_should_return_all_fonts_from_all_theme_origins() {
+        switch_theme( static::FONTS_THEME );
+
+        $add_custom_fonts = static function ( $theme_json_data ) {
+            $data = $theme_json_data->get_data();
+            // Add font families to the custom origin of theme json.
+            $data['settings']['typography']['fontFamilies']['custom'] = self::get_custom_font_families( 'input' );
+            return new WP_Theme_JSON_Data( $data );
+        };
+
+        add_filter( 'wp_theme_json_data_theme', $add_custom_fonts );
+        $actual = WP_Font_Face_Resolver::get_fonts_from_theme_json();
+        remove_filter( 'wp_theme_json_data_theme', $add_custom_fonts );
+
+        $expected = array_merge(
+            $this->get_expected_fonts_for_fonts_block_theme( 'fonts' ),
+            $this->get_custom_font_families( 'expected' )
+        );
+
+        $this->assertSame( $expected, $actual, 'Both the fonts from the theme and the custom origin should be returned.' );
+    }
+
+    /**
      * @dataProvider data_should_replace_src_file_placeholder
      *
      * @param string $font_name  Font's name.
-     * @param string $font_index Font's index in the $fonts array.
+     * @param string $font_weight Font's weight.
+     * @param string $font_style  Font's style.
      * @param string $expected   Expected src.
      */
-    public function test_should_replace_src_file_placeholder( $font_name, $font_index, $expected ) {
+    public function test_should_replace_src_file_placeholder( $font_name, $font_weight, $font_style, $expected ) {
         switch_theme( static::FONTS_THEME );
 
         $fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
-
-        $actual   = $fonts[ $font_name ][ $font_index ]['src'][0];
+        $fonts = array_merge( array(), ...array_map( 'array_values', $fonts ) );
+
+        $font = array_filter(
+            $fonts,
+            static function ( $font ) use ( $font_name, $font_weight, $font_style ) {
+                return $font['font-family'] === $font_name
+                && $font['font-weight'] === $font_weight
+                && $font['font-style'] === $font_style;
+            }
+        );
+
+        $font = reset( $font );
+
         $expected = get_stylesheet_directory_uri() . $expected;
+        $actual   = $font['src'][0];
 
         $this->assertStringNotContainsString( 'file:./', $actual, 'Font src should not contain the "file:./" placeholder' );
@@ -66 +104 @@
             // Theme's theme.json.
             'DM Sans: 400 normal'              => array(
-                'font_name'  => 'DM Sans',
-                'font_index' => 0,
-                'expected'   => '/assets/fonts/dm-sans/DMSans-Regular.woff2',
+                'font_name'   => 'DM Sans',
+                'font_weight' => '400',
+                'font_style'  => 'normal',
+                'expected'    => '/assets/fonts/dm-sans/DMSans-Regular.woff2',
             ),
             'DM Sans: 400 italic'              => array(
-                'font_name'  => 'DM Sans',
-                'font_index' => 1,
-                'expected'   => '/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2',
+                'font_name'   => 'DM Sans',
+                'font_weight' => '400',
+                'font_style'  => 'italic',
+                'expected'    => '/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2',
             ),
             'DM Sans: 700 normal'              => array(
-                'font_name'  => 'DM Sans',
-                'font_index' => 2,
-                'expected'   => '/assets/fonts/dm-sans/DMSans-Bold.woff2',
+                'font_name'   => 'DM Sans',
+                'font_weight' => '700',
+                'font_style'  => 'normal',
+                'expected'    => '/assets/fonts/dm-sans/DMSans-Bold.woff2',
             ),
             'DM Sans: 700 italic'              => array(
-                'font_name'  => 'DM Sans',
-                'font_index' => 3,
-                'expected'   => '/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2',
+                'font_name'   => 'DM Sans',
+                'font_weight' => '700',
+                'font_style'  => 'italic',
+                'expected'    => '/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2',
             ),
             'Source Serif Pro: 200-900 normal' => array(
-                'font_name'  => 'Source Serif Pro',
-                'font_index' => 0,
-                'expected'   => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
+                'font_name'   => 'Source Serif Pro',
+                'font_weight' => '200 900',
+                'font_style'  => 'normal',
+                'expected'    => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
             ),
             'Source Serif Pro: 200-900 italic' => array(
-                'font_name'  => 'Source Serif Pro',
-                'font_index' => 1,
-                'expected'   => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
+                'font_name'   => 'Source Serif Pro',
+                'font_weight' => '200 900',
+                'font_style'  => 'italic',
+                'expected'    => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
             ),
         );
@@ -119 +163 @@
         remove_filter( 'wp_theme_json_data_theme', $replace_fonts );
 
-        $this->assertArrayHasKey( $expected_name, $fonts );
+        // flatten the array to make it easier to test.
+        $fonts = array_merge( array(), ...array_map( 'array_values', $fonts ) );
+
+        $fonts_found = array_filter(
+            $fonts,
+            function ( $font ) use ( $expected_name ) {
+                return $font['font-family'] === $expected_name;
+            }
+        );
+
+        $this->assertNotEmpty( $fonts_found, 'Expected font-family name not found in the array' );
     }