[ci-review] Rector Rectify

Author: actions-user

rules/CodeQuality/Rector/Catch_/ThrowWithPreviousExceptionRector.php

@@ -210,9 +210,9 @@ private function resolveExceptionArgumentPosition(Name $exceptionName): ?int
             $extendedMethodReflection->getVariants()
         );
 
-        foreach ($extendedParametersAcceptor->getParameters() as $position => $parameterReflectionWithPhpDoc) {
-            $parameterType = $parameterReflectionWithPhpDoc->getType();
-            $className = ClassNameFromObjectTypeResolver::resolve($parameterReflectionWithPhpDoc->getType());
+        foreach ($extendedParametersAcceptor->getParameters() as $position => $extendedParameterReflection) {
+            $parameterType = $extendedParameterReflection->getType();
+            $className = ClassNameFromObjectTypeResolver::resolve($extendedParameterReflection->getType());
 
             if ($className === null) {
                 continue;

rules/CodingStyle/Rector/ClassConst/RemoveFinalFromConstRector.php

@@ -63,12 +63,12 @@ public function refactor(Node $node): ?Node
         }
 
         $hasChanged = false;
-        foreach ($node->getConstants() as $constant) {
-            if (! $constant->isFinal()) {
+        foreach ($node->getConstants() as $classConst) {
+            if (! $classConst->isFinal()) {
                 continue;
             }
 
-            $this->visibilityManipulator->removeFinal($constant);
+            $this->visibilityManipulator->removeFinal($classConst);
             $hasChanged = true;
         }
 

rules/Php71/Rector/FuncCall/RemoveExtraParametersRector.php

@@ -147,8 +147,8 @@ private function resolveMaximumAllowedParameterCount(
         MethodReflection | FunctionReflection $functionLikeReflection
     ): int {
         $parameterCounts = [0];
-        foreach ($functionLikeReflection->getVariants() as $variant) {
-            $parameterCounts[] = count($variant->getParameters());
+        foreach ($functionLikeReflection->getVariants() as $parametersAcceptor) {
+            $parameterCounts[] = count($parametersAcceptor->getParameters());
         }
 
         return max($parameterCounts);

rules/TypeDeclaration/Rector/ClassMethod/BoolReturnTypeFromBooleanStrictReturnsRector.php

@@ -170,8 +170,8 @@ private function isNativeBooleanReturnTypeFuncCall(FuncCall $funcCall): bool
             return false;
         }
 
-        foreach ($functionReflection->getVariants() as $variant) {
-            if (! $variant->getNativeReturnType()->isBoolean()->yes()) {
+        foreach ($functionReflection->getVariants() as $extendedParametersAcceptor) {
+            if (! $extendedParametersAcceptor->getNativeReturnType()->isBoolean()->yes()) {
                 return false;
             }
         }

src/NodeAnalyzer/VariadicAnalyzer.php

@@ -30,9 +30,9 @@ public function hasVariadicParameters(FuncCall | StaticCall | MethodCall $call):
 
     private function hasVariadicVariant(MethodReflection | FunctionReflection $functionLikeReflection): bool
     {
-        foreach ($functionLikeReflection->getVariants() as $variant) {
+        foreach ($functionLikeReflection->getVariants() as $parametersAcceptor) {
             // can be any number of arguments → nothing to limit here
-            if ($variant->isVariadic()) {
+            if ($parametersAcceptor->isVariadic()) {
                 return true;
             }
         }

src/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php

@@ -178,8 +178,8 @@ private function resolveClassContextType(
             $extendedMethodReflection->getVariants()
         );
 
-        foreach ($extendedParametersAcceptor->getParameters() as $parameterReflectionWithPhpDoc) {
-            if (! $parameterReflectionWithPhpDoc->getDefaultValue() instanceof Type) {
+        foreach ($extendedParametersAcceptor->getParameters() as $extendedParameterReflection) {
+            if (! $extendedParameterReflection->getDefaultValue() instanceof Type) {
                 return new MixedType();
             }
         }

src/NodeTypeResolver/NodeTypeResolver.php

@@ -29,13 +29,11 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\Native\NativeFunctionReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
-use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
@@ -54,9 +52,6 @@
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverAwareInterface;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyArrayTypeCorrector;
-use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyStringTypeCorrector;
-use Rector\NodeTypeResolver\NodeTypeCorrector\GenericClassStringTypeCorrector;
 use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
 use Rector\Php\PhpVersionProvider;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
@@ -82,11 +77,8 @@ final class NodeTypeResolver
     public function __construct(
         private readonly ObjectTypeSpecifier $objectTypeSpecifier,
         private readonly ClassAnalyzer $classAnalyzer,
-        private readonly GenericClassStringTypeCorrector $genericClassStringTypeCorrector,
         private readonly NodeTypeCorrector $nodeTypeCorrector,
         private readonly ReflectionProvider $reflectionProvider,
-        private readonly AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector,
-        private readonly AccessoryNonEmptyArrayTypeCorrector $accessoryNonEmptyArrayTypeCorrector,
         private readonly RenamedClassesDataCollector $renamedClassesDataCollector,
         private readonly NodeNameResolver $nodeNameResolver,
         private readonly PhpVersionProvider $phpVersionProvider,