fix: collect() returns collection which can have array-key as key type

larastan · Feb 28, 2022 · b0a50df · b0a50df
1 parent b3413da
commit b0a50df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ReturnTypes/Helpers/CollectExtension.php b/src/ReturnTypes/Helpers/CollectExtension.php
@@ -9,10 +9,12 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Type\BenevolentUnionType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 
 final class CollectExtension implements DynamicFunctionReturnTypeExtension
@@ -38,7 +40,7 @@ public function getTypeFromFunctionCall(
         Scope $scope
     ): Type {
         if (count($functionCall->getArgs()) < 1) {
-            return new GenericObjectType(Collection::class, [new IntegerType(), new MixedType()]);
+            return new GenericObjectType(Collection::class, [new BenevolentUnionType([new IntegerType(), new StringType()]), new MixedType()]);
         }
 
         $valueType = $scope->getType($functionCall->getArgs()[0]->value);

diff --git a/tests/Type/data/collection-helper.php b/tests/Type/data/collection-helper.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Collection;
 use function PHPStan\Testing\assertType;
 
-assertType('Illuminate\Support\Collection<int, mixed>', collect());
+assertType('Illuminate\Support\Collection<(int|string), mixed>', collect());
 assertType('Illuminate\Support\Collection<0, 1>', collect(1));
 assertType('Illuminate\Support\Collection<0, \'foo\'>', collect('foo'));
 assertType('Illuminate\Support\Collection<0, 3.14>', collect(3.14));