Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 8a1b0c7

Browse files
shmaxondrejmirtes
authored andcommitted
commas on next line
1 parent e81bfd8 commit 8a1b0c7

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

‎src/Parser/TypeParser.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type)
224224
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
225225
$items = [$this->parseArrayShapeItem($tokens)];
226226

227+
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
227228
while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
228229
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
229230
if($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET)) {
@@ -232,6 +233,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type)
232233
}
233234

234235
$items[] = $this->parseArrayShapeItem($tokens);
236+
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
235237
}
236238

237239
$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);

‎tests/PHPStan/Parser/TypeParserTest.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,30 @@ public function provideParseData(): array
507507
),
508508
]),
509509
],
510+
[
511+
'array{
512+
a: int
513+
, b: string
514+
, c: string
515+
}',
516+
new ArrayShapeNode([
517+
new ArrayShapeItemNode(
518+
new IdentifierTypeNode('a'),
519+
false,
520+
new IdentifierTypeNode('int')
521+
),
522+
new ArrayShapeItemNode(
523+
new IdentifierTypeNode('b'),
524+
false,
525+
new IdentifierTypeNode('string')
526+
),
527+
new ArrayShapeItemNode(
528+
new IdentifierTypeNode('c'),
529+
false,
530+
new IdentifierTypeNode('string')
531+
),
532+
]),
533+
],
510534
[
511535
'array{
512536
a: int,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /