Resolve template defaults referencing other templates in composite types - #6329
Merged
Merged
Conversation
Member
|
Please follow what the CI says:
|
`ClassReflection::typeMapFromList()` only substituted a sibling template reference when the default was exactly a bare `TemplateType`. So `@template TResult = TRelated` resolved correctly, but a default that merely contained the reference - `= TRelated|null`, `= list<TRelated>`, or an array shape - kept the unresolved template and leaked it into inferred types. Traverse the type instead, substituting any nested reference to a template of the same class. Bounds are deliberately not descended into, because they may be self-referential (`@template T of Foo<T>`) and traversing them expands without bound. The substitution has to apply to explicitly passed arguments as well as to `$tag->getDefault()`, because TypeNodeResolver already pads missing arguments with the raw defaults before this code runs.
calebdw
force-pushed
the
calebdw/push-ktxvvktqmorp
branch
from
September 2, 2026 13:21
5a56065 to
db25abc
Compare
Member
|
Thank you! |
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.
Hello!
ClassReflection::typeMapFromList()only substituted a sibling template reference when the default was exactly a bareTemplateType. So@template TResult = TRelatedresolved correctly, but a default that merely contained the reference -= TRelated|null,= list<TRelated>, or an array shape - kept the unresolved template and leaked it into inferred types.Traverse the type instead, substituting any nested reference to a template of the same class. Bounds are deliberately not descended into, because they may be self-referential (
@template T of Foo<T>) and traversing them expands without bound.The substitution has to apply to explicitly passed arguments as well as to
$tag->getDefault(), because TypeNodeResolver already pads missing arguments with the raw defaults before this code runs.Thanks!