Merge remote-tracking branch 'origin/1.23.x' into 2.0.x

Author: ondrejmirtes

src/Ast/Type/ArrayShapeNode.php

@@ -10,6 +10,8 @@ class ArrayShapeNode implements TypeNode
 
 	public const KIND_ARRAY = 'array';
 	public const KIND_LIST = 'list';
+	public const KIND_NON_EMPTY_ARRAY = 'non-empty-array';
+	public const KIND_NON_EMPTY_LIST = 'non-empty-list';
 
 	use NodeAttributes;
 

src/Parser/TypeParser.php

@@ -166,7 +166,13 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
 				} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
 					$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
 
-				} elseif (in_array($type->name, ['array', 'list', 'object'], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
+				} elseif (in_array($type->name, [
+					Ast\Type\ArrayShapeNode::KIND_ARRAY,
+					Ast\Type\ArrayShapeNode::KIND_LIST,
+					Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+					Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_LIST,
+					'object',
+				], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
 					if ($type->name === 'object') {
 						$type = $this->parseObjectShape($tokens);
 					} else {
@@ -665,7 +671,13 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo
 							$startIndex,
 						));
 
-					} elseif (in_array($type->name, ['array', 'list', 'object'], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
+					} elseif (in_array($type->name, [
+						Ast\Type\ArrayShapeNode::KIND_ARRAY,
+						Ast\Type\ArrayShapeNode::KIND_LIST,
+						Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+						Ast\Type\ArrayShapeNode::KIND_NON_EMPTY_LIST,
+						'object',
+					], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
 						if ($type->name === 'object') {
 							$type = $this->parseObjectShape($tokens);
 						} else {

tests/PHPStan/Parser/TypeParserTest.php

@@ -767,6 +767,84 @@ public function provideParseData(): array
 					ArrayShapeNode::KIND_LIST,
 				),
 			],
+			[
+				'non-empty-array{
+				 	int,
+				 	string
+				 }',
+				ArrayShapeNode::createSealed(
+					[
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('int'),
+						),
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('string'),
+						),
+					],
+					ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+				),
+			],
+			[
+				'callable(): non-empty-array{int, string}',
+				new CallableTypeNode(new IdentifierTypeNode('callable'), [], ArrayShapeNode::createSealed(
+					[
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('int'),
+						),
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('string'),
+						),
+					],
+					ArrayShapeNode::KIND_NON_EMPTY_ARRAY,
+				), []),
+			],
+			[
+				'callable(): non-empty-list{int, string}',
+				new CallableTypeNode(new IdentifierTypeNode('callable'), [], ArrayShapeNode::createSealed(
+					[
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('int'),
+						),
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('string'),
+						),
+					],
+					ArrayShapeNode::KIND_NON_EMPTY_LIST,
+				), []),
+			],
+			[
+				'non-empty-list{
+				 	int,
+				 	string
+				 }',
+				ArrayShapeNode::createSealed(
+					[
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('int'),
+						),
+						new ArrayShapeItemNode(
+							null,
+							false,
+							new IdentifierTypeNode('string'),
+						),
+					],
+					ArrayShapeNode::KIND_NON_EMPTY_LIST,
+				),
+			],
 			[
 				'array{...<string>}',
 				ArrayShapeNode::createUnsealed(