Skip to content

Conversation

@peterwilsoncc
Copy link

@peterwilsoncc peterwilsoncc commented Oct 13, 2025

Summary

This includes various PHP compatibly fixes both for PHP 8.4 and to ensure PHP 7.4 compatibility.

This targets the 6.0.0 release branch.

Details

  • PHP 7.4: Removes mixed type declarations to maintain support for PHP 7.4 (the current WP & Woo minimum)
  • PHP 8.1+: Use modern default flags for htmlspecialchars().
  • PHP 8.4: Implicitly marking a parameter as nullable is deprecated since PHP 8.4 (test suite, follow up to Explicitly mark parameters as nullable #788)
  • PHPCS Sniffs: Ignores conditional use of WeakMap in Dynamic_Props class

UI Changes

N/A

QA

  • Code Review

Setup

List any configuration requirements for testing

  • This setting is configured
  • Taxes are enabled

Before merge

  • I have confirmed these changes in each supported minor WooCommerce version

@peterwilsoncc peterwilsoncc marked this pull request as ready for review October 13, 2025 01:45
@peterwilsoncc
Copy link
Author

@agibson-godaddy Are you able to review this for the 6.0.0 release? I don't have permission to request reviews via GitHub, sorry.

@agibson-godaddy
Copy link
Contributor

@peterwilsoncc I will take a look as soon as I can -- thanks for the PR! Will be quite busy over the next week or two but will leave this notification unread to remind me as soon as I have time. 🙏

Copy link
Contributor

@ajaynes-godaddy ajaynes-godaddy left a comment

Choose a reason for hiding this comment

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

Looks pretty good, nothing jumping out at me.

Just noting for anybody watching at home that the htmlspecialchars() changes are essentially just setting the PHP 8.1+ default flags as a back-compat measure.

Copy link
Contributor

@agibson-godaddy agibson-godaddy left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for the contribution. :)

@agibson-godaddy agibson-godaddy merged commit ccd93c6 into godaddy-wordpress:release/6.0.0 Oct 20, 2025
5 checks passed
@peterwilsoncc peterwilsoncc deleted the do/php84-compat branch October 20, 2025 21:26
@peterwilsoncc
Copy link
Author

peterwilsoncc commented Oct 20, 2025

Thanks @agibson-godaddy, Do you need to to create a PR targeting the default branch or will you cherry pick to that as part of the release process?

@agibson-godaddy
Copy link
Contributor

@peterwilsoncc Sorry not sure if I'm understanding your question. Your changes have been merged into our release branch here: #787

That branch will eventually be merged into default/master branch. After it does we'll then create a new release tag.

@peterwilsoncc
Copy link
Author

Thanks Ashley, that answers my question.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants