tmp wip

phpstan · Dec 12, 2023 · 7aa327e · 7aa327e
1 parent 44ec189
commit 7aa327e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -5089,8 +5089,11 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 		foreach ($resolvedPhpDoc->getTemplateTags() as $tag) {
 			$templateType = $typeMap->getType($tag->getName());
 			$bound = $tag->getBound();
-			if ($templateType !== null) {
-				if ($templateType->isConstantValue()->yes() && (!$bound->isScalar()->yes() || $bound->describe(VerbosityLevel::precise()) === '(int|string)')) {
+			if ($templateType !== null && !$tag->getVariance()->covariant()) {
+				$isArrayKey = $bound->describe(VerbosityLevel::precise()) === '(int|string)';
+				if ($templateType->isScalar()->yes() && $isArrayKey) {
+					$templateType = $templateType->generalize(GeneralizePrecision::templateArgument());
+				} elseif ($templateType->isConstantValue()->yes() && (!$bound->isScalar()->yes() || $isArrayKey)) {
 					$templateType = $templateType->generalize(GeneralizePrecision::templateArgument());
 				}
 				$list[] = $templateType;