#2283 - Fix return types in docblock for multiple return types

zephir-lang · Oct 2, 2021 · 475c164 · 475c164
1 parent bcb9db3
commit 475c164
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
@@ -313,7 +313,7 @@ protected function buildMethod(ClassMethod $method, bool $isInterface, string $i
         if ($method->hasReturnTypes()) {
             $supported = 0;
 
-            if (array_key_exists('object', $method->getReturnTypes()) && 1 === count($method->getReturnClassTypes())) {
+            if (array_key_exists('object', $method->getReturnTypes())) {
                 $return = key($method->getReturnClassTypes());
                 ++$supported;
             }
@@ -348,7 +348,7 @@ protected function buildMethod(ClassMethod $method, bool $isInterface, string $i
             }
 
             // PHP doesn't support multiple return types (yet?)
-            if ($supported > 1) {
+            if ($supported > 1 || array_key_exists('variable', $method->getReturnTypes())) {
                 $return = '';
             }
         } elseif ($method->isVoid()) {

diff --git a/stub/stubs.zep b/stub/stubs.zep
@@ -74,4 +74,14 @@ class Stubs
 
 	    let data = array_merge(data, func_get_args());
 	}
+
+	public function testMultiReturnTypeWithMixedInDocAndEmptyInSignature1() -> array | object
+	{
+	    return [];
+	}
+
+	public function testMultiReturnTypeWithMixedInDocAndEmptyInSignature2() -> var | bool
+    {
+        return false;
+    }
 }