Simplify

Author: VincentLanglet

src/PhpDoc/TypeNodeResolver.php

@@ -1065,7 +1065,7 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name
 			ArrayShapeNode::KIND_NON_EMPTY_LIST,
 		], true);
 
-		$arrayType = $isList ? $builder->getList() : $builder->getArray();
+		$arrayType = $builder->getArray($isList);
 
 		$accessories = [];
 		if ($isList) {

src/Type/Constant/ConstantArrayType.php

@@ -61,6 +61,7 @@
 use function count;
 use function implode;
 use function in_array;
+use function is_int;
 use function is_string;
 use function min;
 use function pow;
@@ -1812,23 +1813,21 @@ public function makeOffsetRequired(Type $offsetType): self
 			}
 
 			$keyValue = $keyType->getValue();
-			$changed = false;
 			foreach ($optionalKeys as $j => $key) {
 				if (
 					$i === $key
 					|| (
 						$isList
-						&& \is_int($keyValue)
-						&& \is_int($this->keyTypes[$key]->getValue())
+						&& is_int($keyValue)
+						&& is_int($this->keyTypes[$key]->getValue())
 						&& $this->keyTypes[$key]->getValue() < $keyValue
 					)
 				) {
 					unset($optionalKeys[$j]);
-					$changed = true;
 				}
 			}
 
-			if ($changed) {
+			if (count($this->optionalKeys) !== count($optionalKeys)) {
 				return new self($this->keyTypes, $this->valueTypes, $this->nextAutoIndexes, array_values($optionalKeys), $this->isList);
 			}
 

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -325,8 +325,16 @@ public function disableArrayDegradation(): void
 		$this->disableArrayDegradation = true;
 	}
 
-	public function getArray(): Type
+	public function getArray(bool $forceList = false): Type
 	{
+		if ($forceList) {
+			if ($this->isList->no()) {
+				return new NeverType();
+			}
+
+			$this->isList = TrinaryLogic::createYes();
+		}
+
 		$keyTypesCount = count($this->keyTypes);
 		if ($keyTypesCount === 0) {
 			return new ConstantArrayType([], []);
@@ -376,17 +384,6 @@ 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

@@ -503,7 +503,17 @@ public function testIssetConstantArray(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;
 
-		$this->analyse([__DIR__ . '/data/isset-constant-array.php'], []);
+		$this->analyse([__DIR__ . '/data/isset-constant-array.php'], [
+			[
+				'Offset 2 on list{0: string, 1: string, 2: string, 3: string, 4?: string} in isset() always exists and is not nullable.',
+				13,
+			],
+			[
+				'Offset 3 on array{string, string, string, string, string} in isset() always exists and is not nullable.',
+				17,
+			],
+
+		]);
 	}
 
 	public function testBug10640(): void