Array shape from general array with single finite key

Author: ondrejmirtes

phpstan-baseline.neon

@@ -210,6 +210,12 @@ parameters:
 count: 1
 path: src/PhpDoc/TypeNodeResolver.php
 
+-
+message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
+identifier: phpstanApi.instanceofType
+count: 1
+path: src/PhpDoc/TypeNodeResolver.php
+
 -
 message: '#^Doing instanceof PHPStan\\Type\\Generic\\GenericObjectType is error\-prone and deprecated\.$#'
 identifier: phpstanApi.instanceofType

src/PhpDoc/TypeNodeResolver.php

@@ -664,11 +664,21 @@ 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], new UnionType([
+$keyType = TypeCombinator::intersect($genericTypes[0]->toArrayKey(), new UnionType([
 new IntegerType(),
 new StringType(),
-]));
-$arrayType = new ArrayType($keyType->toArrayKey(), $genericTypes[1]);
+]))->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]);
+$arrayType = TypeCombinator::union($arrayBuilder->getArray(), ConstantArrayTypeBuilder::createEmpty()->getArray());
+} else {
+$arrayType = new ArrayType($keyType, $genericTypes[1]);
+}
 } else {
 return new ErrorType();
 }

tests/PHPStan/Analyser/nsrt/array-intersect-key.php

@@ -45,7 +45,7 @@ public function normalArrays(array $arr, array $arr2, array $otherArrs): void
 /** @var array<17, int> $otherArrs */
 assertType('array<17, string>', array_intersect_key($arr, $otherArrs));
 /** @var array<null, int> $otherArrs */
-assertType('array{}', array_intersect_key($arr, $otherArrs));
+assertType('array<\'\', string>', array_intersect_key($arr, $otherArrs));
 
 if (array_key_exists(17, $arr2)) {
 assertType('non-empty-array<17, string>&hasOffset(17)', array_intersect_key($arr2, [17 => 'bar']));

tests/PHPStan/Analyser/nsrt/array-shape-from-general-array-with-single-finite-key.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace ArrayShapeFromGeneralArrayWithSingleFiniteKey;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+/**
+ * @param array<1, string> $a
+ */
+public function doFoo(array $a): void
+{
+assertType('array{}|array{1: string}', $a);
+}
+
+/**
+ * @param non-empty-array<1, string> $a
+ */
+public function doBar(array $a): void
+{
+assertType('array{1: string}', $a);
+}
+
+}

tests/PHPStan/Analyser/nsrt/bug-5287-php81.php

@@ -48,7 +48,7 @@ function foo4(array $arr): void
 function foo5(array $arr): void
 {
 $arrSpread = [...$arr];
-assertType('non-empty-array<int|string, bool|int>', $arrSpread);
+assertType('non-empty-array<bool|int>', $arrSpread);
 }
 
 /**

tests/PHPStan/Rules/PhpDoc/IncompatiblePhpDocTypeRuleTest.php

@@ -216,10 +216,6 @@ public function testBug3753(): void
 'PHPDoc tag @param for parameter $foo contains unresolvable type.',
 20,
 ],
-[
-'PHPDoc tag @param for parameter $bars contains unresolvable type.',
-28,
-],
 ]);
 }
 
@@ -291,10 +287,6 @@ public function testParamOut(): void
 'Parameter $i for PHPDoc tag @param-out is not passed by reference.',
 37,
 ],
-[
-'PHPDoc tag @param-out for parameter $i contains unresolvable type.',
-44,
-],
 [
 'PHPDoc tag @param-out for parameter $i contains generic type Exception<int, float> but class Exception is not generic.',
 51,