Commit 536889f

authored

Support array and offset access on const types

1 parent 9bb3855 commit 536889fCopy full SHA for 536889f

File tree

+49

-11

lines changed

+49

-11

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public function __toString(): string`
`25`	`25`	`{`
`26`	`26`	`if (`
`27`	`27`	`$this->type instanceof CallableTypeNode`
`28`		`- \|\| $this->type instanceof ConstTypeNode`
`29`	`28`	`\|\| $this->type instanceof NullableTypeNode`
`30`	`29`	`) {`
`31`	`30`	`return '(' . $this->type . ')[' . $this->offset . ']';`

Lines changed: 18 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,17 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode`
`232`	`232`	`);`
`233`	`233`	`}`
`234`	`234`
`235`		`- return $this->enrichWithAttributes($tokens, new Ast\Type\ConstTypeNode($constExpr), $startLine, $startIndex);`
	`235`	`+ $type = $this->enrichWithAttributes(`
	`236`	`+ $tokens,`
	`237`	`+ new Ast\Type\ConstTypeNode($constExpr),`
	`238`	`+ $startLine,`
	`239`	`+ $startIndex`
	`240`	`+ );`
	`241`	`+ if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {`
	`242`	`+ $type = $this->tryParseArrayOrOffsetAccess($tokens, $type);`
	`243`	`+ }`
	`244`	`+`
	`245`	`+ return $type;`
`236`	`246`	`} catch (LogicException $e) {`
`237`	`247`	`throw new ParserException(`
`238`	`248`	`$currentTokenValue,`
`@@ -733,14 +743,14 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo`
`733`	`743`	`);`
`734`	`744`	`}`
`735`	`745`
`736`		`- $type = new Ast\Type\ConstTypeNode($constExpr);`
	`746`	`+ $type = $this->enrichWithAttributes(`
	`747`	`+ $tokens,`
	`748`	`+ new Ast\Type\ConstTypeNode($constExpr),`
	`749`	`+ $startLine,`
	`750`	`+ $startIndex`
	`751`	`+ );`
`737`	`752`	`if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {`
`738`		`- $type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes(`
`739`		`- $tokens,`
`740`		`- $type,`
`741`		`- $startLine,`
`742`		`- $startIndex`
`743`		`- ));`
	`753`	`+ $type = $this->tryParseArrayOrOffsetAccess($tokens, $type);`
`744`	`754`	`}`
`745`	`755`
`746`	`756`	`return $type;`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ final class Printer`
`141`	`141`	`CallableTypeNode::class,`
`142`	`142`	`UnionTypeNode::class,`
`143`	`143`	`IntersectionTypeNode::class,`
`144`		`- ConstTypeNode::class,`
`145`	`144`	`NullableTypeNode::class,`
`146`	`145`	`],`
`147`	`146`	`];`
`@@ -512,7 +511,6 @@ private function printOffsetAccessType(TypeNode $type): string`
`512`	`511`	`$type instanceof CallableTypeNode`
`513`	`512`	`\|\| $type instanceof UnionTypeNode`
`514`	`513`	`\|\| $type instanceof IntersectionTypeNode`
`515`		`- \|\| $type instanceof ConstTypeNode`
`516`	`514`	`\|\| $type instanceof NullableTypeNode`
`517`	`515`	`) {`
`518`	`516`	`return $this->wrapInParentheses($type);`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1067,6 +1067,13 @@ public function provideParseData(): array`
`1067`	`1067`	`new IdentifierTypeNode('int')`
`1068`	`1068`	`),`
`1069`	`1069`	`],`
	`1070`	`+ [`
	`1071`	`+ 'self::TYPES[ int ]',`
	`1072`	`+ new OffsetAccessTypeNode(`
	`1073`	`+ new ConstTypeNode(new ConstFetchNode('self', 'TYPES')),`
	`1074`	`+ new IdentifierTypeNode('int')`
	`1075`	`+ ),`
	`1076`	`+ ],`
`1070`	`1077`	`[`
`1071`	`1078`	`"?\t\xA009", // edge-case with \h`
`1072`	`1079`	`new NullableTypeNode(`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1723,6 +1723,23 @@ public function enterNode(Node $node)`
`1723`	`1723`
`1724`	`1724`	`},`
`1725`	`1725`	`];`
	`1726`	`+`
	`1727`	`+ yield [`
	`1728`	`+ '/** @return Foo[abc] */',`
	`1729`	`+ '/** @return self::FOO[abc] */',`
	`1730`	`+ new class extends AbstractNodeVisitor {`
	`1731`	`+`
	`1732`	`+ public function enterNode(Node $node)`
	`1733`	`+ {`
	`1734`	`+ if ($node instanceof ReturnTagValueNode && $node->type instanceof OffsetAccessTypeNode) {`
	`1735`	`+ $node->type->type = new ConstTypeNode(new ConstFetchNode('self', 'FOO'));`
	`1736`	`+ }`
	`1737`	`+`
	`1738`	`+ return $node;`
	`1739`	`+ }`
	`1740`	`+`
	`1741`	`+ },`
	`1742`	`+ ];`
`1726`	`1743`	`}`
`1727`	`1744`
`1728`	`1745`	`/**`
`@@ -1862,6 +1879,13 @@ public function dataPrintType(): iterable`
`1862`	`1879`	`]),`
`1863`	`1880`	`'Foo\|Bar\|(Baz\|Lorem)',`
`1864`	`1881`	`];`
	`1882`	`+ yield [`
	`1883`	`+ new OffsetAccessTypeNode(`
	`1884`	`+ new ConstTypeNode(new ConstFetchNode('self', 'TYPES')),`
	`1885`	`+ new IdentifierTypeNode('int')`
	`1886`	`+ ),`
	`1887`	`+ 'self::TYPES[int]',`
	`1888`	`+ ];`
`1865`	`1889`	`}`
`1866`	`1890`
`1867`	`1891`	`/**`

Comments

(0)