Fix dumping complex return types for magic methods

FriendsOfPHP · May 5, 2022 · 8419f01 · 8419f01
1 parent 691741d
commit 8419f01
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/src/ProxyManager/Generator/MagicMethodGenerator.php b/src/ProxyManager/Generator/MagicMethodGenerator.php
@@ -5,9 +5,14 @@
 namespace ProxyManager\Generator;
 
 use Laminas\Code\Generator\ParameterGenerator;
+use LogicException;
 use ReflectionClass;
+use ReflectionIntersectionType;
 use ReflectionNamedType;
+use ReflectionUnionType;
 
+use function get_class;
+use function implode;
 use function strtolower;
 
 /**
@@ -32,13 +37,22 @@ public function __construct(ReflectionClass $originalClass, string $name, array
             return;
         }
 
-        $originalMethod = $originalClass->getMethod($name);
-        $returnType     = $originalMethod->getReturnType();
-
-        if ($returnType instanceof ReflectionNamedType) {
-            $this->setReturnType(($returnType->allowsNull() ? '?' : '') . $returnType->getName());
-        }
+        $originalMethod     = $originalClass->getMethod($name);
+        $originalReturnType = $originalMethod->getReturnType();
 
         $this->setReturnsReference($originalMethod->returnsReference());
+
+        if ($originalReturnType instanceof ReflectionNamedType) {
+            $this->setReturnType(($originalReturnType->allowsNull() && $originalReturnType->getName() !== 'mixed' ? '?' : '') . $originalReturnType->getName());
+        } elseif ($originalReturnType instanceof ReflectionUnionType || $originalReturnType instanceof ReflectionIntersectionType) {
+            $returnType = [];
+            foreach ($originalReturnType->getTypes() as $type) {
+                $returnType[] = $type->getName();
+            }
+
+            $this->setReturnType(implode($originalReturnType instanceof ReflectionIntersectionType ? '&' : '|', $returnType));
+        } elseif ($originalReturnType) {
+            throw new LogicException('Unexpected ' . get_class($type));
+        }
     }
 }