Skip to content

Composer: raise the minimum supported PHPCSUtils version to 1.1.0 + fix CI #2532

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

Merged

Conversation

jrfnl
Copy link
Member

@jrfnl jrfnl commented Jun 14, 2025

This PR is just to unblock WPCS/fix the failing test run.

Fixing the failure test run without these version bumps would mean having to polyfill support for PHP 8.4 properties in interfaces, which is not something we should want to do (that's why we use PHPCSUtils, which does the polyfill for PHPCS 3.x as PHPCS natively will only start supporting this in PHPCS 4.0).

This PR does NOT:

  • Start using the new features from PHPCSUtils 1.1.0.
  • Add support for all the new PHP syntaxes for which support was added to PHPCS + PHPCSUtils since PHPCS 3.9.0.

Composer: raise the minimum supported PHPCSUtils version to 1.1.0

... to benefit from new functionality.

This also automatically raises the minimum PHPCS version to 3.13.0 for PHP 8.2 DNF type support and tokenizer support for PHP 8.4 final properties and asymmetric visibility.

Includes syncing the PHPCSExtra version to a version which also has a minimum PHPCSUtils version of 1.1.0.

Ref:

NamingConventions/ValidVariableName: allow for PHP 8.4 properties in interfaces

jrfnl added 2 commits June 14, 2025 13:23
... to benefit from new functionality.

This also automatically raises the minimum PHPCS version to `3.13.0` for PHP 8.2 DNF type support and tokenizer support for PHP 8.4 `final` properties and asymmetric visibility.

Includes syncing the PHPCSExtra version to a version which also has a minimum PHPCSUtils version of 1.1.0.

Ref:
* https://github.com/PHPCSStandards/PHPCSUtils/releases/tag/1.1.0
* https://github.com/PHPCSStandards/PHPCSExtra/releases/tag/1.4.0
Copy link
Member

@westonruter westonruter left a comment

Choose a reason for hiding this comment

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

LGTM

@dingo-d dingo-d merged commit 48e59e9 into develop Jun 16, 2025
50 checks passed
@dingo-d dingo-d deleted the feature/composer-bump-phpcsutils-and-fix-test-failure branch June 16, 2025 06:29
@jrfnl
Copy link
Member Author

jrfnl commented Jun 16, 2025

@dingo-d Can I please remind you NOT to squash merge PRs with atomic commits ?

@dingo-d
Copy link
Member

dingo-d commented Jun 16, 2025

Ok, but didn't we said that all the PRs should be squash merged?!

I'm a bit confused because from what I recall, we mentioned that all PRs should be squash merged in order to keep things atomic.

I'll just refrain from merging in the future...

@jrfnl
Copy link
Member Author

jrfnl commented Jun 16, 2025

Ok, but didn't we said that all the PRs should be squash merged?!

I'm a bit confused because from what I recall, we mentioned that all PRs should be squash merged in order to keep things atomic.

No, I can't recall anything of the kind. "Dirty" PRs, yes, those should be squash merged, but clean PRs only containing atomic commits should retain those atomic commits.

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

Successfully merging this pull request may close these issues.

4 participants