Commit ecb475b

rvanvelzenondrejmirtes

authored and

committed

Implement template default syntax

1 parent 19d4770 commit ecb475bCopy full SHA for ecb475b

File tree

+30

-3

lines changed

+30

-3

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,21 +17,26 @@ class TemplateTagValueNode implements PhpDocTagValueNode`
`17`	`17`	`/** @var TypeNode\|null */`
`18`	`18`	`public $bound;`
`19`	`19`
	`20`	`+ /** @var TypeNode\|null */`
	`21`	`+ public $default;`
	`22`	`+`
`20`	`23`	`/** @var string (may be empty) */`
`21`	`24`	`public $description;`
`22`	`25`
`23`		`- public function __construct(string $name, ?TypeNode $bound, string $description)`
	`26`	`+ public function __construct(string $name, ?TypeNode $bound, string $description, ?TypeNode$default = null)`
`24`	`27`	`{`
`25`	`28`	`$this->name = $name;`
`26`	`29`	`$this->bound = $bound;`
	`30`	`+ $this->default = $default;`
`27`	`31`	`$this->description = $description;`
`28`	`32`	`}`
`29`	`33`
`30`	`34`
`31`	`35`	`public function __toString(): string`
`32`	`36`	`{`
`33`	`37`	`$bound = $this->bound !== null ? " of {$this->bound}" : '';`
`34`		`- return trim("{$this->name}{$bound}{$this->description}");`
	`38`	`+ $default = $this->default !== null ? " = {$this->default}" : '';`
	`39`	`+ return trim("{$this->name}{$bound}{$default}{$this->description}");`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -402,9 +402,15 @@ private function parseTemplateTagValue(TokenIterator $tokens): Ast\PhpDoc\Templa`
`402`	`402`	`$bound = null;`
`403`	`403`	`}`
`404`	`404`
	`405`	`+ if ($tokens->tryConsumeTokenValue('=')) {`
	`406`	`+ $default = $this->typeParser->parse($tokens);`
	`407`	`+ } else {`
	`408`	`+ $default = null;`
	`409`	`+ }`
	`410`	`+`
`405`	`411`	`$description = $this->parseOptionalDescription($tokens);`
`406`	`412`
`407`		`- return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description);`
	`413`	`+ return new Ast\PhpDoc\TemplateTagValueNode($name, $bound, $description, $default);`
`408`	`414`	`}`
`409`	`415`
`410`	`416`	`private function parseExtendsTagValue(string $tagName, TokenIterator $tokens): Ast\PhpDoc\PhpDocTagValueNode`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3345,6 +3345,22 @@ public function provideTemplateTagsData(): Iterator`
`3345`	`3345`	`),`
`3346`	`3346`	`]),`
`3347`	`3347`	`];`
	`3348`	`+`
	`3349`	`+ yield [`
	`3350`	`+ 'OK with default',`
	`3351`	`+ '/** @template T = string */',`
	`3352`	`+ new PhpDocNode([`
	`3353`	`+ new PhpDocTagNode(`
	`3354`	`+ '@template',`
	`3355`	`+ new TemplateTagValueNode(`
	`3356`	`+ 'T',`
	`3357`	`+ null,`
	`3358`	`+ '',`
	`3359`	`+ new IdentifierTypeNode('string')`
	`3360`	`+ )`
	`3361`	`+ ),`
	`3362`	`+ ]),`
	`3363`	`+ ];`
`3348`	`3364`	`}`
`3349`	`3365`
`3350`	`3366`	`public function provideExtendsTagsData(): Iterator`

Comments

(0)