Run Rector and cs fix

rectorphp · Dec 12, 2024 · f4c13e1 · f4c13e1
1 parent f2a1e26
commit f4c13e1
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 17 deletions.
diff --git a/src/Matcher/ClassMethodCallReferenceResolver.php b/src/Matcher/ClassMethodCallReferenceResolver.php
@@ -10,7 +10,6 @@
 use PHPStan\Node\MethodCallableNode;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\TypeWithClassName;
 use Rector\TypePerfect\ValueObject\MethodCallReference;
 
 final class ClassMethodCallReferenceResolver

diff --git a/src/Printer/CollectorMetadataPrinter.php b/src/Printer/CollectorMetadataPrinter.php
@@ -14,7 +14,6 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\UnionType;
 use PhpParser\PrettyPrinter\Standard;
-use PHPStan\Node\Printer\Printer;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
@@ -32,11 +31,11 @@
 
 final readonly class CollectorMetadataPrinter
 {
-    private Standard $printer;
+    private Standard $standard;
 
     public function __construct(
     ) {
-        $this->printer = new Standard();
+        $this->standard = new Standard();
     }
 
     public function printArgTypesAsString(MethodCall $methodCall, ExtendedMethodReflection $extendedMethodReflection, Scope $scope): string
@@ -97,7 +96,7 @@ public function printParamTypesToString(ClassMethod $classMethod, ?string $class
                 $paramType = $this->resolveSortedTypes($paramType, $className);
             }
 
-            $printedParamType = $this->printer->prettyPrint([$paramType]);
+            $printedParamType = $this->standard->prettyPrint([$paramType]);
             $printedParamType = str_replace('\Closure', 'callable', $printedParamType);
             $printedParamType = ltrim($printedParamType, '\\');
             $printedParamType = str_replace('|\\', '|', $printedParamType);

diff --git a/src/Reflection/ReflectionParser.php b/src/Reflection/ReflectionParser.php
@@ -79,12 +79,6 @@ private function parseFilenameToClass(string $fileName): ClassLike|null
     private function findFirstClassLike(array $nodes): ?ClassLike
     {
         $nodeFinder = new NodeFinder();
-
-        $foundClassLike = $nodeFinder->findFirstInstanceOf($nodes, ClassLike::class);
-        if ($foundClassLike instanceof ClassLike) {
-            return $foundClassLike;
-        }
-
-        return null;
+        return $nodeFinder->findFirstInstanceOf($nodes, ClassLike::class);
     }
 }
diff --git a/src/Rules/NarrowReturnObjectTypeRule.php b/src/Rules/NarrowReturnObjectTypeRule.php
@@ -15,7 +15,6 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeWithClassName;
 use Rector\TypePerfect\Configuration;
 use Rector\TypePerfect\NodeFinder\ReturnNodeFinder;
 use Rector\TypePerfect\Reflection\MethodNodeAnalyser;

diff --git a/src/Rules/NoMixedMethodCallerRule.php b/src/Rules/NoMixedMethodCallerRule.php
@@ -6,8 +6,8 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
-use PHPStan\Node\Printer\Printer;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;

diff --git a/src/Rules/NoMixedPropertyFetcherRule.php b/src/Rules/NoMixedPropertyFetcherRule.php
@@ -6,8 +6,8 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\PropertyFetch;
-use PHPStan\Node\Printer\Printer;
 use PHPStan\Analyser\Scope;
+use PHPStan\Node\Printer\Printer;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleError;
 use PHPStan\Rules\RuleErrorBuilder;

diff --git a/src/Rules/NoParamTypeRemovalRule.php b/src/Rules/NoParamTypeRemovalRule.php
@@ -82,8 +82,8 @@ public function processNode(Node $node, Scope $scope): array
 
     private function resolveParentParamType(PhpMethodReflection $phpMethodReflection, int $paramPosition): Type
     {
-        foreach ($phpMethodReflection->getVariants() as $parametersAcceptorWithPhpDoc) {
-            foreach ($parametersAcceptorWithPhpDoc->getParameters() as $parentParamPosition => $parameterReflectionWithPhpDoc) {
+        foreach ($phpMethodReflection->getVariants() as $variant) {
+            foreach ($variant->getParameters() as $parentParamPosition => $parameterReflectionWithPhpDoc) {
                 if ($paramPosition !== $parentParamPosition) {
                     continue;
                 }