Fix resolving generics from phpstorm-stubs

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -914,6 +914,7 @@ private function createNativeMethodVariant(
 				$phpDocType = $stubPhpDocParameterTypes[$parameterSignature->getName()];
 			} elseif (isset($phpDocParameterTypes[$phpDocParameterName])) {
 				$phpDocType = $phpDocParameterTypes[$phpDocParameterName];
+				$type = TypehintHelper::decideType($parameterSignature->getType(), $phpDocType);
 			}
 
 			if (isset($stubPhpDocParameterOutTypes[$parameterSignature->getName()])) {

tests/PHPStan/Reflection/ParametersAcceptorSelectorTest.php

@@ -8,16 +8,19 @@
 use PhpParser\Node\Name;
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\Php\DummyParameter;
+use PHPStan\Reflection\Php\ExtendedDummyParameter;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\Generic\TemplateTypeFactory;
+use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeScope;
 use PHPStan\Type\Generic\TemplateTypeVariance;
+use PHPStan\Type\Generic\TemplateTypeVarianceMap;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
@@ -28,7 +31,9 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
+use PHPStan\Type\VoidType;
 use PHPUnit\Framework\Attributes\DataProvider;
+use function array_map;
 use function count;
 
 class ParametersAcceptorSelectorTest extends PHPStanTestCase
@@ -69,7 +74,27 @@ public static function dataSelectFromTypes(): Generator
 			],
 			$datePeriodConstructorVariants,
 			false,
-			$datePeriodConstructorVariants[0],
+			new FunctionVariant(
+				TemplateTypeMap::createEmpty(),
+				TemplateTypeMap::createEmpty(),
+				array_map(static fn ($parameter) => new ExtendedDummyParameter(
+					$parameter->getName(),
+					TemplateTypeHelper::resolveToBounds($parameter->getType()),
+					$parameter->isOptional(),
+					$parameter->passedByReference(),
+					$parameter->isVariadic(),
+					$parameter->getDefaultValue(),
+					$parameter->getNativeType(),
+					$parameter->getPhpDocType(),
+					$parameter->getOutType(),
+					$parameter->isImmediatelyInvokedCallable(),
+					$parameter->getClosureThisType(),
+					$parameter->getAttributes(),
+				), $datePeriodConstructorVariants[0]->getParameters()),
+				false,
+				new VoidType(),
+				TemplateTypeVarianceMap::createEmpty(),
+			),
 		];
 		yield [
 			[
@@ -80,7 +105,27 @@ public static function dataSelectFromTypes(): Generator
 			],
 			$datePeriodConstructorVariants,
 			false,
-			$datePeriodConstructorVariants[1],
+			new FunctionVariant(
+				TemplateTypeMap::createEmpty(),
+				TemplateTypeMap::createEmpty(),
+				array_map(static fn ($parameter) => new ExtendedDummyParameter(
+					$parameter->getName(),
+					TemplateTypeHelper::resolveToBounds($parameter->getType()),
+					$parameter->isOptional(),
+					$parameter->passedByReference(),
+					$parameter->isVariadic(),
+					$parameter->getDefaultValue(),
+					$parameter->getNativeType(),
+					$parameter->getPhpDocType(),
+					$parameter->getOutType(),
+					$parameter->isImmediatelyInvokedCallable(),
+					$parameter->getClosureThisType(),
+					$parameter->getAttributes(),
+				), $datePeriodConstructorVariants[1]->getParameters()),
+				false,
+				new VoidType(),
+				TemplateTypeVarianceMap::createEmpty(),
+			),
 		];
 		yield [
 			[

tests/PHPStan/Rules/Classes/InstantiationRuleTest.php

@@ -395,7 +395,7 @@ public function testBug7048(): void
 				21,
 			],
 			[
-				'Missing parameter $end (DateTimeInterface|int) in call to DatePeriod constructor.',
+				'Missing parameter $end (int|TEnd of DateTimeInterface) in call to DatePeriod constructor.',
 				18,
 			],
 			[
@@ -407,11 +407,11 @@ public function testBug7048(): void
 				24,
 			],
 			[
-				'Parameter #3 $end of class DatePeriod constructor expects DateTimeInterface|int, string given.',
+				'Parameter #3 $end of class DatePeriod constructor expects int|TEnd of DateTimeInterface, string given.',
 				41,
 			],
 			[
-				'Parameter $end of class DatePeriod constructor expects DateTimeInterface|int, string given.',
+				'Parameter $end of class DatePeriod constructor expects int|TEnd of DateTimeInterface, string given.',
 				49,
 			],
 		]);

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -3556,4 +3556,20 @@ public function testBug12940(): void
 		$this->analyse([__DIR__ . '/data/bug-12940.php'], []);
 	}
 
+	#[RequiresPhp('>= 8.1')]
+	public function testBug13171(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+
+		$this->analyse([__DIR__ . '/data/bug-13171.php'], [
+			[
+				'Parameter #1 $value of method Fiber<void,void,void,void>::resume() expects void, int given.',
+				9,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-13171.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Bug13171;
+
+use Fiber;
+
+/** @param Fiber<void, void, void, void> $a */
+function foo (Fiber $a): void {
+	$a->resume(1);
+};