Commit 1e0cd53

VincentLangletondrejmirtes

authored and

committed

Support constant fetch in array key

1 parent 5a36b05 commit 1e0cd53Copy full SHA for 1e0cd53

File tree

+32

-4

lines changed

+32

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;`
`6`	`6`	`use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;`
	`7`	`+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;`
`7`	`8`	`use PHPStan\PhpDocParser\Ast\Node;`
`8`	`9`	`use PHPStan\PhpDocParser\Ast\NodeAttributes;`
`9`	`10`	`use function sprintf;`
`@@ -13,15 +14,15 @@ class ArrayShapeItemNode implements Node`
`13`	`14`
`14`	`15`	`use NodeAttributes;`
`15`	`16`
`16`		`- /** @var ConstExprIntegerNode\|ConstExprStringNode\|IdentifierTypeNode\|null */`
	`17`	`+ /** @var ConstExprIntegerNode\|ConstExprStringNode\|ConstFetchNode\|IdentifierTypeNode\|null */`
`17`	`18`	`public $keyName;`
`18`	`19`
`19`	`20`	`public bool $optional;`
`20`	`21`
`21`	`22`	`public TypeNode $valueType;`
`22`	`23`
`23`	`24`	`/**`
`24`		`- * @param ConstExprIntegerNode\|ConstExprStringNode\|IdentifierTypeNode\|null $keyName`
	`25`	`+ * @param ConstExprIntegerNode\|ConstExprStringNode\|ConstFetchNode\|IdentifierTypeNode\|null $keyName`
`25`	`26`	`*/`
`26`	`27`	`public function __construct($keyName, bool $optional, TypeNode $valueType)`
`27`	`28`	`{`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -970,7 +970,7 @@ private function parseArrayShapeItem(TokenIterator $tokens): Ast\Type\ArrayShape`
`970`	`970`
`971`	`971`	`/**`
`972`	`972`	`* @phpstan-impure`
`973`		`- * @return Ast\ConstExpr\ConstExprIntegerNode\|Ast\ConstExpr\ConstExprStringNode\|Ast\Type\IdentifierTypeNode`
	`973`	`+ * @return Ast\ConstExpr\ConstExprIntegerNode\|Ast\ConstExpr\ConstExprStringNode\|Ast\ConstExpr\ConstFetchNode\|Ast\Type\IdentifierTypeNode`
`974`	`974`	`*/`
`975`	`975`	`private function parseArrayShapeKey(TokenIterator $tokens)`
`976`	`976`	`{`
`@@ -991,8 +991,17 @@ private function parseArrayShapeKey(TokenIterator $tokens)`
`991`	`991`	`$tokens->next();`
`992`	`992`
`993`	`993`	`} else {`
`994`		`- $key = newAst\Type\IdentifierTypeNode($tokens->currentTokenValue());`
	`994`	`+ $identifier = $tokens->currentTokenValue();`
`995`	`995`	`$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);`
	`996`	`+`
	`997`	`+ if ($tokens->tryConsumeTokenType(Lexer::TOKEN_DOUBLE_COLON)) {`
	`998`	`+ $classConstantName = $tokens->currentTokenValue();`
	`999`	`+ $tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);`
	`1000`	`+`
	`1001`	`+ $key = new Ast\ConstExpr\ConstFetchNode($identifier, $classConstantName);`
	`1002`	`+ } else {`
	`1003`	`+ $key = new Ast\Type\IdentifierTypeNode($identifier);`
	`1004`	`+ }`
`996`	`1005`	`}`
`997`	`1006`
`998`	`1007`	`return $this->enrichWithAttributes(`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;`
`7`	`7`	`use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNullNode;`
`8`	`8`	`use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;`
	`9`	`+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;`
`9`	`10`	`use PHPStan\PhpDocParser\Ast\Node;`
`10`	`11`	`use PHPStan\PhpDocParser\Ast\Type\ArrayShapeItemNode;`
`11`	`12`	`use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;`
`@@ -75,6 +76,13 @@ public static function provideArrayCases(): Generator`
`75`	`76`	`new ArrayShapeItemNode(new ConstExprIntegerNode('1'), false, new IdentifierTypeNode('Baz')),`
`76`	`77`	`]),`
`77`	`78`	`],`
	`79`	`+ [`
	`80`	`+ 'array{Foo::BAR: Foo, Bar::FOO?: Bar}',`
	`81`	`+ ArrayShapeNode::createSealed([`
	`82`	`+ new ArrayShapeItemNode(new ConstFetchNode('Foo', 'BAR'), false, new IdentifierTypeNode('Foo')),`
	`83`	`+ new ArrayShapeItemNode(new ConstFetchNode('Bar', 'FOO'), true, new IdentifierTypeNode('Bar')),`
	`84`	`+ ]),`
	`85`	`+ ],`
`78`	`86`	`['list{}', ArrayShapeNode::createSealed([], 'list')],`
`79`	`87`	`['list{...}', ArrayShapeNode::createUnsealed([], null, 'list')],`
`80`	`88`	`[`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3041,6 +3041,16 @@ public function provideParseData(): array`
`3041`	`3041`	`new IdentifierTypeNode('MongoCollection'),`
`3042`	`3042`	`Lexer::TOKEN_OPEN_ANGLE_BRACKET,`
`3043`	`3043`	`],`
	`3044`	`+ [`
	`3045`	`+ 'array{Foo::BAR: int}',`
	`3046`	`+ ArrayShapeNode::createSealed([`
	`3047`	`+ new ArrayShapeItemNode(`
	`3048`	`+ new ConstFetchNode('Foo', 'BAR'),`
	`3049`	`+ false,`
	`3050`	`+ new IdentifierTypeNode('int'),`
	`3051`	`+ ),`
	`3052`	`+ ]),`
	`3053`	`+ ],`
`3044`	`3054`	`];`
`3045`	`3055`	`}`
`3046`	`3056`

Comments

(0)