Changeset 56540

Timestamp:

09/07/2023 05:28:59 PM (19 months ago)

Author:

hellofromTonya

Message:

Fonts: Removes static instance in wp_print_font_faces().

The static instance of WP_Font_Face is not needed. It was an unnecessary carryover from the experimental Fonts API (which was not introduced into Core).

Whereas the Fonts API needed to persist its data (i.e. to maintain the registered and enqueued fonts throughout the web request), Font Face does not have data to persist.

Font Face processes the fonts it receives when WP_Font_Face::generate_and_print( $fonts ) is invoked. Thus, a singleton is not needed.

Removing the static reduces the amount of the code in the function and eliminates running its tests in separate processes to ensure a different instance is always used.

References:

• ​Gutenberg PR 54228.

Follow-up to [56500].

Props hellofromTonya, costdev.
Fixes #59165.

Location:

trunk

Files:

• src/wp-includes/fonts.php (modified) (2 diffs)
• tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php (modified) (1 diff)

trunk/src/wp-includes/fonts.php

@@ -40 +40 @@
  */
 function wp_print_font_faces( $fonts = array() ) {
-    static $wp_font_face = null;
 
     if ( empty( $fonts ) ) {
@@ -50 +49 @@
     }
 
-    if ( null === $wp_font_face ) {
-        $wp_font_face = new WP_Font_Face();
-    }
-
+    $wp_font_face = new WP_Font_Face();
     $wp_font_face->generate_and_print( $fonts );
 }

trunk/tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php

@@ -7 +7 @@
  *
  * @since 6.4.0
- */
-require_once __DIR__ . '/base.php';
-
-/**
+ *
  * @group fonts
  * @group fontface
  *
  * @covers wp_print_font_faces
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
  */
 class Tests_Fonts_WpPrintFontFaces extends WP_Font_Face_UnitTestCase {