Commit e2b8faf

iluuu1994 iluuu1994

committed

Allow [] after generic type or array shape - closes #36

1 parent 1a80f73 commit e2b8fafCopy full SHA for e2b8faf

File tree

2 files changed

+29

-10

lines changed

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

2 files changed

+29

-10

lines changed

`‎src/Parser/TypeParser.php`

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,8 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode`
`33`	`33`	`if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {`
`34`	`34`	`$type = $this->parse($tokens);`
`35`	`35`	`$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);`
`36`		`-`
`37`		`- if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {`
`38`		`- $type = $this->tryParseArray($tokens, $type);`
`39`		`- }`
`40`		`-`
`41`	`36`	`} elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_THIS_VARIABLE)) {`
`42`		`- return new Ast\Type\ThisTypeNode();`
`43`		`-`
	`37`	`+ $type = new Ast\Type\ThisTypeNode();`
`44`	`38`	`} else {`
`45`	`39`	`$type = new Ast\Type\IdentifierTypeNode($tokens->currentTokenValue());`
`46`	`40`	`$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);`
`@@ -51,14 +45,15 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode`
`51`	`45`	`} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {`
`52`	`46`	`$type = $this->tryParseCallable($tokens, $type);`
`53`	`47`
`54`		`- } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {`
`55`		`- $type = $this->tryParseArray($tokens, $type);`
`56`		`-`
`57`	`48`	`} elseif ($type->name === 'array' && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {`
`58`	`49`	`$type = $this->parseArrayShape($tokens, $type);`
`59`	`50`	`}`
`60`	`51`	`}`
`61`	`52`
	`53`	`+ if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {`
	`54`	`+ $type = $this->tryParseArray($tokens, $type);`
	`55`	`+ }`
	`56`	`+`
`62`	`57`	`return $type;`
`63`	`58`	`}`
`64`	`59`

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

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -711,6 +711,30 @@ public function provideParseData(): array`
`711`	`711`	`new IdentifierTypeNode("\xA009")`
`712`	`712`	`),`
`713`	`713`	`],`
	`714`	`+ [`
	`715`	`+ 'Collection<array-key, int>[]',`
	`716`	`+ new ArrayTypeNode(`
	`717`	`+ new GenericTypeNode(`
	`718`	`+ new IdentifierTypeNode('Collection'),`
	`719`	`+ [`
	`720`	`+ new IdentifierTypeNode('array-key'),`
	`721`	`+ new IdentifierTypeNode('int'),`
	`722`	`+ ]`
	`723`	`+ )`
	`724`	`+ ),`
	`725`	`+ ],`
	`726`	`+ [`
	`727`	`+ 'array{foo: int}[]',`
	`728`	`+ new ArrayTypeNode(`
	`729`	`+ new ArrayShapeNode([`
	`730`	`+ new ArrayShapeItemNode(`
	`731`	`+ new IdentifierTypeNode('foo'),`
	`732`	`+ false,`
	`733`	`+ new IdentifierTypeNode('int')`
	`734`	`+ ),`
	`735`	`+ ])`
	`736`	`+ ),`
	`737`	`+ ],`
`714`	`738`	`];`
`715`	`739`	`}`
`716`	`740`

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 e2b8faf

File tree

2 files changed

2 files changed

`‎src/Parser/TypeParser.php`

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

0 commit comments