Fix #11310: False Positive on Match Arm Comparison with Incremented Bounded Integer#4968
Open
phpstan-bot wants to merge 2 commits into2.1.xfrom
Open
Fix #11310: False Positive on Match Arm Comparison with Incremented Bounded Integer#4968phpstan-bot wants to merge 2 commits into2.1.xfrom
phpstan-bot wants to merge 2 commits into2.1.xfrom
Conversation
- MutatingScope::enterMatch() re-evaluated the condition type after the scope had already been updated by processing the increment expression, causing $i++ to be seen as int<1, max> instead of int<0, max> - Pass the pre-computed condition type and native type from NodeScopeResolver to enterMatch() so it uses the correct types - New regression test in tests/PHPStan/Rules/Comparison/data/bug-11310.php Closes phpstan/phpstan#11310
Automated fix attempt 1 for CI failures.
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.
Summary
When using post-increment (
$i++) or post-decrement ($i--) as the condition in amatchexpression, PHPStan incorrectly evaluated the match arms using the post-incremented type instead of the original value. For example,match ($i++) { 0 => ... }with$i: int<0, max>would report "Match arm comparison between int<1, max> and 0 is always false", even though$i++evaluates to the original value of$ibefore incrementing.The same issue also affected pre-increment (
++$i), which was double-incremented — the type was incremented once during expression processing, thenenterMatch()would re-evaluate it in the updated scope, effectively incrementing it a second time.Changes
MutatingScope::enterMatch()insrc/Analyser/MutatingScope.phpto accept optional pre-computed condition type and native type parametersNodeScopeResolverinsrc/Analyser/NodeScopeResolver.phpto capture both the condition type and native type before processing the condition expression, and pass them toenterMatch()tests/PHPStan/Rules/Comparison/data/bug-11310.phpcovering post-increment, post-decrement, and pre-increment in match conditionstestBug11310()intests/PHPStan/Rules/Comparison/MatchExpressionRuleTest.phpRoot cause
In
NodeScopeResolver::processExprNode()forExpr\Match_, the condition type was captured correctly at line 4178 ($condType = $scope->getType($expr->cond)), but then the condition expression was processed (line 4179), which updates the scope with the incremented variable type. When$scope->enterMatch($expr)was called (line 4185),enterMatch()would re-evaluate$this->getType($cond)using the already-updated scope, getting the wrong type.The fix passes the pre-computed types directly to
enterMatch()so it doesn't need to re-derive them from the (now stale) scope.Test
Added
tests/PHPStan/Rules/Comparison/data/bug-11310.phpwith three test cases:$i++(post-increment) in match — should not report false positive on0 => 'zero'$i--(post-decrement) in match — should not report false positive on0 => 'zero'++$i(pre-increment) in match — should correctly report that0is always false (since++$ionint<0, max>givesint<1, max>), but should NOT report1as always falseFixes phpstan/phpstan#11310