Merge branch refs/heads/1.10.x into 1.11.x

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -5063,7 +5063,10 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 						return $type->getBound();
 					}
 
-					if ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)')) {
+					$isArrayKey = $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)';
+					if ($newType->isScalar()->yes() && !$type->getVariance()->covariant() && $isArrayKey) {
+						$newType = $newType->generalize(GeneralizePrecision::templateArgument());
+					} elseif ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $isArrayKey)) {
 						$newType = $newType->generalize(GeneralizePrecision::templateArgument());
 					}
 

src/Reflection/ResolvedFunctionVariant.php

@@ -184,7 +184,10 @@ private function resolveResolvableTemplateTypes(Type $type, TemplateTypeVariance
 					return $traverse($type);
 				}
 
-				if ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)')) {
+				$isArrayKey = $type->getBound()->describe(VerbosityLevel::precise()) === '(int|string)';
+				if ($newType->isScalar()->yes() && !$type->getVariance()->covariant() && $isArrayKey) {
+					$newType = $newType->generalize(GeneralizePrecision::templateArgument());
+				} elseif ($newType->isConstantValue()->yes() && (!$type->getBound()->isScalar()->yes() || $isArrayKey)) {
 					$newType = $newType->generalize(GeneralizePrecision::templateArgument());
 				}
 

tests/PHPStan/Analyser/data/generics-do-not-generalize.php

@@ -2,6 +2,7 @@
 
 namespace GenericsDoNotGeneralize;
 
+use ArrayIterator;
 use function PHPStan\Testing\assertType;
 
 /**
@@ -91,3 +92,28 @@ function (): void {
 
 	assertType('list<1|2>', $bar);
 };
+
+function (): void {
+	/** @var list<string> $a */
+	$a = doFoo();
+
+	assertType('ArrayIterator<int, string>', new ArrayIterator($a));
+};
+
+/**
+ * @template K of array-key
+ * @template V
+ * @param array<K, V> $a
+ * @return ArrayIterator<K, V>
+ */
+function createArrayIterator(array $a): ArrayIterator
+{
+
+}
+
+function (): void {
+	/** @var list<string> $a */
+	$a = doFoo();
+
+	assertType('ArrayIterator<int, string>', createArrayIterator($a));
+};