Bump to PHPStan 1.12.5 and Fix deprecated ParametersAcceptorSelector:…

…:selectSingle() (#6329) * Fix deprecated ParametersAcceptorSelector::selectSingle() since PHPStan 1.12.5 * [ci-review] Rector Rectify * bump phpstan --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Sep 26, 2024 · f619d86 · f619d86
1 parent 06622fe
commit f619d86
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 17 deletions.
diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json
@@ -8,7 +8,7 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "phpstan/phpstan": "^1.12.4"
+        "phpstan/phpstan": "^1.12.5"
     },
     "autoload": {
         "files": [

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "ocramius/package-versions": "^2.9",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^1.32.0",
-        "phpstan/phpstan": "^1.12.4",
+        "phpstan/phpstan": "^1.12.5",
         "react/event-loop": "^1.5",
         "react/promise": "^3.2",
         "react/socket": "^1.15",

diff --git a/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php b/rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php
@@ -200,7 +200,7 @@ private function resolveExceptionArgumentPosition(Name $exceptionName): ?int
         }
 
         $extendedMethodReflection = $classReflection->getConstructor();
-        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::selectSingle(
+        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::combineAcceptors(
             $extendedMethodReflection->getVariants()
         );
 

diff --git a/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php b/rules/Transform/NodeTypeAnalyzer/TypeProvidingExprFromClassResolver.php
@@ -67,7 +67,7 @@ private function resolveMethodCallProvidingType(
         $methodReflections = $this->getClassMethodReflections($classReflection);
 
         foreach ($methodReflections as $methodReflection) {
-            $functionVariant = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
+            $functionVariant = ParametersAcceptorSelector::combineAcceptors($methodReflection->getVariants());
             $returnType = $functionVariant->getReturnType();
 
             if (! $this->isMatchingType($returnType, $objectType)) {

diff --git a/...Declaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php b/...Declaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php
@@ -9,7 +9,6 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Reflection\ParametersAcceptorWithPhpDocs;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -135,11 +134,7 @@ private function getReturnTypeRecursive(ClassMethod $classMethod): ?Type
                 return null;
             }
 
-            $parameterAcceptor = ParametersAcceptorSelector::selectSingle($parentMethodReflection->getVariants());
-
-            if (! $parameterAcceptor instanceof ParametersAcceptorWithPhpDocs) {
-                return null;
-            }
+            $parameterAcceptor = ParametersAcceptorSelector::combineAcceptors($parentMethodReflection->getVariants());
 
             $parentReturnType = $parameterAcceptor->getNativeReturnType();
             if (! $parentReturnType instanceof MixedType) {

diff --git a/src/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php b/src/FamilyTree/NodeAnalyzer/ClassChildAnalyzer.php
@@ -47,7 +47,7 @@ public function resolveParentClassMethodReturnType(ClassReflection $classReflect
         }
 
         foreach ($parentClassMethods as $parentClassMethod) {
-            $parametersAcceptor = ParametersAcceptorSelector::selectSingle($parentClassMethod->getVariants());
+            $parametersAcceptor = ParametersAcceptorSelector::combineAcceptors($parentClassMethod->getVariants());
             $nativeReturnType = $parametersAcceptor->getNativeReturnType();
 
             if (! $nativeReturnType instanceof MixedType) {

diff --git a/src/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php b/src/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php
@@ -174,7 +174,7 @@ private function resolveClassContextType(
         }
 
         $extendedMethodReflection = $classReflection->getMethod(MethodName::CONSTRUCT, $scope);
-        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::selectSingle(
+        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::combineAcceptors(
             $extendedMethodReflection->getVariants()
         );
 

diff --git a/src/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php b/src/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php
@@ -24,10 +24,6 @@ public static function select(
             return ParametersAcceptorSelector::combineAcceptors($variants);
         }
 
-        if ($node->isFirstClassCallable()) {
-            return ParametersAcceptorSelector::selectSingle($variants);
-        }
-
         return ParametersAcceptorSelector::selectFromArgs($scope, $node->getArgs(), $variants);
     }
 }
diff --git a/src/PhpAttribute/NodeFactory/AnnotationToAttributeIntegerValueCaster.php b/src/PhpAttribute/NodeFactory/AnnotationToAttributeIntegerValueCaster.php
@@ -104,7 +104,7 @@ private function resolveConstructorParameterReflections(ClassReflection $classRe
     {
         $extendedMethodReflection = $classReflection->getConstructor();
 
-        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::selectSingle(
+        $parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::combineAcceptors(
             $extendedMethodReflection->getVariants()
         );