Merge pull request #250 from DanAtFh/remove_line_feed_when_no_descrip…

…tion Remove line feed when no description in DocBlock
thecodingmachine · Mar 26, 2020 · 4d474a5 · 4d474a5
2 parents 32b6959 + 7bfab49
commit 4d474a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/FieldsBuilder.php b/src/FieldsBuilder.php
@@ -41,6 +41,7 @@
 use function get_parent_class;
 use function is_string;
 use function reset;
+use function rtrim;
 use function trim;
 use function ucfirst;
 
@@ -408,7 +409,7 @@ private function getQueryFieldsFromSourceFields(array $sourceFields, ReflectionC
                 $fieldDescriptor->setTargetMethodOnSource($methodName);
 
                 $docBlockObj     = $this->cachedDocBlockFactory->getDocBlock($refMethod);
-                $docBlockComment = $docBlockObj->getSummary() . "\n" . $docBlockObj->getDescription()->render();
+                $docBlockComment = rtrim($docBlockObj->getSummary() . "\n" . $docBlockObj->getDescription()->render());
 
                 $deprecated      = $docBlockObj->getTagsByName('deprecated');
                 if (count($deprecated) >= 1) {

diff --git a/tests/FieldsBuilderTest.php b/tests/FieldsBuilderTest.php
@@ -264,6 +264,7 @@ public function testSourceField(): void
         $this->assertInstanceOf(NonNull::class, $fields['sibling']->getType());
         $this->assertInstanceOf(ObjectType::class, $fields['sibling']->getType()->getWrappedType());
         $this->assertSame('TestObject', $fields['sibling']->getType()->getWrappedType()->name);
+        $this->assertSame('This is a test summary', $fields['test']->description);
     }
 
     public function testSourceFieldOnSelfType(): void

diff --git a/tests/Fixtures/TestObject.php b/tests/Fixtures/TestObject.php
@@ -21,6 +21,7 @@ public function __construct(string $test, bool $testBool = false)
     }
 
     /**
+     * This is a test summary
      * @return string
      */
     public function getTest(): string