Fix return type of PhpFunctionFromParserNodeReflection (fixes #2574)

Author: arnaud-lb

src/Analyser/NodeScopeResolver.php

@@ -2585,7 +2585,11 @@ private function getPhpDocReturnType(?PhpDocBlock $phpDocBlock, ResolvedPhpDocBl
 			);
 		}
 
-		if (($phpDocBlock !== null && $phpDocBlock->isExplicit()) || $nativeReturnType->isSuperTypeOf($phpDocReturnType)->yes()) {
+		if ($phpDocBlock === null || $phpDocBlock->isExplicit()) {
+			return $phpDocReturnType;
+		}
+
+		if ($nativeReturnType->isSuperTypeOf(TemplateTypeHelper::resolveToBounds($phpDocReturnType))->yes()) {
 			return $phpDocReturnType;
 		}
 

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -9521,6 +9521,13 @@ public function testArrayShapesInPhpDoc(
 		);
 	}
 
+	public function dataBug2574(): array
+	{
+		require_once __DIR__ . '/data/bug2574.php';
+
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug2574.php');
+	}
+
 	public function dataBug2577(): array
 	{
 		require_once __DIR__ . '/data/bug2577.php';
@@ -9575,6 +9582,7 @@ public function dataStaticProperties(): array
 	}
 
 	/**
+	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
 	 * @dataProvider dataGenerics
 	 * @dataProvider dataGenericClassStringType

tests/PHPStan/Analyser/data/bug2574.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Analyser\Bug2574;
+
+use function PHPStan\Analyser\assertType;
+
+abstract class Model {
+	/** @return static */
+	public function newInstance() {
+		return new static();
+	}
+}
+
+class Model1 extends Model {
+}
+
+/**
+ * @template T of Model
+ * @param T $m
+ * @return T
+ */
+function foo(Model $m) : Model {
+	assertType('T of Analyser\Bug2574\Model (function Analyser\Bug2574\foo(), argument)', $m);
+	$instance = $m->newInstance();
+	assertType('T of Analyser\Bug2574\Model (function Analyser\Bug2574\foo(), argument)', $m);
+	return $instance;
+}
+
+function test(): void {
+	assertType('Analyser\Bug2574\Model1', foo(new Model1()));
+}

tests/PHPStan/Generics/GenericsIntegrationTest.php

@@ -14,10 +14,11 @@ public function dataTopics(): array
 			['varyingAcceptor'],
 			['classes'],
 			['variance'],
+			['bug2574'],
 			['bug2577'],
 			['bug2620'],
-			['bug2627'],
 			['bug2622'],
+			['bug2627'],
 		];
 	}
 

tests/PHPStan/Generics/data/Bug2574.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Generics\Bug2574;
+
+abstract class Model {
+	/** @return static */
+	public function newInstance() {
+		return new static();
+	}
+}
+
+/**
+ * @template T of Model
+ * @param T $m
+ * @return T
+ */
+function foo(Model $m) : Model {
+	return $m->newInstance();
+}

tests/PHPStan/Generics/data/bug2574-0.json

@@ -0,0 +1,7 @@
+[
+    {
+        "message": "Unsafe usage of new static().",
+        "line": 8,
+        "ignorable": true
+    }
+]

tests/PHPStan/Generics/data/bug2574.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Generics\Bug2574;
+
+abstract class Model {
+	/** @return static */
+	public function newInstance() {
+		return new static();
+	}
+}
+
+/**
+ * @template T of Model
+ * @param T $m
+ * @return T
+ */
+function foo(Model $m) : Model {
+	return $m->newInstance();
+}