-
Notifications
You must be signed in to change notification settings - Fork 569
Fix phpstan/phpstan#14446: Incorrect type-narrowing when using strict rules #5435
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 10 commits into
phpstan:2.1.x
from
phpstan-bot:create-pull-request/patch-0461d07
Apr 11, 2026
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7cca523
Fix incorrect type-narrowing with polluteScopeWithAlwaysIterableForeach
VincentLanglet 8163acb
Filter conditional expressions from foreach body in processAlwaysIter…
phpstan-bot 53b917a
Fix conditional expression filtering in processAlwaysIterableForeachS…
phpstan-bot 62b06cc
Fix unused variable $condTypeHolder in processAlwaysIterableForeachSc…
phpstan-bot 5c825e2
Use intersectConditionalExpressions in processAlwaysIterableForeachSc…
phpstan-bot 1196a5e
Add rule tests for bug 14446 to verify no false positives
phpstan-bot 19038be
Simplify
VincentLanglet 5c33ca2
Deduplicate bug-14446 test data file
phpstan-bot d8f21c4
Apply same intersectConditionalExpressions fix to processFinallyScope
phpstan-bot f6abe3c
Remove OverwriteVariablesWithForeachRule from bug-14446 test config
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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Analyser; | ||
|
|
||
| use PHPStan\Testing\TypeInferenceTestCase; | ||
| use PHPUnit\Framework\Attributes\DataProvider; | ||
|
|
||
| class Bug14446Test extends TypeInferenceTestCase | ||
| { | ||
|
|
||
| public static function dataFileAsserts(): iterable | ||
| { | ||
| yield from self::gatherAssertTypes(__DIR__ . '/data/bug-14446.php'); | ||
| } | ||
|
|
||
| /** | ||
| * @param mixed ...$args | ||
| */ | ||
| #[DataProvider('dataFileAsserts')] | ||
| public function testFileAsserts( | ||
| string $assertType, | ||
| string $file, | ||
| ...$args, | ||
| ): void | ||
| { | ||
| $this->assertFileAsserts($assertType, $file, ...$args); | ||
| } | ||
|
|
||
| public static function getAdditionalConfigFiles(): array | ||
| { | ||
| return [ | ||
| __DIR__ . '/bug-14446.neon', | ||
| ]; | ||
| } | ||
|
|
||
| } |
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,2 @@ | ||
| parameters: | ||
| polluteScopeWithAlwaysIterableForeach: false | ||
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,24 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace Bug14446; | ||
|
|
||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| function test(bool $initial): void { | ||
| $current = $initial; | ||
|
|
||
| while (true) { | ||
| assertType('bool', $initial); | ||
| if (!$current) { | ||
| assertType('bool', $initial); | ||
| break; | ||
| } | ||
|
|
||
| $items = [1]; | ||
| foreach ($items as $item) { | ||
| $current = false; | ||
| } | ||
| } | ||
|
|
||
| assertType('bool', $initial); | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this test be in the strict-rule repo instead?
OverwriteVariablesWithForeachRuleTestThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. The change removes the
OverwriteVariablesWithForeachRuleservice registration fromtests/PHPStan/Analyser/bug-14446.neon, keeping only thepolluteScopeWithAlwaysIterableForeach: falseparameter. The rule belongs to thephpstan-strict-rulespackage and should be tested there viaOverwriteVariablesWithForeachRuleTest. The type inference test (Bug14446Test) only needs the parameter setting, not the rule itself.Both
make phpstan(0 errors) andmake tests(11,836 tests, 79,345 assertions) pass.