set customReturnType in the constructor

Author: jrushlow

src/Doctrine/BaseRelation.php

@@ -16,8 +16,6 @@
  */
 abstract class BaseRelation
 {
-    private $customReturnType;
-
     public function __construct(
         private ?string $propertyName = null,
         private ?string $targetClassName = null,
@@ -26,6 +24,7 @@ public function __construct(
         private bool $mapInverseRelation = true,
         private bool $avoidSetter = false,
         private bool $isCustomReturnTypeNullable = false,
+        private ?string $customReturnType = null,
     ) {
         // @TODO - triggers are tmp, do not merge w/ them in place.
         if (null === $this->propertyName) {
@@ -113,11 +112,4 @@ public function isCustomReturnTypeNullable(): bool
     {
         return $this->isCustomReturnTypeNullable;
     }
-
-    public function setCustomReturnType(string $customReturnType): self
-    {
-        $this->customReturnType = $customReturnType;
-
-        return $this;
-    }
 }

src/Maker/MakeResetPassword.php

@@ -432,10 +432,9 @@ private function generateRequestEntity(Generator $generator, ClassNameDetails $r
             targetClassName: $this->userClass,
             mapInverseRelation: false,
             avoidSetter: true,
-            isCustomReturnTypeNullable: false
-        ))
-            ->setCustomReturnType('object')
-        );
+            isCustomReturnTypeNullable: false,
+            customReturnType: 'object',
+        )));
 
         $this->fileManager->dumpFile($requestEntityPath, $manipulator->getSourceCode());
 

src/Util/ClassSourceManipulator.php

@@ -579,10 +579,10 @@ private function addSingularRelation(BaseRelation $relation): void
 
         $this->addGetter(
             $relation->getPropertyName(),
-            $relation->getCustomReturnType() ?: $typeHint,
+            $relation->getCustomReturnType() ?? $typeHint,
             // getter methods always have nullable return values
             // unless this has been customized explicitly
-            $relation->getCustomReturnType() ? $relation->isCustomReturnTypeNullable() : true
+            !$relation->getCustomReturnType() || $relation->isCustomReturnTypeNullable()
         );
 
         if ($relation->shouldAvoidSetter()) {