POC force list in ConstantArrayTypeBuilder

Author: VincentLanglet

src/PhpDoc/TypeNodeResolver.php

@@ -1060,13 +1060,15 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name
 			$builder->setOffsetValueType($offsetType, $this->resolve($itemNode->valueType, $nameScope), $itemNode->optional);
 		}
 
-		$arrayType = $builder->getArray();
-
-		$accessories = [];
-		if (in_array($typeNode->kind, [
+		$isList = in_array($typeNode->kind, [
 			ArrayShapeNode::KIND_LIST,
 			ArrayShapeNode::KIND_NON_EMPTY_LIST,
-		], true)) {
+		], true);
+
+		$arrayType = $isList ? $builder->getList() : $builder->getArray();
+
+		$accessories = [];
+		if ($isList) {
 			$accessories[] = new AccessoryArrayListType();
 		}
 

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -11,6 +11,7 @@
 use PHPStan\Type\CallableType;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\IntersectionType;
+use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
@@ -375,6 +376,17 @@ public function getArray(): Type
 		return new IntersectionType([$array, ...$types]);
 	}
 
+	public function getList(): Type
+	{
+		if ($this->isList->no()) {
+			return new NeverType();
+		}
+
+		$this->isList = TrinaryLogic::createYes();
+
+		return $this->getArray();
+	}
+
 	public function isList(): bool
 	{
 		return $this->isList->yes();

tests/PHPStan/Rules/Variables/IssetRuleTest.php

@@ -499,6 +499,13 @@ public function testPr4374(): void
 		]);
 	}
 
+	public function testIssetConstantArray(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+
+		$this->analyse([__DIR__ . '/data/isset-constant-array.php'], []);
+	}
+
 	public function testBug10640(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;

tests/PHPStan/Rules/Variables/data/isset-constant-array.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types = 1);
+
+namespace IssetConstantArray;
+
+class HelloWorld
+{
+	/**
+	 * @param list{0: string, 1: string, 2?: string, 3?: string, 4?: string} $list
+	 */
+	public function sayHello(array $list): bool
+	{
+		if (isset($list[3])) {
+			return isset($list[2]); // offset 3 implies offset 2;
+		}
+
+		if (isset($list[4])) {
+			return isset($list[3]); // offset 4 implies offset 3;
+		}
+
+		return false;
+	}
+}