[9.x] Improve Support\LazyCollection
type definitions
#39506
Merged
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.
Similarly to #38538, this PR makes the
LazyCollection
generic.I haven't tested this with PHPStorm or Psalm, but in VSCode + PHPStan extension it works great.
Also:
Support\Collection
typesThere are still a few issues with the constructors and the
make()
method of the collections:The
Support\LazyCollection
needs to widen the type of items it accepts, because it acceptscallable
s that returnGenerator
s, but theSupport\Collection
does not accept that. I have extended themake
method and it works as expected.For some reason
new Eloquent\Collection([new User()])
returnsEloquent\Collection<(int|string), Eloquent\Model>
instead ofEloquent\Collection<int, User>
. If I extend the constructor it works (but I haven't included this).