add nowdoc

stanning

linting, stanning

add visibility

use nowdoc in a few more places

Author: shmax

src/Parser/TypeParser.php

@@ -944,12 +944,31 @@ private function parseObjectShapeItem(TokenIterator $tokens): Ast\Type\ObjectSha
 		$startLine = $tokens->currentTokenLine();
 		$startIndex = $tokens->currentTokenIndex();
 
+		// parse any comments above the item
+		$comments = [];
+		while (1) {
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+				continue;
+			} elseif ($tokens->currentTokenType() === Lexer::TOKEN_COMMENT) {
+				$comments[] = new Ast\Comment($tokens->currentTokenValue(), $tokens->currentTokenLine(), $tokens->currentTokenIndex());
+				$tokens->next();
+			} else {
+				break;
+			}
+		}
+
 		$key = $this->parseObjectShapeKey($tokens);
 		$optional = $tokens->tryConsumeTokenType(Lexer::TOKEN_NULLABLE);
 		$tokens->consumeTokenType(Lexer::TOKEN_COLON);
 		$value = $this->parse($tokens);
 
-		return $this->enrichWithAttributes($tokens, new Ast\Type\ObjectShapeItemNode($key, $optional, $value), $startLine, $startIndex);
+		return $this->enrichWithAttributes(
+			$tokens,
+			new Ast\Type\ObjectShapeItemNode($key, $optional, $value),
+			$startLine,
+			$startIndex,
+			$comments
+		);
 	}
 
 	/**

tests/PHPStan/Parser/TypeParserTest.php

@@ -1966,6 +1966,7 @@ public function provideParseData(): array
 			],
 			[
 				'object{
+					// a is for apple
 				 	a: int,
 				 }',
 				new ObjectShapeNode([
@@ -1979,6 +1980,9 @@ public function provideParseData(): array
 			[
 				'object{
 				 	a: int,
+				 	/*
+				 	 * b is for banana
+				 	 */
 				 	b: string,
 				 }',
 				new ObjectShapeNode([