From 162f774858b461b9cc89f0c604c798381053dc32 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Wed, 20 Nov 2024 09:33:46 +0100
Subject: [PATCH] Fix `static` return type in php-8-stubs

---
 .../SignatureMap/Php8SignatureMapProvider.php       | 13 +++++++++++--
 tests/PHPStan/Analyser/nsrt/bug-12077.php           | 11 +++++++++++
 .../SignatureMap/Php8SignatureMapProviderTest.php   |  2 ++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/PHPStan/Analyser/nsrt/bug-12077.php

diff --git a/src/Reflection/SignatureMap/Php8SignatureMapProvider.php b/src/Reflection/SignatureMap/Php8SignatureMapProvider.php
index 7bfdf37f9b..59cbedb60c 100644
--- a/src/Reflection/SignatureMap/Php8SignatureMapProvider.php
+++ b/src/Reflection/SignatureMap/Php8SignatureMapProvider.php
@@ -16,6 +16,7 @@
 use PHPStan\Reflection\InitializerExprContext;
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Reflection\PassedByReference;
+use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\MixedType;
@@ -50,6 +51,7 @@ public function __construct(
 		private FileTypeMapper $fileTypeMapper,
 		private PhpVersion $phpVersion,
 		private InitializerExprTypeResolver $initializerExprTypeResolver,
+		private ReflectionProviderProvider $reflectionProviderProvider,
 	)
 	{
 		$this->map = new Php8StubsMap($phpVersion->getVersionId());
@@ -392,6 +394,13 @@ private function getSignature(
 				$phpDocReturnType = $phpDoc->getReturnTag()->getType();
 			}
 		}
+
+		$classReflection = null;
+		if ($className !== null) {
+			$reflectionProvider = $this->reflectionProviderProvider->getReflectionProvider();
+			$classReflection = $reflectionProvider->getClass($className);
+		}
+
 		$parameters = [];
 		$variadic = false;
 		foreach ($function->getParams() as $param) {
@@ -399,7 +408,7 @@ private function getSignature(
 			if (!$name instanceof Variable || !is_string($name->name)) {
 				throw new ShouldNotHappenException();
 			}
-			$parameterType = ParserNodeTypeToPHPStanType::resolve($param->type, null);
+			$parameterType = ParserNodeTypeToPHPStanType::resolve($param->type, $classReflection);
 			$parameters[] = new ParameterSignature(
 				$name->name,
 				$param->default !== null || $param->variadic,
@@ -417,7 +426,7 @@ private function getSignature(
 			$variadic = $variadic || $param->variadic;
 		}
 
-		$returnType = ParserNodeTypeToPHPStanType::resolve($function->getReturnType(), null);
+		$returnType = ParserNodeTypeToPHPStanType::resolve($function->getReturnType(), $classReflection);
 
 		return new FunctionSignature(
 			$parameters,
diff --git a/tests/PHPStan/Analyser/nsrt/bug-12077.php b/tests/PHPStan/Analyser/nsrt/bug-12077.php
new file mode 100644
index 0000000000..07163ecaa1
--- /dev/null
+++ b/tests/PHPStan/Analyser/nsrt/bug-12077.php
@@ -0,0 +1,11 @@
+<?php // lint >= 8.3
+
+namespace Bug12077;
+
+use ReflectionMethod;
+use function PHPStan\Testing\assertType;
+
+function (): void {
+	$methodInfo = ReflectionMethod::createFromMethodName("Exception::getMessage");
+	assertType(ReflectionMethod::class, $methodInfo);
+};
diff --git a/tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php b/tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php
index 57cb091e19..f912e0d78e 100644
--- a/tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php
+++ b/tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php
@@ -10,6 +10,7 @@
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\PassedByReference;
+use PHPStan\Reflection\ReflectionProvider\ReflectionProviderProvider;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\BenevolentUnionType;
@@ -162,6 +163,7 @@ private function createProvider(): Php8SignatureMapProvider
 			self::getContainer()->getByType(FileTypeMapper::class),
 			$phpVersion,
 			self::getContainer()->getByType(InitializerExprTypeResolver::class),
+			self::getContainer()->getByType(ReflectionProviderProvider::class),
 		);
 	}