fix: use custom collection if it does not have template types

src/ReturnTypes/CollectionGenericStaticMethodDynamicMethodReturnTypeExtension.php

@@ -95,8 +95,12 @@ public function getTypeFromMethodCall(
         return $this->handleGenericObjectType($classReflection, $returnTypeClassReflection);
     }
 
-    private function handleGenericObjectType(ClassReflection $classReflection, ClassReflection $returnTypeClassReflection): GenericObjectType
+    private function handleGenericObjectType(ClassReflection $classReflection, ClassReflection $returnTypeClassReflection): ObjectType
     {
+        if ($classReflection->getActiveTemplateTypeMap()->count() !== $returnTypeClassReflection->getActiveTemplateTypeMap()->count()) {
+            return new ObjectType($classReflection->getName());
+        }
+
         $genericTypes = $returnTypeClassReflection->typeMapToList($returnTypeClassReflection->getActiveTemplateTypeMap());
 
         $genericTypes = array_map(static function (Type $type) use ($classReflection) {

src/ReturnTypes/CollectionGenericStaticMethodDynamicStaticMethodReturnTypeExtension.php

@@ -85,8 +85,12 @@ public function getTypeFromStaticMethodCall(
         return $this->handleGenericObjectType($classReflection, $returnTypeClassReflection);
     }
 
-    private function handleGenericObjectType(ClassReflection $classReflection, ClassReflection $returnTypeClassReflection): GenericObjectType
+    private function handleGenericObjectType(ClassReflection $classReflection, ClassReflection $returnTypeClassReflection): ObjectType
     {
+        if ($classReflection->getActiveTemplateTypeMap()->count() !== $returnTypeClassReflection->getActiveTemplateTypeMap()->count()) {
+            return new ObjectType($classReflection->getName());
+        }
+
         $genericTypes = $returnTypeClassReflection->typeMapToList($returnTypeClassReflection->getActiveTemplateTypeMap());
 
         $genericTypes = array_map(static function (Type $type) use ($classReflection) {

tests/Application/app/UserCollection.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Collection;
+
+/**
+ * @extends Collection<int, User>
+ */
+class UserCollection extends Collection
+{
+    //
+}

tests/Type/data/collection-generic-static-methods.php

@@ -10,6 +10,7 @@
 /** @var EloquentCollection<int, User> $collection */
 /** @var SupportCollection<string, int> $items */
 /** @var App\TransactionCollection<int, Transaction> $customEloquentCollection */
+/** @var App\UserCollection $secondCustomEloquentCollection */
 assertType('Illuminate\Database\Eloquent\Collection<int, int>', EloquentCollection::range(1, 10));
 
 assertType('Illuminate\Support\Collection<int, mixed>', $collection->collapse());
@@ -35,77 +36,93 @@
 assertType('Illuminate\Support\Collection<int, mixed>', $items->pluck('1'));
 
 assertType('Illuminate\Support\Collection<int, int>', $customEloquentCollection->map(fn (Transaction $transaction): int => $transaction->id));
+assertType('Illuminate\Support\Collection<int, int>', $secondCustomEloquentCollection->map(fn (User $user): int => $user->id));
 assertType('Illuminate\Support\Collection<int, int>', $collection->map(fn (User $user): int => $user->id));
 assertType('Illuminate\Support\Collection<string, int>', $items->map(fn (int $value, string $key): int => $value));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, array<int, int>>', $collection->mapToDictionary(fn (User $u) => [$u->id => $u->id]));
 assertType('App\TransactionCollection<string, array<int, int>>', $customEloquentCollection->mapToDictionary(fn (Transaction $t) => ['foo'=> $t->id]));
+assertType('App\UserCollection', $secondCustomEloquentCollection->mapToDictionary(fn (User $t) => ['foo'=> $t->id]));
 assertType('Illuminate\Support\Collection<string, array<int, int>>', $items->mapToDictionary(fn (int $v) => ['foo' => $v]));
 
 assertType('Illuminate\Support\Collection<int, string>', $customEloquentCollection->mapWithKeys(fn (Transaction $transaction): array => [$transaction->id => 'foo']));
+assertType('Illuminate\Support\Collection<int, string>', $secondCustomEloquentCollection->mapWithKeys(fn (User $user): array => [$user->id => 'foo']));
 assertType('Illuminate\Support\Collection<int, int>', $collection->mapWithKeys(fn (User $user): array => [$user->id => $user->id]));
 assertType('Illuminate\Support\Collection<string, int>', $items->mapWithKeys(fn (int $value, string $key): array => ['foo' => $value]));
 
-// Should be fixed in Laravel
 assertType('Illuminate\Database\Eloquent\Collection<int, App\User|string>', $collection->mergeRecursive([2 => 'foo']));
 assertType('App\TransactionCollection<int, App\Transaction>', $customEloquentCollection->mergeRecursive([1 => new Transaction()]));
+assertType('App\UserCollection', $secondCustomEloquentCollection->mergeRecursive([1 => new User()]));
 assertType('Illuminate\Support\Collection<string, int>', $items->mergeRecursive(['foo' => 2]));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, int>', $collection->combine([1]));
 assertType('App\TransactionCollection<int, int>', $customEloquentCollection->combine([1]));
+assertType('App\UserCollection', $secondCustomEloquentCollection->combine([1]));
 assertType('Illuminate\Support\Collection<string, string>', $items->combine(['foo']));
 
 assertType('App\User|Illuminate\Database\Eloquent\Collection<int, App\User>|null', $collection->pop(1));
 assertType('App\Transaction|App\TransactionCollection<int, App\Transaction>|null', $customEloquentCollection->pop(2));
+assertType('App\User|App\UserCollection|null', $secondCustomEloquentCollection->pop(2));
 assertType('Illuminate\Support\Collection<int, int>|int|null', $items->pop(3));
 
 assertType('App\User|Illuminate\Database\Eloquent\Collection<int, App\User>', $collection->random(1));
 assertType('App\Transaction|App\TransactionCollection<int, App\Transaction>', $customEloquentCollection->random(2));
+assertType('App\User|App\UserCollection', $secondCustomEloquentCollection->random(2));
 assertType('Illuminate\Support\Collection<int, int>|int', $items->random(3));
 
 assertType('App\User|Illuminate\Database\Eloquent\Collection<int, App\User>|null', $collection->shift(1));
 assertType('App\Transaction|App\TransactionCollection<int, App\Transaction>|null', $customEloquentCollection->shift(2));
+assertType('App\User|App\UserCollection|null', $secondCustomEloquentCollection->shift(2));
 assertType('Illuminate\Support\Collection<int, int>|int|null', $items->shift(3));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Collection<int, App\User>>', $collection->sliding(1));
 assertType('App\TransactionCollection<int, App\TransactionCollection<int, App\Transaction>>', $customEloquentCollection->sliding(2));
+assertType('App\UserCollection', $secondCustomEloquentCollection->sliding(2));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<string, int>>', $items->sliding(3));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Collection<int, App\User>>', $collection->split(1));
 assertType('App\TransactionCollection<int, App\TransactionCollection<int, App\Transaction>>', $customEloquentCollection->split(2));
+assertType('App\UserCollection', $secondCustomEloquentCollection->split(2));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<string, int>>', $items->split(3));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Collection<int, App\User>>', $collection->splitIn(1));
 assertType('App\TransactionCollection<int, App\TransactionCollection<int, App\Transaction>>', $customEloquentCollection->splitIn(2));
+assertType('App\UserCollection', $secondCustomEloquentCollection->splitIn(2));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<string, int>>', $items->splitIn(3));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Collection<int, App\User>>', $collection->chunk(1));
 assertType('App\TransactionCollection<int, App\TransactionCollection<int, App\Transaction>>', $customEloquentCollection->chunk(2));
+assertType('App\UserCollection', $secondCustomEloquentCollection->chunk(2));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<string, int>>', $items->chunk(3));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Collection<int, App\User>>', $collection->chunkWhile(fn (User $u) => $u->id > 5));
 assertType('App\TransactionCollection<int, App\TransactionCollection<int, App\Transaction>>', $customEloquentCollection->chunkWhile(fn (Transaction $t) => $t->id > 5));
+assertType('App\UserCollection', $secondCustomEloquentCollection->chunkWhile(fn (Transaction $t) => $t->id > 5));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<int, int>>', $items->chunkWhile(fn ($v) => $v > 5));
 
 assertType('Illuminate\Database\Eloquent\Collection<int, App\User>', $collection->values());
 assertType('App\TransactionCollection<int, App\Transaction>', $customEloquentCollection->values());
+assertType('App\UserCollection', $secondCustomEloquentCollection->values());
 assertType('Illuminate\Support\Collection<int, int>', $items->values());
 
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<int, App\User|int>>', $collection->zip([1]));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<int, App\Transaction|string>>', $customEloquentCollection->zip(['foo']));
+assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<int, App\User|string>>', $secondCustomEloquentCollection->zip(['foo']));
 assertType('Illuminate\Support\Collection<int, Illuminate\Support\Collection<int, int|string>>', $items->zip(['foo', 'bar']));
 
 assertType('Illuminate\Database\Eloquent\Collection<int<0, 1>, Illuminate\Database\Eloquent\Collection<int, App\User>>', $collection->partition('foo'));
 assertType('App\TransactionCollection<int<0, 1>, App\TransactionCollection<int, App\Transaction>>', $customEloquentCollection->partition('foo'));
+assertType('App\UserCollection', $secondCustomEloquentCollection->partition('foo'));
 assertType('Illuminate\Support\Collection<int<0, 1>, Illuminate\Support\Collection<string, int>>', $items->partition('foo'));
 
 assertType('Illuminate\Support\Collection<int, App\User|int>', $collection->pad(10, 10));
 assertType('Illuminate\Support\Collection<int, App\Transaction|string>', $customEloquentCollection->pad(10, 'foo'));
+assertType('Illuminate\Support\Collection<int, App\User|string>', $secondCustomEloquentCollection->pad(10, 'foo'));
 assertType('Illuminate\Support\Collection<int, int|string>', $items->pad(1, 'bar'));
 
-// Should be fixed in Laravel
 assertType('Illuminate\Database\Eloquent\Collection<(int|string), int>', $collection->countBy('email'));
 assertType('App\TransactionCollection<(int|string), int>', $customEloquentCollection->countBy('foo'));
+assertType('App\UserCollection', $secondCustomEloquentCollection->countBy('foo'));
 assertType('Illuminate\Support\Collection<(int|string), int>', $items->countBy('bar'));
 
 ////////////////////////////