Make Builder::get method respect generic

Neol3108 · Neol3108 · commit 17b0cad2d6ec · 2024-04-28T20:00:39.000+02:00
diff --git a/stubs/database/eloquent/builder.stub b/stubs/database/eloquent/builder.stub
@@ -12,4 +12,10 @@ class Builder
      * @return TModel|null
      */
     public function first($columns = ['*']);
+
+    /**
+     * @param string[]|string $columns
+     * @return \Illuminate\Database\Eloquent\Collection<int, TModel>
+     */
+    public function get($columns = ['*']);
 }
diff --git a/tests/Types/data/database/eloquent/builder.php b/tests/Types/data/database/eloquent/builder.php
@@ -5,3 +5,4 @@
 /** @var \Illuminate\Database\Eloquent\Builder<\Tests\Types\Fakes\User> $builder */
 
 assertType('Tests\Types\Fakes\User|null', $builder->first());
+assertType('Illuminate\Database\Eloquent\Collection<int, Tests\Types\Fakes\User>', $builder->get());
diff --git a/tests/Types/data/database/eloquent/model.php b/tests/Types/data/database/eloquent/model.php
@@ -12,8 +12,10 @@ public function test(): void
 
         assertType('Illuminate\Database\Eloquent\Builder<static(User)>', $this->newEloquentBuilder($baseBuilder));
         assertType('static(User)|null', $this->newEloquentBuilder($baseBuilder)->first());
+        assertType('Illuminate\Database\Eloquent\Collection<int, static(User)>', $this->newEloquentBuilder($baseBuilder)->get());
 
         assertType('Illuminate\Database\Eloquent\Builder<static(User)>', self::query());
         assertType('static(User)|null', self::query()->first());
+        assertType('Illuminate\Database\Eloquent\Collection<int, static(User)>', self::query()->get());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@`
`5`	`5`	`/** @var \Illuminate\Database\Eloquent\Builder<\Tests\Types\Fakes\User> $builder */`
`6`	`6`
`7`	`7`	`assertType('Tests\Types\Fakes\User\|null', $builder->first());`
	`8`	`+assertType('Illuminate\Database\Eloquent\Collection<int, Tests\Types\Fakes\User>', $builder->get());`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,10 @@ public function test(): void`
`12`	`12`
`13`	`13`	`assertType('Illuminate\Database\Eloquent\Builder<static(User)>', $this->newEloquentBuilder($baseBuilder));`
`14`	`14`	`assertType('static(User)\|null', $this->newEloquentBuilder($baseBuilder)->first());`
	`15`	`+ assertType('Illuminate\Database\Eloquent\Collection<int, static(User)>', $this->newEloquentBuilder($baseBuilder)->get());`
`15`	`16`
`16`	`17`	`assertType('Illuminate\Database\Eloquent\Builder<static(User)>', self::query());`
`17`	`18`	`assertType('static(User)\|null', self::query()->first());`
	`19`	`+ assertType('Illuminate\Database\Eloquent\Collection<int, static(User)>', self::query()->get());`
`18`	`20`	`}`
`19`	`21`	`}`