Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Jetpack)(PHP8)(GB 17.1.3) Make the check around $google_fonts_data's array more resilient and return early if key or value is not of the right type #34382

Merged
merged 3 commits into from
Nov 30, 2023

Conversation

fullofcaffeine
Copy link
Contributor

@fullofcaffeine fullofcaffeine commented Nov 29, 2023

Proposed changes:

We've found that in some circumstances (which I couldn't pinpoint yet, exactly) when using PHP8 and Gutenberg 17.1.3+, the $google_fonts_data['fontFamilies'] would be null and cause a fatal. The actual changeset in GB that triggers it (when PHP8 is being used) is this WordPress/gutenberg#55240 adds a more resilient guard around it, extending the current one, and return early if the shape is not correct.

See p1701220768492429-slack-CDLH4C1UZ and p1701369236916389-slack-C05Q5HSS013 for more context and info.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Steps to reproduce are tricky, see p1701220768492429-slack-CDLH4C1UZ for more info. It needs some WPCOM-specific builds that might not be available in this repo.

@github-actions github-actions bot added [Feature] Google Fonts [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Nov 29, 2023
Copy link
Contributor

github-actions bot commented Nov 29, 2023

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for December 5, 2023 (scheduled code freeze on November 28, 2023).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Nov 29, 2023
Copy link
Contributor

github-actions bot commented Nov 29, 2023

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the make/load-google-fonts-more-resilient branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack make/load-google-fonts-more-resilient
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@kraftbj kraftbj added [Status] Needs Review To request a review from Crew. Label will be renamed soon. [Type] Bug When a feature is broken and / or not performing as intended [Pri] BLOCKER and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Nov 29, 2023
@kraftbj
Copy link
Contributor

kraftbj commented Nov 29, 2023

Marking as a blocker since the fix has been deployed on WP.com Simple, so need to land this before next daily to ensure we don't regress.

@fullofcaffeine
Copy link
Contributor Author

Marking as a blocker since the fix has been deployed on WP.com Simple, so need to land this before next daily to ensure we don't regress.

Corresponding diff: D129881-code

@fullofcaffeine
Copy link
Contributor Author

@kraftbj Thanks for adding the changelog!

arthur791004
arthur791004 previously approved these changes Nov 30, 2023
Copy link
Contributor

@arthur791004 arthur791004 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 👍

@fullofcaffeine fullofcaffeine force-pushed the make/load-google-fonts-more-resilient branch from 053c879 to 672410c Compare November 30, 2023 20:19
@sdixon194 sdixon194 merged commit 126b8ba into trunk Nov 30, 2023
52 checks passed
@sdixon194 sdixon194 deleted the make/load-google-fonts-more-resilient branch November 30, 2023 20:43
@github-actions github-actions bot removed the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Nov 30, 2023
@github-actions github-actions bot added this to the jetpack/12.9 milestone Nov 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Google Fonts [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Pri] BLOCKER [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants