Repository navigation
Expand character ranges when trimming a numeric-string - #7013
Merged
Merged
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
staabm
reviewed
Nov 9, 2026
| * Reads the character list like PHP's php_charmask(): "a..z" stands for | ||
| * every byte from "a" to "z", so "/..:" contains the digits. | ||
| */ | ||
| public function containsDigit(string $characters): bool |
Contributor
There was a problem hiding this comment.
this new method should have some unit tests
Contributor
Author
There was a problem hiding this comment.
Added TrimCharactersHelperTest with 20 cases, including the invalid ranges. I checked each expected value against real trim(). With the old /\d/ regex, 3 of the cases fail.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
staabm
approved these changes
Nov 9, 2026
Contributor
|
Thank you! |
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
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.
For a
numeric-string, the trim extensions keepnumeric-stringwhen the character list cannot remove a digit. The old check only looked for a literal digit, so it missed..ranges:'/..:'covers0to9, andtrim('12', '/..:')returns''.TrimCharactersHelper::containsDigit()reads the character list the same way as PHP'sphp_charmask(). A valid range adds every byte between its ends. An invalid range, such as'..:'or':../', adds no range, so those lists still keepnumeric-string.I compared the helper with PHP's own
trim()on 300,000 random character lists. The lists had dots, digits,/,:and random bytes. The helper gave the same answer for every list. The old regex gave a different answer for 2,781 of them.Closes phpstan/phpstan#15683
🤖 Generated with Claude Code