[ci-review] Rector Rectify

Author: actions-user

rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableArgumentRector.php

@@ -10,8 +10,8 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Foreach_;
+use PhpParser\NodeVisitor;
 use PHPStan\Type\ObjectType;
-use PHPStan\Type\Type;
 use Rector\PHPUnit\CodeQuality\NodeAnalyser\NullableObjectAssignCollector;
 use Rector\PHPUnit\CodeQuality\NodeFactory\AssertMethodCallFactory;
 use Rector\PHPUnit\CodeQuality\TypeAnalyzer\MethodCallParameterTypeResolver;
@@ -171,7 +171,7 @@ private function matchedNullableArgumentNameToType(
         $this->traverseNodesWithCallable($stmt, function (Node $node) use (
             $variableNameToTypeCollection,
             &$matchedNullableVariableNameToType
-        ) {
+        ): ?int {
             if (! $node instanceof MethodCall) {
                 return null;
             }
@@ -209,7 +209,7 @@ private function matchedNullableArgumentNameToType(
                     return null;
                 }
 
-                return \PhpParser\NodeVisitor::STOP_TRAVERSAL;
+                return NodeVisitor::STOP_TRAVERSAL;
             }
 
             return null;

rules/CodeQuality/Rector/ClassMethod/AddInstanceofAssertForNullableInstanceRector.php

@@ -11,7 +11,6 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\NodeVisitor;
-use PHPStan\Type\Type;
 use Rector\PHPUnit\CodeQuality\NodeAnalyser\NullableObjectAssignCollector;
 use Rector\PHPUnit\CodeQuality\NodeFactory\AssertMethodCallFactory;
 use Rector\PHPUnit\CodeQuality\TypeAnalyzer\SimpleTypeAnalyzer;

rules/CodeQuality/TypeAnalyzer/MethodCallParameterTypeResolver.php

@@ -7,17 +7,18 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Type\Type;
 use Rector\Reflection\ReflectionResolver;
 
-final class MethodCallParameterTypeResolver
+final readonly class MethodCallParameterTypeResolver
 {
     public function __construct(
         private ReflectionResolver $reflectionResolver
     ) {
     }
 
     /**
-     * @return \PHPStan\Type\Type[]|null
+     * @return Type[]|null
      */
     public function resolve(MethodCall $methodCall): ?array
     {
@@ -30,11 +31,11 @@ public function resolve(MethodCall $methodCall): ?array
             return null;
         }
 
-        $parametersAcceptor = ParametersAcceptorSelector::combineAcceptors($methodReflection->getVariants());
+        $extendedParametersAcceptor = ParametersAcceptorSelector::combineAcceptors($methodReflection->getVariants());
 
         $parameterTypesByPosition = [];
-        foreach ($parametersAcceptor->getParameters() as $parameterReflection) {
-            $parameterTypesByPosition[] = $parameterReflection->getType();
+        foreach ($extendedParametersAcceptor->getParameters() as $extendedParameterReflection) {
+            $parameterTypesByPosition[] = $extendedParameterReflection->getType();
         }
 
         return $parameterTypesByPosition;