Support for non-empty-array and non-empty-list array shape kind

ondrejmirtes · ondrejmirtes · commit 107a7e38e217 · 2024-10-13T13:40:09.000+02:00
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -1016,10 +1016,20 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name
 		}
 
 		$arrayType = $builder->getArray();
-		if ($typeNode->kind === ArrayShapeNode::KIND_LIST) {
+		if (in_array($typeNode->kind, [
+			ArrayShapeNode::KIND_LIST,
+			ArrayShapeNode::KIND_NON_EMPTY_LIST,
+		], true)) {
 			$arrayType = AccessoryArrayListType::intersectWith($arrayType);
 		}
 
+		if (in_array($typeNode->kind, [
+			ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+			ArrayShapeNode::KIND_NON_EMPTY_LIST,
+		], true)) {
+			$arrayType = TypeCombinator::intersect($arrayType, new NonEmptyArrayType());
+		}
+
 		return $arrayType;
 	}
 
diff --git a/tests/PHPStan/Analyser/nsrt/array-shape-list-optional.php b/tests/PHPStan/Analyser/nsrt/array-shape-list-optional.php
@@ -9,16 +9,22 @@ class Foo
 
 	/**
 	 * @param list{0: string, 1: int, 2?: string, 3?: string} $valid1
+	 * @param non-empty-list{0: string, 1: int, 2?: string, 3?: string} $valid2
+	 * @param non-empty-array{0?: string, 1?: int, 2?: string, 3?: string} $valid3
 	 * @param list{0: string, 1: int, 2?: string, 4?: string} $invalid1
 	 * @param list{0: string, 1: int, 2?: string, foo?: string} $invalid2
 	 */
 	public function doFoo(
 		$valid1,
+		$valid2,
+		$valid3,
 		$invalid1,
 		$invalid2
 	): void
 	{
 		assertType('array{0: string, 1: int, 2?: string, 3?: string}&list', $valid1);
+		assertType('array{0: string, 1: int, 2?: string, 3?: string}&list', $valid2);
+		assertType('array{0?: string, 1?: int, 2?: string, 3?: string}&non-empty-array', $valid3);
 		assertType('*NEVER*', $invalid1);
 		assertType('*NEVER*', $invalid2);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1016,10 +1016,20 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name`
`1016`	`1016`	`}`
`1017`	`1017`
`1018`	`1018`	`$arrayType = $builder->getArray();`
`1019`		`- if ($typeNode->kind === ArrayShapeNode::KIND_LIST) {`
	`1019`	`+ if (in_array($typeNode->kind, [`
	`1020`	`+ ArrayShapeNode::KIND_LIST,`
	`1021`	`+ ArrayShapeNode::KIND_NON_EMPTY_LIST,`
	`1022`	`+ ], true)) {`
`1020`	`1023`	`$arrayType = AccessoryArrayListType::intersectWith($arrayType);`
`1021`	`1024`	`}`
`1022`	`1025`
	`1026`	`+ if (in_array($typeNode->kind, [`
	`1027`	`+ ArrayShapeNode::KIND_NON_EMPTY_ARRAY,`
	`1028`	`+ ArrayShapeNode::KIND_NON_EMPTY_LIST,`
	`1029`	`+ ], true)) {`
	`1030`	`+ $arrayType = TypeCombinator::intersect($arrayType, new NonEmptyArrayType());`
	`1031`	`+ }`
	`1032`	`+`
`1023`	`1033`	`return $arrayType;`
`1024`	`1034`	`}`
`1025`	`1035`