Updated PHPStan

Author: ondrejmirtes

phpstan.neon

@@ -1,7 +1,7 @@
 includes:
 	- extension.neon
 	- rules.neon
-	- vendor/phpstan/phpstan-strict-rules/rules.neon
+	#- vendor/phpstan/phpstan-strict-rules/rules.neon
 
 parameters:
 	excludes_analyse:

src/Type/PHPUnit/CreateMockDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -36,19 +37,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
 		$argumentIndex = $this->methods[$methodReflection->getName()];
+		$parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
 		if (!isset($methodCall->args[$argumentIndex])) {
-			return $methodReflection->getReturnType();
+			return $parametersAcceptor->getReturnType();
 		}
 		$argType = $scope->getType($methodCall->args[$argumentIndex]->value);
 		if (!$argType instanceof ConstantStringType) {
-			return $methodReflection->getReturnType();
+			return $parametersAcceptor->getReturnType();
 		}
 
 		$class = $argType->getValue();
 
 		return TypeCombinator::intersect(
 			new ObjectType($class),
-			$methodReflection->getReturnType()
+			$parametersAcceptor->getReturnType()
 		);
 	}
 

src/Type/PHPUnit/GetMockBuilderDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
@@ -24,7 +25,8 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		$mockBuilderType = $methodReflection->getReturnType();
+		$parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
+		$mockBuilderType = $parametersAcceptor->getReturnType();
 		if (count($methodCall->args) === 0) {
 			return $mockBuilderType;
 		}

src/Type/PHPUnit/MockBuilderDynamicReturnTypeExtension.php

@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\Broker;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -25,7 +26,9 @@ public function setBroker(Broker $broker): void
 	public function getClass(): string
 	{
 		$testCase = $this->broker->getClass(\PHPUnit\Framework\TestCase::class);
-		$mockBuilderType = $testCase->getNativeMethod('getMockBuilder')->getReturnType();
+		$mockBuilderType = ParametersAcceptorSelector::selectSingle(
+			$testCase->getNativeMethod('getMockBuilder')->getVariants()
+		)->getReturnType();
 		if (!$mockBuilderType instanceof TypeWithClassName) {
 			throw new \PHPStan\ShouldNotHappenException();
 		}
@@ -52,13 +55,15 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			return $calledOnType;
 		}
 
+		$parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
+
 		if (!$calledOnType instanceof MockBuilderType) {
-			return $methodReflection->getReturnType();
+			return $parametersAcceptor->getReturnType();
 		}
 
 		return TypeCombinator::intersect(
 			new ObjectType($calledOnType->getMockedClass()),
-			$methodReflection->getReturnType()
+			$parametersAcceptor->getReturnType()
 		);
 	}