Remove deprecated ParametersAcceptorSelector::selectFromArgs (#272)

shipmonk-rnd · Oct 1, 2024 · d144495 · d144495
1 parent d35bf66
commit d144495
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpstan/phpstan": "^1.11.0"
+        "phpstan/phpstan": "^1.12.5"
     },
     "require-dev": {
         "editorconfig-checker/editorconfig-checker": "^10.6.0",
@@ -74,7 +74,7 @@
         "check:ec": "ec src tests",
         "check:ignores": "php bin/verify-inline-ignore.php",
         "check:tests": "phpunit -vvv tests",
-        "check:types": "phpstan analyse -vvv --ansi",
+        "check:types": "phpstan analyse -vv --ansi",
         "fix:cs": "phpcbf"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/src/Rule/EnforceListReturnRule.php b/src/Rule/EnforceListReturnRule.php
@@ -6,9 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\ClosureReturnStatementsNode;
 use PHPStan\Node\ReturnStatementsNode;
-use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -43,12 +41,15 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        if ($this->alwaysReturnList($node) && !$this->isMarkedWithListReturn($methodReflection)) {
+        $returnType = $methodReflection->getReturnType();
+
+        if ($this->alwaysReturnList($node) && !$returnType->isList()->yes()) {
             $callLikeType = $methodReflection instanceof MethodReflection
                 ? 'Method'
                 : 'Function';
+            $returnTypeString = $returnType->describe(VerbosityLevel::precise());
 
-            $error = RuleErrorBuilder::message("{$callLikeType} {$methodReflection->getName()} always return list, but is marked as {$this->getReturnPhpDoc($methodReflection)}")
+            $error = RuleErrorBuilder::message("{$callLikeType} {$methodReflection->getName()} always return list, but is marked as {$returnTypeString}")
                 ->identifier('shipmonk.returnListNotUsed')
                 ->build();
             return [$error];
@@ -57,15 +58,6 @@ public function processNode(Node $node, Scope $scope): array
         return [];
     }
 
-    /**
-     * @param FunctionReflection|MethodReflection $methodReflection
-     */
-    private function getReturnPhpDoc(object $methodReflection): string
-    {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
-        return $returnType->describe(VerbosityLevel::precise());
-    }
-
     private function alwaysReturnList(ReturnStatementsNode $node): bool
     {
         $returnStatementsCount = count($node->getReturnStatements());
@@ -95,13 +87,4 @@ private function alwaysReturnList(ReturnStatementsNode $node): bool
         return true;
     }
 
-    /**
-     * @param FunctionReflection|MethodReflection $methodReflection
-     */
-    private function isMarkedWithListReturn(object $methodReflection): bool
-    {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
-        return $returnType->isList()->yes();
-    }
-
 }
diff --git a/src/Rule/ForbidReturnValueInYieldingMethodRule.php b/src/Rule/ForbidReturnValueInYieldingMethodRule.php
@@ -8,7 +8,6 @@
 use PHPStan\Node\ClosureReturnStatementsNode;
 use PHPStan\Node\MethodReturnStatementsNode;
 use PHPStan\Node\ReturnStatementsNode;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -90,7 +89,7 @@ private function getReturnType(ReturnStatementsNode $node, Scope $scope): Type
         }
 
         if ($methodReflection !== null) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return $methodReflection->getReturnType();
         }
 
         return new MixedType();

diff --git a/src/Rule/ForbidUselessNullableReturnRule.php b/src/Rule/ForbidUselessNullableReturnRule.php
@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\ClosureReturnStatementsNode;
 use PHPStan\Node\ReturnStatementsNode;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -39,7 +38,7 @@ public function processNode(Node $node, Scope $scope): array
         if ($node instanceof ClosureReturnStatementsNode) {
             $declaredType = $scope->getFunctionType($node->getClosureExpr()->getReturnType(), false, false);
         } elseif ($methodReflection !== null) {
-            $declaredType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            $declaredType = $methodReflection->getReturnType();
         } else {
             return [];
         }

diff --git a/src/Rule/RequirePreviousExceptionPassRule.php b/src/Rule/RequirePreviousExceptionPassRule.php
@@ -171,7 +171,11 @@ private function getCallLikeParameters(CallLike $node, Scope $scope): array
 
         // FuncCall not yet supported
         if ($methodReflection !== null) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getParameters();
+            return ParametersAcceptorSelector::selectFromArgs(
+                $scope,
+                $node->getArgs(),
+                $methodReflection->getVariants(),
+            )->getParameters();
         }
 
         return [];