List shapes

phpstan · Feb 10, 2023 · 0e2e1b8 · 0e2e1b8
1 parent e6ba509
commit 0e2e1b8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -823,7 +823,12 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name
 			$builder->setOffsetValueType($offsetType, $this->resolve($itemNode->valueType, $nameScope), $itemNode->optional);
 		}
 
-		return $builder->getArray();
+		$arrayType = $builder->getArray();
+		if ($typeNode->kind === ArrayShapeNode::KIND_LIST) {
+			$arrayType = AccessoryArrayListType::intersectWith($arrayType);
+		}
+
+		return $arrayType;
 	}
 
 	private function resolveConstTypeNode(ConstTypeNode $typeNode, NameScope $nameScope): Type

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1180,6 +1180,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8775.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8752.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/trait-instance-of.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/list-shapes.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/list-shapes.php b/tests/PHPStan/Analyser/data/list-shapes.php
@@ -0,0 +1,26 @@
+<?php
+namespace ListShapes;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	/**
+	 * @param list{} $l1
+	 * @param list{'a'} $l2
+	 * @param list{0: 'a'} $l3
+	 * @param list{0: 'a', 1: 'b'} $l4
+	 * @param list{0: 'a', 1?: 'b'} $l5
+	 * @param list{'a', 'b', ...} $l6
+	 */
+	public function bar($l1, $l2, $l3, $l4, $l5, $l6): void
+	{
+		// TODO: list{}
+		assertType('array{}', $l1);
+		assertType("array{'a'}", $l2);
+		assertType("array{'a'}", $l3);
+		assertType("array{'a', 'b'}", $l4);
+		assertType("array{0: 'a', 1?: 'b'}", $l5);
+		assertType("array{'a', 'b'}", $l6);
+	}
+}