Improve doc block checks

Author: sandrokeil

src/Code/MethodGenerator.php

@@ -257,7 +257,7 @@ private function generateAttributes(): array
 
             $returnType = null;
 
-            if ($this->returnType) {
+            if ($this->returnType !== null) {
                 $returnType = $this->returnType->type();
             }
             if ($this->returnTypeDocBlockHint !== null) {

src/Code/PropertyGenerator.php

@@ -180,28 +180,22 @@ private function generateAttributes(): array
         if ($this->typed === false || $this->docBlockComment !== null || $this->typeDocBlockHint !== null) {
             $docBlockType = null;
 
-            if ($this->type) {
+            if ($this->type !== null) {
                 $docBlockType = new VarTag($this->type->types());
             }
             if ($typeHint = $this->getTypeDocBlockHint()) {
                 $docBlockType = new VarTag($typeHint);
             }
             $docBlock = null;
 
-            if ($this->docBlockComment) {
+            if ($docBlockType !== null) {
+                $docBlock = new DocBlock($this->docBlockComment);
+                $docBlock->addTag($docBlockType);
+            } elseif ($this->docBlockComment !== null) {
                 $docBlock = new DocBlock($this->docBlockComment);
-
-                if ($docBlockType !== null) {
-                    $docBlock->addTag($docBlockType);
-                }
-            }
-            if ($this->docBlockComment === null && $docBlockType !== null) {
-                $docBlock = new DocBlock($this->docBlockComment, $docBlockType);
             }
 
             if ($docBlock !== null) {
-                $docBlock = new DocBlock($this->docBlockComment, $docBlockType);
-
                 $attributes = ['comments' => [new Doc($docBlock->generate())]];
             }
         }