fix: EloquentCollection find and unique generics (#53239)

laravel · Oct 21, 2024 · 6247370 · 6247370
1 parent 2044605
commit 6247370
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -27,7 +27,7 @@ class Collection extends BaseCollection implements QueueableCollection
      *
      * @param  mixed  $key
      * @param  TFindDefault  $default
-     * @return static<TKey, TModel>|TModel|TFindDefault
+     * @return ($key is (\Illuminate\Contracts\Support\Arrayable<array-key, mixed>|array<mixed>) ? static : TModel|TFindDefault)
      */
     public function find($key, $default = null)
     {
@@ -470,7 +470,7 @@ public function intersect($items)
      *
      * @param  (callable(TModel, TKey): mixed)|string|null  $key
      * @param  bool  $strict
-     * @return static<int, TModel>
+     * @return static
      */
     public function unique($key = null, $strict = false)
     {
@@ -485,7 +485,7 @@ public function unique($key = null, $strict = false)
      * Returns only the models from the collection with the specified keys.
      *
      * @param  array<array-key, mixed>|null  $keys
-     * @return static<int, TModel>
+     * @return static
      */
     public function only($keys)
     {
@@ -502,7 +502,7 @@ public function only($keys)
      * Returns all models in the collection except the models with specified keys.
      *
      * @param  array<array-key, mixed>|null  $keys
-     * @return static<int, TModel>
+     * @return static
      */
     public function except($keys)
     {

diff --git a/types/Database/Eloquent/Collection.php b/types/Database/Eloquent/Collection.php
@@ -5,8 +5,9 @@
 $collection = User::all();
 assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection);
 
-assertType('Illuminate\Database\Eloquent\Collection<int, User>|User|null', $collection->find(1));
-assertType('Illuminate\Database\Eloquent\Collection<int, User>|string|User', $collection->find(1, 'string'));
+assertType('User|null', $collection->find(1));
+assertType('string|User', $collection->find(1, 'string'));
+assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->find([1]));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->load('string'));
 assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->load(['string']));
@@ -165,6 +166,9 @@
 assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->append('string'));
 assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->append(['string']));
 
+assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->unique());
+assertType('Illuminate\Database\Eloquent\Collection<int, User>', $collection->uniqueStrict());
+
 assertType('array<User>', $collection->getDictionary());
 assertType('array<User>', $collection->getDictionary($collection));
 assertType('array<User>', $collection->getDictionary([new User]));