Set return type as nullable when parent is

FriendsOfPHP · May 1, 2022 · 88dda72 · 88dda72
1 parent 3d3c71f
commit 88dda72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ProxyManager/Generator/MagicMethodGenerator.php b/src/ProxyManager/Generator/MagicMethodGenerator.php
@@ -36,7 +36,7 @@ public function __construct(ReflectionClass $originalClass, string $name, array
         $returnType     = $originalMethod->getReturnType();
 
         if ($returnType instanceof ReflectionNamedType) {
-            $this->setReturnType($returnType->getName());
+            $this->setReturnType(($returnType->allowsNull() ? '?' : '') . $returnType->getName());
         }
 
         $this->setReturnsReference($originalMethod->returnsReference());

diff --git a/src/ProxyManager/ProxyGenerator/NullObject/MethodGenerator/NullObjectMethodInterceptor.php b/src/ProxyManager/ProxyGenerator/NullObject/MethodGenerator/NullObjectMethodInterceptor.php
@@ -24,7 +24,7 @@ public static function generateMethod(MethodReflection $originalMethod): self
         $method = static::fromReflectionWithoutBodyAndDocBlock($originalMethod);
 
         $returnType = $originalMethod->getReturnType();
-        $nullCast   = $returnType instanceof ReflectionNamedType && in_array($returnType->getName(), ['array', 'float', 'int', 'string'], true)  ? '(' . $returnType->getName() . ') ' : '';
+        $nullCast   = $returnType instanceof ReflectionNamedType && ! $returnType->allowsNull() && in_array($returnType->getName(), ['array', 'float', 'int', 'string'], true)  ? '(' . $returnType->getName() . ') ' : '';
 
         if ($originalMethod->returnsReference() || $nullCast !== '') {
             $reference = IdentifierSuffixer::getIdentifier('ref');