fix: newCollection generics

Author: calebdw

src/Illuminate/Database/Eloquent/Model.php

@@ -1592,10 +1592,9 @@ protected function newBaseQueryBuilder()
      * Create a new Eloquent Collection instance.
      *
      * @template TKey of array-key
-     * @template TModel of \Illuminate\Database\Eloquent\Model
      *
-     * @param  array<TKey, TModel>  $models
-     * @return \Illuminate\Database\Eloquent\Collection<TKey, TModel>
+     * @param  array<TKey, static>  $models
+     * @return \Illuminate\Database\Eloquent\Collection<TKey, static>
      */
     public function newCollection(array $models = [])
     {

types/Database/Eloquent/Model.php

@@ -2,12 +2,13 @@
 
 namespace Illuminate\Types\Model;
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use User;
 
 use function PHPStan\Testing\assertType;
 
-function test(User $user): void
+function test(User $user, Post $post, Comment $comment): void
 {
     assertType('UserFactory', User::factory(function ($attributes, $model) {
         assertType('array<string, mixed>', $attributes);
@@ -31,7 +32,8 @@ function test(User $user): void
     assertType('Illuminate\Database\Eloquent\Relations\MorphMany<Illuminate\Notifications\DatabaseNotification, User>', $user->notifications());
 
     assertType('Illuminate\Database\Eloquent\Collection<int, User>', $user->newCollection([new User()]));
-    assertType('Illuminate\Database\Eloquent\Collection<string, Illuminate\Types\Model\Post>', $user->newCollection(['foo' => new Post()]));
+    assertType('Illuminate\Database\Eloquent\Collection<string, Illuminate\Types\Model\Post>', $post->newCollection(['foo' => new Post()]));
+    assertType('Illuminate\Types\Model\Comments', $comment->newCollection([new Comment()]));
 
     assertType('bool', $user->restore());
     assertType('User', $user->restoreOrCreate());
@@ -41,3 +43,16 @@ function test(User $user): void
 class Post extends Model
 {
 }
+
+final class Comment extends Model
+{
+    public function newCollection(array $models = []): Comments
+    {
+        return new Comments($models);
+    }
+}
+
+/** @extends Collection<array-key, Comment> */
+final class Comments extends Collection
+{
+}