[9.x] Fixes Collection::keyBy related types (#40372)

* Fixes Collection::keyBy types

* Fixes Collection::keyBy types

Author: nunomaduro

src/Illuminate/Collections/Collection.php

@@ -492,7 +492,7 @@ public function groupBy($groupBy, $preserveKeys = false)
      * Key an associative array by a field or using a callback.
      *
      * @param  (callable(TValue, TKey): array-key)|array|string  $keyBy
-     * @return static<array-key, array<array-key, TValue>>
+     * @return static<array-key, TValue>
      */
     public function keyBy($keyBy)
     {

src/Illuminate/Collections/Enumerable.php

@@ -513,7 +513,7 @@ public function groupBy($groupBy, $preserveKeys = false);
      * Key an associative array by a field or using a callback.
      *
      * @param  (callable(TValue, TKey): array-key)|array|string  $keyBy
-     * @return static<array-key, array<array-key, TValue>>
+     * @return static<array-key, TValue>
      */
     public function keyBy($keyBy);
 

src/Illuminate/Collections/LazyCollection.php

@@ -518,7 +518,7 @@ public function groupBy($groupBy, $preserveKeys = false)
      * Key an associative array by a field or using a callback.
      *
      * @param  (callable(TValue, TKey): array-key)|array|string  $keyBy
-     * @return static<array-key, array<array-key, TValue>>
+     * @return static<array-key, TValue>
      */
     public function keyBy($keyBy)
     {

types/Support/Collection.php

@@ -388,8 +388,8 @@
     return 'foo';
 }));
 
-assertType('Illuminate\Support\Collection<(int|string), array<User>>', $collection->keyBy('name'));
-assertType('Illuminate\Support\Collection<(int|string), array<User>>', $collection->keyBy(function ($user, $int) {
+assertType('Illuminate\Support\Collection<(int|string), User>', $collection->keyBy('name'));
+assertType('Illuminate\Support\Collection<(int|string), User>', $collection->keyBy(function ($user, $int) {
     // assertType('User', $user);
     // assertType('int', $int);
 

types/Support/LazyCollection.php

@@ -388,8 +388,8 @@
     return 'foo';
 }));
 
-assertType('Illuminate\Support\LazyCollection<(int|string), array<User>>', $collection->keyBy('name'));
-assertType('Illuminate\Support\LazyCollection<(int|string), array<User>>', $collection->keyBy(function ($user, $int) {
+assertType('Illuminate\Support\LazyCollection<(int|string), User>', $collection->keyBy('name'));
+assertType('Illuminate\Support\LazyCollection<(int|string), User>', $collection->keyBy(function ($user, $int) {
     // assertType('User', $user);
     // assertType('int', $int);