Commit 03768b2

committed

Disallow whitespaces between 'array' and '{'

1 parent e8fa232 commit 03768b2Copy full SHA for 03768b2

File tree

3 files changed

+14

-3

lines changed

src/Parser
- TokenIterator.php
- TypeParser.php
tests/PHPStan/Parser
- TypeParserTest.php

3 files changed

+14

-3

lines changed

`‎src/Parser/TokenIterator.php`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ public function isCurrentTokenType(int $tokenType): bool`
`64`	`64`	`}`
`65`	`65`
`66`	`66`
	`67`	`+ public function isPrecededByHorizontalWhitespace(): bool`
	`68`	`+ {`
	`69`	`+ return ($this->tokens[$this->index - 1][Lexer::TYPE_OFFSET] ?? -1) === Lexer::TOKEN_HORIZONTAL_WS;`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`/**`
`68`	`73`	`* @param int $tokenType`
`69`	`74`	`* @throws \PHPStan\PhpDocParser\Parser\ParserException`

`‎src/Parser/TypeParser.php`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode`
`54`	`54`	`} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {`
`55`	`55`	`$type = $this->tryParseArray($tokens, $type);`
`56`	`56`
`57`		`- } elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET)) {`
	`57`	`+ } elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {`
`58`	`58`	`$type = $this->parseArrayShape($tokens, $type);`
`59`	`59`	`}`
`60`	`60`	`}`
`@@ -97,7 +97,7 @@ private function parseNullable(TokenIterator $tokens): Ast\Type\TypeNode`
`97`	`97`	`if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {`
`98`	`98`	`$type = $this->parseGeneric($tokens, $type);`
`99`	`99`
`100`		`- } elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET)) {`
	`100`	`+ } elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {`
`101`	`101`	`$type = $this->parseArrayShape($tokens, $type);`
`102`	`102`	`}`
`103`	`103`
`@@ -174,7 +174,7 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo`
`174`	`174`	`if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {`
`175`	`175`	`$type = $this->parseGeneric($tokens, $type);`
`176`	`176`
`177`		`- } elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET)) {`
	`177`	`+ } elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {`
`178`	`178`	`$type = $this->parseArrayShape($tokens, $type);`
`179`	`179`	`}`
`180`	`180`	`}`

`‎tests/PHPStan/Parser/TypeParserTest.php`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,12 @@ public function provideParseData(): array`
`268`	`268`	`]`
`269`	`269`	`),`
`270`	`270`	`],`
	`271`	`+ [`
	`272`	`+ 'array {\'a\': int}',`
	`273`	`+ new IdentifierTypeNode('array'),`
	`274`	`+ Lexer::TOKEN_OPEN_CURLY_BRACKET,`
	`275`	`+ ],`
	`276`	`+`
`271`	`277`	`[`
`272`	`278`	`'array{\'a\': int}',`
`273`	`279`	`new ArrayShapeNode([`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 03768b2

File tree

3 files changed

3 files changed

`‎src/Parser/TokenIterator.php`

`‎src/Parser/TypeParser.php`

`‎tests/PHPStan/Parser/TypeParserTest.php`

0 commit comments