Commit 0a3f47e

committed

Fix typed and body detection - Close #32

1 parent 5b8664e commit 0a3f47eCopy full SHA for 0a3f47e

File tree

+12

-9

lines changed

+12

-9

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,12 @@ private function __construct()`
`69`	`69`	`{`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static function fromNode(Node\Stmt\ClassMethod $node): self`
	`72`	`+ public static function fromNode(Node\Stmt\ClassMethod $node, bool$typed = true, PrettyPrinterAbstract$printer = null): self`
`73`	`73`	`{`
	`74`	`+ if (null === $printer) {`
	`75`	`+ $printer = new Standard(['shortArraySyntax' => true]);`
	`76`	`+ }`
	`77`	`+`
`74`	`78`	`$self = new self();`
`75`	`79`
`76`	`80`	`$self->name = $node->name->toString();`
`@@ -83,8 +87,10 @@ public static function fromNode(Node\Stmt\ClassMethod $node): self`
`83`	`87`	`$self->parameters[] = ParameterBuilder::fromNode($param);`
`84`	`88`	`}`
`85`	`89`
`86`		`- if ($self->returnType !== null) {`
`87`		`- $self->typed = true;`
	`90`	`+ $self->typed = $typed;`
	`91`	`+`
	`92`	`+ if (null !== $node->stmts) {`
	`93`	`+ $self->body = $printer->prettyPrint($node->stmts);`
`88`	`94`	`}`
`89`	`95`
`90`	`96`	`return $self;`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,18 +56,15 @@ private function __construct()`
`56`	`56`	`{`
`57`	`57`	`}`
`58`	`58`
`59`		`- public static function fromNode(Node\Stmt\Property $node): self`
	`59`	`+ public static function fromNode(Node\Stmt\Property $node, bool$typed = true): self`
`60`	`60`	`{`
`61`	`61`	`$self = new self();`
`62`	`62`
`63`	`63`	`$self->name = $node->props[0]->name->name;`
`64`	`64`	`$self->defaultValue = $node->props[0]->default;`
`65`	`65`	`$self->type = $node->type ? $node->type->toString() : null;`
`66`	`66`	`$self->visibility = $node->flags;`
`67`		`-`
`68`		`- if ($self->type !== null) {`
`69`		`- $self->typed = true;`
`70`		`- }`
	`67`	`+ $self->typed = $typed;`
`71`	`68`
`72`	`69`	`return $self;`
`73`	`70`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function generate(): Property`
`165`	`165`	`),`
`166`	`166`	`],`
`167`	`167`	`$this->generateAttributes(),`
`168`		`- $this->typed ? $this->type->generate() : null`
	`168`	`+ $this->typed && null !== $this->type? $this->type->generate() : null`
`169`	`169`	`);`
`170`	`170`	`}`
`171`	`171`

Comments

(0)