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/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();