Skip to content

Merge release 0.6.1 into 0.7.x #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Builder/ClassBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static function fromNodes(Node ...$nodes): self
}

public static function fromScratch(
string $className,
?string $className,
string $namespace = null,
bool $typed = true,
bool $strict = true
Expand Down Expand Up @@ -148,6 +148,11 @@ public function getNamespace(): ?string
return $this->namespace;
}

public function setName(?string $name): void
{
$this->name = $name;
}

public function getName(): ?string
{
return $this->name;
Expand Down
23 changes: 9 additions & 14 deletions src/Code/ClassGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

namespace OpenCodeModeling\CodeAst\Code;

use PhpParser\Builder;
use PhpParser\Node\Stmt\Class_;

/**
Expand All @@ -37,11 +36,11 @@ final class ClassGenerator implements StatementGenerator
private $flags = 0;

/**
* @param string $name
* @param string|null $name
* @param array|string $flags
*/
public function __construct(
$name,
?string $name,
$flags = null
) {
$this->setName($name);
Expand All @@ -53,19 +52,15 @@ public function __construct(

public function generate(): Class_
{
$classBuilder = new Builder\Class_($this->name);
$node = $classBuilder->getNode();

$node->flags = $this->flags;

return $node;
return new Class_(
$this->name,
[
'flags' => $this->flags,
]
);
}

/**
* @param string $name
* @return self
*/
public function setName(string $name): self
public function setName(?string $name): self
{
$this->name = $name;

Expand Down