Font Library: fix duplicate variants with different file types

[jffng]

What?

This PR adds checks to ensure that multiple file types of the same font variant are not added, so that only one variation per font style and weight is stored.

Why?

Fixes #54253

How?

For fonts where the font family does not yet exist, checks the list of new font faces and compares their font weight and style, and if there is already an existing font face, skips adding the incoming one.

For font faces where the font family exists, adds a new function get_intersecting_font_faces which returns an array of font faces to be deleted and replaced by the incoming font face.

Testing Instructions

1. Simultaneously (batch) upload two or more font faces of the same family, style, and weight, but different file types.
2. Ensure only the first variant is added / used.
3. Upload a font face to an existing font family with the same style and weight, but different file type.
4. Ensure the uploaded version is used / replaces the existing one, and an additional variant is not created.

Testing Instructions for Keyboard

Screenshots or screencast

[github-actions]

This pull request has changed or added PHP files. Please confirm whether these changes need to be synced to WordPress Core, and therefore featured in the next release of WordPress.

If so, it is recommended to create a new Trac ticket and submit a pull request to the WordPress Core Github repository soon after this pull request is merged.

If you're unsure, you can always ask for help in the #core-editor channel in WordPress Slack.

Thank you! ❤️

View changed files

❔ lib/experimental/fonts/font-library/class-wp-font-family.php
❔ phpunit/tests/fonts/font-library/wpFontFamily/install.php

[github-actions]

Flaky tests detected in b953b2f.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/6226554866
📝 Reported issues:

• [Flaky Test] should partially select with shift + click (@webkit) #53524 in /test/e2e/specs/editor/various/multi-block-selection.spec.js

[pbking]

This is working as expected for me. Fonts are limited to a single format. When adding a new it seems to always replace the existing, whatever format it is.

When uploading multiple at the same time the format chosen seems to be... alphabetical?

Either way, I can confirm that it fixes the issue at hand.

[matiasbenedetto]

The tests I made manually are working great.
Currently, we are testing the case when two font faces have the same characteristics but different font files in the same request.
Could we add one more unit test case to cover the addition of font faces with the same characteristics in different requests? That's covered in the implementation but not in the unit tests.

[jffng]

@matiasbenedetto I moved these tests to the Tests_Fonts_WpFontFamily_Install class, added a case to cover installing multiple font faces that contain duplicates, and one test to cover the addition of font faces with the same characteristics in different requests.

[jeffikus]

LGTM - I tested with with Cardo font.

• Regular
• Italic
• Bold

Used ttf, woff, woff2 file types for each.

This created 3 variants within Cardo, tried uploading 9 files total.