Updated PHPStan

Author: lookyman

src/Type/Symfony/ContainerInterfaceDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Symfony\ServiceMap;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
@@ -43,7 +44,7 @@ public function getTypeFromMethodCall(
 				return new ObjectType($service['class'] ?? $service['id']);
 			}
 		}
-		return $methodReflection->getReturnType();
+		return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 	}
 
 }

src/Type/Symfony/ControllerDynamicReturnTypeExtension.php

@@ -5,6 +5,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Symfony\ServiceMap;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
@@ -43,7 +44,7 @@ public function getTypeFromMethodCall(
 				return new ObjectType($service['class'] ?? $service['id']);
 			}
 		}
-		return $methodReflection->getReturnType();
+		return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 	}
 
 }

tests/Type/Symfony/ContainerInterfaceDynamicReturnTypeExtensionTest.php

@@ -8,6 +8,7 @@
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Symfony\ServiceMap;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
@@ -71,8 +72,10 @@ public function getTypeFromMethodCallProvider(): array
 	{
 		$notFoundType = $this->createMock(Type::class);
 
+		$parametersAcceptorNotFound = $this->createMock(ParametersAcceptor::class);
+		$parametersAcceptorNotFound->expects(self::once())->method('getReturnType')->willReturn($notFoundType);
 		$methodReflectionNotFound = $this->createMock(MethodReflection::class);
-		$methodReflectionNotFound->expects(self::once())->method('getReturnType')->willReturn($notFoundType);
+		$methodReflectionNotFound->expects(self::once())->method('getVariants')->willReturn([$parametersAcceptorNotFound]);
 
 		return [
 			'found' => [

tests/Type/Symfony/ControllerDynamicReturnTypeExtensionTest.php

@@ -8,6 +8,7 @@
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Symfony\ServiceMap;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
@@ -71,8 +72,10 @@ public function getTypeFromMethodCallProvider(): array
 	{
 		$notFoundType = $this->createMock(Type::class);
 
+		$parametersAcceptorNotFound = $this->createMock(ParametersAcceptor::class);
+		$parametersAcceptorNotFound->expects(self::once())->method('getReturnType')->willReturn($notFoundType);
 		$methodReflectionNotFound = $this->createMock(MethodReflection::class);
-		$methodReflectionNotFound->expects(self::once())->method('getReturnType')->willReturn($notFoundType);
+		$methodReflectionNotFound->expects(self::once())->method('getVariants')->willReturn([$parametersAcceptorNotFound]);
 
 		return [
 			'found' => [