Merge pull request #33 from open-code-modeling/0.8.x-merge-up-into-0.9.x_5fada338de0779.06971822

Merge release 0.8.2 into 0.9.x

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,26 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.8.2 - 2020-11-12
+
+
+-----
+
+### Release Notes for [0.8.2](https://github.com/open-code-modeling/php-code-ast/milestone/12)
+
+0.8.x bugfix release (patch)
+
+### 0.8.2
+
+- Total issues resolved: **2**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [32: Fix typed and body detection](https://github.com/open-code-modeling/php-code-ast/issues/32) thanks to @sandrokeil
+ - [31: Use fluent setter methods for builder classes](https://github.com/open-code-modeling/php-code-ast/issues/31) thanks to @sandrokeil
+
 ## 0.8.1 - 2020-11-11
 
 

src/Builder/ClassBuilder.php

@@ -196,9 +196,11 @@ public function getNamespace(): ?string
         return $this->namespace;
     }
 
-    public function setName(?string $name): void
+    public function setName(?string $name): self
     {
         $this->name = $name;
+
+        return $this;
     }
 
     public function getName(): ?string
@@ -211,6 +213,13 @@ public function isStrict(): bool
         return $this->strict;
     }
 
+    public function setTyped(bool $typed): self
+    {
+        $this->typed = $typed;
+
+        return $this;
+    }
+
     public function isTyped(): bool
     {
         return $this->typed;

src/Builder/ClassMethodBuilder.php

@@ -19,6 +19,8 @@
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor;
 use PhpParser\Parser;
+use PhpParser\PrettyPrinter\Standard;
+use PhpParser\PrettyPrinterAbstract;
 
 final class ClassMethodBuilder
 {
@@ -67,8 +69,12 @@ private function __construct()
     {
     }
 
-    public static function fromNode(Node\Stmt\ClassMethod $node): self
+    public static function fromNode(Node\Stmt\ClassMethod $node, bool $typed = true, PrettyPrinterAbstract $printer = null): self
     {
+        if (null === $printer) {
+            $printer = new Standard(['shortArraySyntax' => true]);
+        }
+
         $self = new self();
 
         $self->name = $node->name->toString();
@@ -81,8 +87,10 @@ public static function fromNode(Node\Stmt\ClassMethod $node): self
             $self->parameters[] = ParameterBuilder::fromNode($param);
         }
 
-        if ($self->returnType !== null) {
-            $self->typed = true;
+        $self->typed = $typed;
+
+        if (null !== $node->stmts) {
+            $self->body = $printer->prettyPrint($node->stmts);
         }
 
         return $self;
@@ -134,6 +142,13 @@ public function getParameters(): array
         return $this->parameters;
     }
 
+    public function setTyped(bool $typed): self
+    {
+        $this->typed = $typed;
+
+        return $this;
+    }
+
     public function isTyped(): bool
     {
         return $this->typed;
@@ -165,29 +180,35 @@ public function getDocBlockComment(): ?string
         return $this->docBlockComment;
     }
 
-    public function setDocBlockComment(?string $docBlockComment): void
+    public function setDocBlockComment(?string $docBlockComment): self
     {
         $this->docBlockComment = $docBlockComment;
+
+        return $this;
     }
 
     public function getReturnTypeDocBlockHint(): string
     {
         return $this->returnTypeDocBlockHint;
     }
 
-    public function setReturnTypeDocBlockHint(?string $typeDocBlockHint): void
+    public function setReturnTypeDocBlockHint(?string $typeDocBlockHint): self
     {
         $this->returnTypeDocBlockHint = $typeDocBlockHint;
+
+        return $this;
     }
 
     public function getDocBlock(): ?DocBlock
     {
         return $this->docBlock;
     }
 
-    public function overrideDocBlock(?DocBlock $docBlock): void
+    public function overrideDocBlock(?DocBlock $docBlock): self
     {
         $this->docBlock = $docBlock;
+
+        return $this;
     }
 
     public function setFinal(bool $final): self

src/Builder/ClassPropertyBuilder.php

@@ -56,18 +56,15 @@ private function __construct()
     {
     }
 
-    public static function fromNode(Node\Stmt\Property $node): self
+    public static function fromNode(Node\Stmt\Property $node, bool $typed = true): self
     {
         $self = new self();
 
         $self->name = $node->props[0]->name->name;
         $self->defaultValue = $node->props[0]->default;
         $self->type = $node->type ? $node->type->toString() : null;
         $self->visibility = $node->flags;
-
-        if ($self->type !== null) {
-            $self->typed = true;
-        }
+        $self->typed = $typed;
 
         return $self;
     }
@@ -93,6 +90,13 @@ public function getType(): string
         return $this->type;
     }
 
+    public function setTyped(bool $typed): self
+    {
+        $this->typed = $typed;
+
+        return $this;
+    }
+
     public function isTyped(): bool
     {
         return $this->typed;
@@ -124,29 +128,35 @@ public function getDocBlockComment(): ?string
         return $this->docBlockComment;
     }
 
-    public function setDocBlockComment(?string $docBlockComment): void
+    public function setDocBlockComment(?string $docBlockComment): self
     {
         $this->docBlockComment = $docBlockComment;
+
+        return $this;
     }
 
     public function getTypeDocBlockHint(): string
     {
         return $this->typeDocBlockHint;
     }
 
-    public function setTypeDocBlockHint(?string $typeDocBlockHint): void
+    public function setTypeDocBlockHint(?string $typeDocBlockHint): self
     {
         $this->typeDocBlockHint = $typeDocBlockHint;
+
+        return $this;
     }
 
     public function getDocBlock(): ?DocBlock
     {
         return $this->docBlock;
     }
 
-    public function overrideDocBlock(?DocBlock $docBlock): void
+    public function overrideDocBlock(?DocBlock $docBlock): self
     {
         $this->docBlock = $docBlock;
+
+        return $this;
     }
 
     public function generate(): NodeVisitor

src/Builder/InterfaceBuilder.php

@@ -116,6 +116,13 @@ public function isStrict(): bool
         return $this->strict;
     }
 
+    public function setTyped(bool $typed): self
+    {
+        $this->typed = $typed;
+
+        return $this;
+    }
+
     public function isTyped(): bool
     {
         return $this->typed;

src/Builder/ParameterBuilder.php

@@ -95,29 +95,42 @@ public function getDefaultValue()
     /**
      * @param mixed $defaultValue
      */
-    public function setDefaultValue($defaultValue): void
+    public function setDefaultValue($defaultValue): self
     {
         $this->defaultValue = $defaultValue;
+
+        return $this;
     }
 
     public function isPassedByReference(): bool
     {
         return $this->passedByReference;
     }
 
-    public function setPassedByReference(bool $passedByReference): void
+    public function setPassedByReference(bool $passedByReference): self
     {
         $this->passedByReference = $passedByReference;
+
+        return $this;
     }
 
     public function isVariadic(): bool
     {
         return $this->variadic;
     }
 
-    public function setVariadic(bool $variadic): void
+    public function setVariadic(bool $variadic): self
     {
         $this->variadic = $variadic;
+
+        return $this;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
     }
 
     public function getName(): string

src/Code/PropertyGenerator.php

@@ -165,7 +165,7 @@ public function generate(): Property
                 ),
             ],
             $this->generateAttributes(),
-            $this->typed ? $this->type->generate() : null
+            $this->typed && null !== $this->type ? $this->type->generate() : null
         );
     }