Fixes

vimeo · Jan 18, 2025 · ca0e233 · ca0e233
1 parent ca3949e
commit ca0e233
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bin/gen_callmap_utils.php b/bin/gen_callmap_utils.php
@@ -143,7 +143,7 @@ function assertParameter(array &$normalizedEntry, ReflectionParameter $param): v
 function assertEntryReturnType(ReflectionFunctionAbstract $function, string &$entryReturnType): void
 {
     if (version_compare(PHP_VERSION, '8.1.0', '>=')) {
-        $expectedType = $function->hasTentativeReturnType() ? $function->getTentativeReturnType() : $function->getReturnType();
+        $expectedType = $function->getTentativeReturnType() ?? $function->getReturnType();
     } else {
         $expectedType = $function->getReturnType();
     }

diff --git a/src/Psalm/Internal/Codebase/Reflection.php b/src/Psalm/Internal/Codebase/Reflection.php
@@ -390,7 +390,9 @@ public function registerFunction(string $function_id): ?bool
                     $storage->addParam($param_obj);
                 }
 
-                if ($reflection_return_type = $reflection_function->getReturnType()) {
+                if ($reflection_return_type = (PHP_VERSION_ID >= 80100 ? (
+                    $reflection_function->getTentativeReturnType() ?? $reflection_function->getReturnType()
+                ) : $reflection_function->getReturnType())) {
                     $storage->return_type = self::getPsalmTypeFromReflectionType($reflection_return_type);
                 }
             }