Eliminate the OriginalPropertyTypeExpr, GetOffsetValueTypeExpr and GetIterableKey/ValueTypeExpr virtual nodes - #6129
Merged
Conversation
This was referenced Jul 28, 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
1 participant
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.
Second extraction step from the
resolve-type-rewrite-2branch (after #6125): four internal virtualExprnodes are replaced with eagerTypeExpr/NativeTypeExprvalues computed directly from Scope APIs at the construction sites, and their handlers and printer methods are deleted.OriginalPropertyTypeExpr→AssignHandlercomputes the original property type itself (viaPropertyReflectionFinder, mirroring what the handler did) when writing into an offset of a property.GetOffsetValueTypeExpr→$scope->getType($e)->getOffsetValueType(...)at the two construction sites.GetIterableKeyTypeExpr/GetIterableValueTypeExpr→$scope->getIterableKeyType(...)/getIterableValueType(...)wrapped inNativeTypeExpr.Behavior-neutral: no test expectations change. Shrinks the eventual resolveType-to-callback switch by four node types.
Validation performed locally:
make phpstanclean,make csclean, fullmake testsgreen (17755 tests). No turbo-shadowed class is touched.🤖 Generated with Claude Code
https://claude.ai/code/session_019wqGgaD7iqL44t1KgpJS7b