Narrow comparisons on a variable through its recorded defining call - #6383
Open
ondrejmirtes wants to merge 2 commits into
Open
Narrow comparisons on a variable through its recorded defining call#6383ondrejmirtes wants to merge 2 commits into
ondrejmirtes wants to merge 2 commits into
Conversation
When a variable is assigned the result of a pure information-carrying
call over a plain variable argument (count(), sizeof(), gettype(),
get_class(), get_debug_type()), the scope now records that provenance:
comparing the variable against a single-valued constant additionally
runs the call's own comparison narrowing, so
$numParts = count($colParts);
if ($numParts === 3) { ... }
reconstructs $colParts's shape exactly like the direct
`if (count($colParts) === 3)` form - through if/elseif, match arms and
switch cases alike, in both type flavours and both branch directions.
The provenance map is threaded through MutatingScope like the other
expression tables: merges keep only entries recording the identical
call on both sides, and invalidating any expression the entry mentions
(the target, or the call's argument - by printed-key containment)
drops it. Recording is a cheap name check at assignment; lookup is one
isset() per constant comparison on a variable.
None of the touched files is turbo-shadowed.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CGhnJQpUWRRpg6H5LuWJkA
Collaborator
|
You've opened the pull request against the latest branch 2.3.x. PHPStan 2.3 is not going to be released for months. If your code is relevant on 2.2.x and you want it to be released sooner, please rebase your pull request and change its target to 2.2.x. |
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01CGhnJQpUWRRpg6H5LuWJkA
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
2 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.
Adds a scope-threaded result-provenance map so that a comparison on a variable narrows like the same comparison on the call that produced it.
When
$v = f(arg)is assigned, wherefis one ofcount/sizeof/gettype/get_class/get_debug_typeandargis a plain variable, the scope records that$vholds that call's result. When a later===/==/matcharm /switchcase pins$vto a single-valued constant, PHPStan additionally runs the recorded call through the existing narrowing machinery (count-shape reconstruction,gettypestring-to-type map,get_classobject pin). This coversif,matchandswitchuniformly, both type flavours and both branch directions.The entry is dropped on any write or impure invalidation of the target or the call's argument, kept across merges only when identical, and dropped at closure boundaries — so it is never less sound than the direct-call form.
Regression tests added; the full
NodeScopeResolverTeststays green. A local issue-bot run confirms the three fixes and no regressions.Closes phpstan/phpstan#14464
Closes phpstan/phpstan#13972
Closes phpstan/phpstan#523
🤖 Generated with Claude Code