feat(PhpUnit) - add php 8.0 compatibility part 2

- Update CodeHelper add support ReflectionUnionType return type - Update Mockery add support ReflectionUnionType return type
temafey · Apr 28, 2021 · 2e68470 · 2e68470
1 parent ceb2730
commit 2e68470
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Generator/Helper/CodeHelper.php b/src/Generator/Helper/CodeHelper.php
@@ -532,7 +532,15 @@ protected function getMethodReturnType(ReflectionMethod $reflectionMethod): stri
         } else {
             $returnType = $reflectionMethod->getReturnType();
 
-            if (null !== $returnType) {
+            if (
+                class_exists('ReflectionUnionType') &&
+                $returnType instanceof \ReflectionUnionType
+            ) {
+                // use only first return type
+                // @TODO return all return types
+                $returnType = array_shift($returnType->getTypes());
+            }
+            if ($returnType instanceof \ReflectionNamedType) {
                 $returnType = $returnType->getName();
             }
         }

diff --git a/src/Generator/Mock/Mockery.php b/src/Generator/Mock/Mockery.php
@@ -115,7 +115,15 @@ public function generateMockCode(
             } else {
                 $returnType = $refMethod->getReturnType();
 
-                if (null !== $returnType) {
+                if (
+                    class_exists('ReflectionUnionType') &&
+                    $returnType instanceof \ReflectionUnionType
+                ) {
+                    // use only first return type
+                    // @TODO return all return types
+                    $returnType = array_shift($returnType->getTypes());
+                }
+                if ($returnType instanceof \ReflectionNamedType) {
                     $returnType = $returnType->getName();
                 }
             }