Fix phpstan/phpstan#10231: Using generics to return array with value-of of an inner passed array results in array<int|string, list<*ERROR*>>

src/PhpDoc/TypeNodeResolver.php

@@ -85,6 +85,7 @@
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\KeyOfType;
+use PHPStan\Type\LateResolvableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NewObjectType;
 use PHPStan\Type\NonAcceptingNeverType;
@@ -678,20 +679,24 @@ static function (string $variance): TemplateTypeVariance {
 			if (count($genericTypes) === 1) { // array<ValueType>
 				$arrayType = new ArrayType(new BenevolentUnionType([new IntegerType(), new StringType()]), $genericTypes[0]);
 			} elseif (count($genericTypes) === 2) { // array<KeyType, ValueType>
-				$keyType = TypeCombinator::intersect($genericTypes[0]->toArrayKey(), new UnionType([
-					new IntegerType(),
-					new StringType(),
-				]))->toArrayKey();
-				$finiteTypes = $keyType->getFiniteTypes();
-				if (
-					count($finiteTypes) === 1
-					&& ($finiteTypes[0] instanceof ConstantStringType || $finiteTypes[0] instanceof ConstantIntegerType)
-				) {
-					$arrayBuilder = ConstantArrayTypeBuilder::createEmpty();
-					$arrayBuilder->setOffsetValueType($finiteTypes[0], $genericTypes[1], true);
-					$arrayType = $arrayBuilder->getArray();
+				if ($genericTypes[0] instanceof LateResolvableType) {
+					$arrayType = new ArrayType($genericTypes[0], $genericTypes[1]);
 				} else {
-					$arrayType = new ArrayType($keyType, $genericTypes[1]);
+					$keyType = TypeCombinator::intersect($genericTypes[0]->toArrayKey(), new UnionType([
+						new IntegerType(),
+						new StringType(),
+					]))->toArrayKey();
+					$finiteTypes = $keyType->getFiniteTypes();
+					if (
+						count($finiteTypes) === 1
+						&& ($finiteTypes[0] instanceof ConstantStringType || $finiteTypes[0] instanceof ConstantIntegerType)
+					) {
+						$arrayBuilder = ConstantArrayTypeBuilder::createEmpty();
+						$arrayBuilder->setOffsetValueType($finiteTypes[0], $genericTypes[1], true);
+						$arrayType = $arrayBuilder->getArray();
+					} else {
+						$arrayType = new ArrayType($keyType, $genericTypes[1]);
+					}
 				}
 			} else {
 				return new ErrorType();

src/Type/TypehintHelper.php

@@ -123,7 +123,7 @@
 				($type->isCallable()->yes() && $phpDocType->isCallable()->yes())
 				|| (
 					(!$phpDocType instanceof NeverType || ($type instanceof MixedType && !$type->isExplicitMixed()))
-					&& $type->isSuperTypeOf(TemplateTypeHelper::resolveToBounds($phpDocType))->yes()
+					&& $type->isSuperTypeOf(TypeUtils::resolveLateResolvableTypes(TemplateTypeHelper::resolveToBounds($phpDocType)))->yes()
 				)
 			) {
 				$resultType = $phpDocType;

src/Type/ValueOfType.php

@@ -81,7 +81,15 @@ protected function getResult(): Type
 			return new UnionType($valueTypes);
 		}
 
-		return $this->type->getIterableValueType();
+		$iterableValueType = $this->type->getIterableValueType();
+		if ($iterableValueType instanceof ErrorType && $this->type instanceof LateResolvableType) {
+			$resolvedType = $this->type->resolve();
+			if (!$resolvedType instanceof ErrorType) {
+				return $resolvedType;
+			}
+		}
+
+		return $iterableValueType;
 	}
 
 	/**

tests/PHPStan/Analyser/nsrt/bug-10231.php

@@ -0,0 +1,48 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace Bug10231;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	/**
+	 * @template TGroupColumnName of array-key
+	 * @template TValueColumnName of array-key
+	 * @template TArray of array
+	 * @param array<TArray> $input
+	 * @param TGroupColumnName $groupByColumn
+	 * @param TValueColumnName $valueColumnName
+	 *
+	 * @return array<
+	 *   value-of<TArray[TGroupColumnName]>,
+	 *   list<value-of<TArray[TValueColumnName]>>
+	 * >
+	 */
+	public static function groupByColumn(array $input, string|int $groupByColumn, string|int $valueColumnName): array
+	{
+		$output = [];
+		foreach ($input as $result) {
+			$output[$result[$groupByColumn]][] = $result[$valueColumnName];
+		}
+
+		return $output;
+	}
+}
+
+/** @var array<array{event_id: string, id: int}> $input */
+$input = [
+	['event_id' => '111', 'id' => 1],
+	['event_id' => '111', 'id' => 2],
+	['event_id' => '222', 'id' => 99],
+];
+
+$result = HelloWorld::groupByColumn(
+	$input,
+	'event_id',
+	'id',
+);
+
+assertType('array<string, list<int>>', $result);