Migrate to PHPCSUtils#360
Merged
sirbrillig merged 16 commits intotrunkfrom Apr 21, 2026
Merged
Conversation
…ion() Delegates condition checking to PHPCSUtils which provides the same logic with an added isset($tokens[$ptr]) guard.
…:getParameters() Delegates to PHPCSUtils which already parses all parameter attributes including property_visibility for constructor-promoted parameters. Also picks up PHP 8.4 asymmetric visibility (set_visibility_token) for free. Removes the now-unused isTokenPartOfTypehint() and isTokenPossiblyPartOfTypehint() helpers.
…getParameters() Delegates argument parsing to PHPCSUtils which handles named params (PHP 8+), closures, attributes, and has internal caching. Updates getVariablesInsideCompact() and processVariableAsPassByReferenceFunctionCall() to work with the PassedParameters ['start','end'] format; argument positions are now 1-based integers matching PHPCSUtils conventions. Removes stale Psalm baseline entries for the deleted $closePtr code.
Replaces the manual findPrevious call with an exclusion list with the existing findContainingOpeningBracket() abstraction, and simplifies the second findPrevious to skip only empty tokens.
Owner
Author
|
Benchmarks at the moment show that on a complex 4317 line file, 2.x takes approximately 1.864 seconds and 3.x takes 888.6 milliseconds! That's more than twice as fast. 2.x3.x |
Owner
Author
|
Merged this into a new |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It's been many years since it was suggested to use PHPCSUtils to simplify the helpers used by this sniff (see discussion in #214 and #149 and #132 and probably others).
Originally I had held off because PHPCSUtils had not stabilized, but it is definitely stable now.
I've finally decided to try the migration to see what benefits it could provide.
This PR is the first step in that process that should eventually lead to 3.0.
Warning
Do not merge this into the 2.x branch! It changes the minimum supported versions of phpcs and adds a new dependency!