Fix phpstan/phpstan#13981: Assignment inside match statement no longer recognized#5120
Merged
VincentLanglet merged 3 commits intophpstan:2.1.xfrom Mar 5, 2026
Conversation
- Variable assignments in match arm conditions (e.g. `is_dir($baseDir = ...)`) were lost after commit 3beb8c6 replaced processExprNode with filterByTruthyValue - filterByTruthyValue only narrows types without walking the AST, so assignments within condition expressions were not discovered for the arm body scope - Fix transfers newly-defined variables from the condition processing scope to the body scope after applying truthiness filtering - New regression test in tests/PHPStan/Rules/Variables/data/bug-13981.php Closes phpstan/phpstan#13981
staabm
reviewed
Mar 5, 2026
Comment on lines
+4406
to
+4411
| $armCondScope = $armCondResultScope->filterByFalseyValue($armCondExpr); | ||
| if ($bodyScope === null) { | ||
| $bodyScope = $armCondResultScope->filterByTruthyValue($armCondExpr); | ||
| } else { | ||
| $bodyScope = $bodyScope->mergeWith($armCondResultScope->filterByTruthyValue($armCondExpr)); | ||
| } |
Contributor
There was a problem hiding this comment.
seeing this I feared this would slow down match/match-arm analysis.
running vendor/bin/phpunit tests/PHPStan/Analyser/AnalyserIntegrationTest.php in contrast reveals though, that it now runs in 20-21 seconds while it took 21-22 seconds before -> so we actually got a bit faster :)
staabm
approved these changes
Mar 5, 2026
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
3 participants
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.
Fixes phpstan/phpstan#13981