[ci-review] Rector Rectify

Author: actions-user

rules/CodeQuality/Rector/MethodCall/ScalarArgumentToExpectedParamTypeRector.php

@@ -7,10 +7,12 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Scalar;
 use PhpParser\Node\Scalar\Int_;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
 use Rector\PHPUnit\CodeQuality\Reflection\MethodParametersAndReturnTypesResolver;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
@@ -112,28 +114,23 @@ public function refactor(Node $node): ?Node
         $callParameterTypes = $this->methodParametersAndReturnTypesResolver->resolveCallParameterTypes($node);
 
         foreach ($node->getArgs() as $key => $arg) {
-            if (! $arg->value instanceof Node\Scalar) {
+            if (! $arg->value instanceof Scalar) {
                 continue;
             }
 
             $knownParameterType = $callParameterTypes[$key] ?? null;
-            if (! $knownParameterType instanceof \PHPStan\Type\Type) {
+            if (! $knownParameterType instanceof Type) {
                 continue;
             }
 
-            if ($knownParameterType instanceof StringType) {
-                if ($arg->value instanceof Int_) {
-                    $arg->value = new String_((string) $arg->value->value);
-
-                    $hasChanged = true;
-                }
+            if ($knownParameterType instanceof StringType && $arg->value instanceof Int_) {
+                $arg->value = new String_((string) $arg->value->value);
+                $hasChanged = true;
             }
 
-            if ($knownParameterType instanceof IntegerType) {
-                if ($arg->value instanceof String_) {
-                    $arg->value = new Int_((int) $arg->value->value);
-                    $hasChanged = true;
-                }
+            if ($knownParameterType instanceof IntegerType && $arg->value instanceof String_) {
+                $arg->value = new Int_((int) $arg->value->value);
+                $hasChanged = true;
             }
         }
 

rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php

@@ -87,9 +87,9 @@ public function resolveCallParameterTypes(MethodCall|StaticCall $call): ?array
         }
 
         $scope = ScopeFetcher::fetch($call);
-        $methodReflection = $classReflection->getMethod($methodName, $scope);
+        $extendedMethodReflection = $classReflection->getMethod($methodName, $scope);
 
-        return $this->resolveParameterTypes($methodReflection, $classReflection);
+        return $this->resolveParameterTypes($extendedMethodReflection, $classReflection);
     }
 
     /**