Fix typed and body detection - Close #32

Author: sandrokeil

src/Builder/ClassMethodBuilder.php

@@ -69,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();
@@ -83,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;

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;
     }

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
         );
     }