Missing attributes for object shapes

phpstan · Apr 24, 2023 · b5fede3 · b5fede3
1 parent cff97e9
commit b5fede3
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 2 deletions.
diff --git a/src/Parser/TypeParser.php b/src/Parser/TypeParser.php
@@ -713,12 +713,15 @@ private function parseObjectShape(TokenIterator $tokens): Ast\Type\ObjectShapeNo
 	/** @phpstan-impure */
 	private function parseObjectShapeItem(TokenIterator $tokens): Ast\Type\ObjectShapeItemNode
 	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
 		$key = $this->parseObjectShapeKey($tokens);
 		$optional = $tokens->tryConsumeTokenType(Lexer::TOKEN_NULLABLE);
 		$tokens->consumeTokenType(Lexer::TOKEN_COLON);
 		$value = $this->parse($tokens);
 
-		return new Ast\Type\ObjectShapeItemNode($key, $optional, $value);
+		return $this->enrichWithAttributes($tokens, new Ast\Type\ObjectShapeItemNode($key, $optional, $value), $startLine, $startIndex);
 	}
 
 	/**
@@ -727,6 +730,9 @@ private function parseObjectShapeItem(TokenIterator $tokens): Ast\Type\ObjectSha
 	 */
 	private function parseObjectShapeKey(TokenIterator $tokens)
 	{
+		$startLine = $tokens->currentTokenLine();
+		$startIndex = $tokens->currentTokenIndex();
+
 		if ($tokens->isCurrentTokenType(Lexer::TOKEN_SINGLE_QUOTED_STRING)) {
 			if ($this->quoteAwareConstExprString) {
 				$key = new Ast\ConstExpr\QuoteAwareConstExprStringNode(StringUnescaper::unescapeString($tokens->currentTokenValue()), Ast\ConstExpr\QuoteAwareConstExprStringNode::SINGLE_QUOTED);
@@ -748,7 +754,7 @@ private function parseObjectShapeKey(TokenIterator $tokens)
 			$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
 		}
 
-		return $key;
+		return $this->enrichWithAttributes($tokens, $key, $startLine, $startIndex);
 	}
 
 }
diff --git a/tests/PHPStan/Parser/TypeParserTest.php b/tests/PHPStan/Parser/TypeParserTest.php
@@ -2111,6 +2111,64 @@ static function (TypeNode $typeNode): TypeNode {
 				],
 			],
 		];
+
+		yield [
+			'object{foo: int}',
+			[
+				[
+					static function (TypeNode $typeNode): TypeNode {
+						return $typeNode;
+					},
+					'object{foo: int}',
+					1,
+					1,
+					0,
+					6,
+				],
+				[
+					static function (ObjectShapeNode $typeNode): TypeNode {
+						return $typeNode->items[0];
+					},
+					'foo: int',
+					1,
+					1,
+					2,
+					5,
+				],
+			],
+		];
+
+		yield [
+			'object{}',
+			[
+				[
+					static function (TypeNode $typeNode): TypeNode {
+						return $typeNode;
+					},
+					'object{}',
+					1,
+					1,
+					0,
+					2,
+				],
+			],
+		];
+
+		yield [
+			'object{}[]',
+			[
+				[
+					static function (TypeNode $typeNode): TypeNode {
+						return $typeNode;
+					},
+					'object{}[]',
+					1,
+					1,
+					0,
+					4,
+				],
+			],
+		];
 	}
 
 	/**