-
Notifications
You must be signed in to change notification settings - Fork 574
Isolate alternation branches in RegexGroupParser::walkGroupAst() to prevent non-empty/non-falsy state bleeding
#5602
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
staabm
merged 4 commits into
phpstan:2.1.x
from
phpstan-bot:create-pull-request/patch-grhfx5b
May 6, 2026
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
32d7d8f
Isolate alternation branches in `RegexGroupParser::walkGroupAst()` to…
phpstan-bot 84633ab
remove dead code
staabm 2bc04f8
Handle empty children in alternation to prevent false-positive nonEmp…
phpstan-bot 321cc2e
Add tests for empty alternation branches
phpstan-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace Bug14575; | ||
|
|
||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| function doFoo(string $string): void { | ||
| // Anchors in alternation should not make the match non-empty | ||
| if (preg_match('(foo|$)', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('(^|foo)', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('(\b|foo)', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('/foo|$/', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('/^|bar/', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| // Anchor in alternation within capturing group | ||
| if (preg_match('/(foo|$)/', $string, $match)) { | ||
| assertType('array{string, string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('/(^|bar)/', $string, $match)) { | ||
| assertType('array{string, string}', $match); | ||
| } | ||
|
|
||
| // Anchor in alternation does not affect parent concatenation | ||
| if (preg_match('/^abc(def|$)/', $string, $match)) { | ||
| assertType("array{non-falsy-string, string}", $match); | ||
| } | ||
|
|
||
| // All non-empty alternatives should still produce non-empty/non-falsy | ||
| if (preg_match('/foo|bar/', $string, $match)) { | ||
| assertType('array{non-falsy-string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('/foo/', $string, $match)) { | ||
| assertType('array{non-falsy-string}', $match); | ||
| } | ||
|
|
||
| // Anchor alone | ||
| if (preg_match('/^$/', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| // Three-way alternation with anchor | ||
| if (preg_match('/foo|bar|$/', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| // All alternatives are single chars (non-falsy not determinable from single tokens) | ||
| if (preg_match('/a|b/', $string, $match)) { | ||
| assertType('array{non-empty-string}', $match); | ||
| } | ||
|
|
||
| // Empty alternation branches | ||
| if (preg_match('/(|)/', $string, $match)) { | ||
| assertType("array{string, ''}", $match); | ||
| } | ||
|
|
||
| if (preg_match('/(foo|)/', $string, $match)) { | ||
| assertType("array{string, ''|'foo'}", $match); | ||
| } | ||
|
|
||
| if (preg_match('/(|bar)/', $string, $match)) { | ||
| assertType("array{string, ''|'bar'}", $match); | ||
| } | ||
|
|
||
| if (preg_match('/|/', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
|
|
||
| if (preg_match('/foo|/', $string, $match)) { | ||
| assertType('array{string}', $match); | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.