Replace ParametersAcceptorSelector::selectSingle() with ParametersAcceptorSelectorVariantsWrapper::select() when possible (rectorphp#3361)

* Replace ParametersAcceptorSelector::selectSingle() with ParametersAcceptorSelectorVariantsWrapper::select() when possible

* [ci-review] Rector Rectify

---------

Co-authored-by: GitHub Action <[email protected]>

Author: samsonasik

packages/NodeTypeResolver/MethodParameterTypeResolver.php

@@ -9,7 +9,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\Native\NativeMethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Type;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -61,19 +60,14 @@ private function provideParameterTypesFromMethodReflection(
         }
 
         $parameterTypes = [];
+        $scope = $node->getAttribute(AttributeKey::SCOPE);
 
-        if ($node instanceof ClassMethod) {
-            $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
-        } else {
-            $scope = $node->getAttribute(AttributeKey::SCOPE);
-
-            if (! $scope instanceof Scope) {
-                return [];
-            }
-
-            $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($methodReflection, $node, $scope);
+        if (! $scope instanceof Scope) {
+            return [];
         }
 
+        $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($methodReflection, $node, $scope);
+
         foreach ($parametersAcceptor->getParameters() as $parameterReflection) {
             $parameterTypes[] = $parameterReflection->getType();
         }

packages/PhpDocParser/TypeAnalyzer/ClassMethodReturnTypeResolver.php

@@ -8,9 +8,9 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\FunctionVariant;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
+use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
 
 /**
  * @api
@@ -28,7 +28,11 @@ public function resolve(ClassMethod $classMethod, Scope $scope): Type
 
         $extendedMethodReflection = $classReflection->getMethod($methodName, $scope);
 
-        $parametersAcceptor = ParametersAcceptorSelector::selectSingle($extendedMethodReflection->getVariants());
+        $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select(
+            $extendedMethodReflection,
+            $classMethod,
+            $scope
+        );
         if (! $parametersAcceptor instanceof FunctionVariant) {
             return new MixedType();
         }