[TypeDeclaration] Handle crash Multiple variants - use selectFromArgs() on ReturnAnnotationIncorrectNullableRector (rectorphp#3359)

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

Author: samsonasik

packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php

@@ -21,7 +21,12 @@ public static function select(
     ): ParametersAcceptor {
         $variants = $reflection->getVariants();
         if ($node instanceof FunctionLike) {
-            return ParametersAcceptorSelector::selectSingle($variants);
+            $parameterAcceptors = [];
+            foreach ($variants as $variant) {
+                $parameterAcceptors[] = ParametersAcceptorSelector::selectSingle([$variant]);
+            }
+
+            return ParametersAcceptorSelector::combineAcceptors($parameterAcceptors);
         }
 
         if ($node->isFirstClassCallable()) {

packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php

@@ -8,10 +8,10 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Return_;
+use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\FunctionVariantWithPhpDocs;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -22,6 +22,8 @@
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
 use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
 use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
 
@@ -94,7 +96,16 @@ private function isReturnTypeChangeAllowed(ClassMethod $classMethod): bool
             return true;
         }
 
-        $parametersAcceptor = ParametersAcceptorSelector::selectSingle($parentClassMethodReflection->getVariants());
+        $scope = $classMethod->getAttribute(AttributeKey::SCOPE);
+        if (! $scope instanceof Scope) {
+            return false;
+        }
+
+        $parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select(
+            $parentClassMethodReflection,
+            $classMethod,
+            $scope
+        );
         if ($parametersAcceptor instanceof FunctionVariantWithPhpDocs && ! $parametersAcceptor->getNativeReturnType() instanceof MixedType) {
             return false;
         }

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnAnnotationIncorrectNullableRector/Fixture/skip_return_anonymous_class_extends.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnAnnotationIncorrectNullableRector\Fixture;
+
+class SkipReturnAnonymousClassExtends
+{
+    public function getMockedRedis() : \Redis
+    {
+        $redis = new class() extends \Redis {
+            public function set($key, $value, $timeout = null)
+            {
+                throw new \BadMethodCallException('Not implemented in mock object');
+            }
+        };
+
+        return $redis;
+    }
+}
+
+