wip

TomasVotruba · TomasVotruba · commit 41f3cd213867 · 2025-12-21T23:57:10.000+01:00
diff --git a/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php b/rules/CodeQuality/Rector/If_/CompleteMissingIfElseBracketRector.php
@@ -68,7 +68,8 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $oldTokens = $this->getFile()->getOldTokens();
+        $oldTokens = $this->getFile()
+            ->getOldTokens();
         if ($this->isIfConditionFollowedByOpeningCurlyBracket($node, $oldTokens)) {
             return null;
         }
diff --git a/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php b/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php
@@ -62,7 +62,8 @@ public function refactor(Node $node): ?NotEqual
         $tokenEndPos = $node->getEndTokenPos();
 
         for ($i = $tokenStartPos; $i < $tokenEndPos; ++$i) {
-            $token = $this->getFile()->getOldTokens()[$i];
+            $token = $this->getFile()
+                ->getOldTokens()[$i];
 
             if ((string) $token === '<>') {
                 $token->text = '!=';
diff --git a/rules/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector.php b/rules/CodingStyle/Rector/Encapsed/WrapEncapsedVariableInCurlyBracesRector.php
@@ -52,7 +52,8 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         $hasVariableBeenWrapped = false;
-        $oldTokens = $this->getFile()->getOldTokens();
+        $oldTokens = $this->getFile()
+            ->getOldTokens();
 
         foreach ($node->parts as $index => $nodePart) {
             if ($nodePart instanceof Variable && $nodePart->getStartTokenPos() >= 0) {
diff --git a/rules/DeadCode/Rector/Concat/RemoveConcatAutocastRector.php b/rules/DeadCode/Rector/Concat/RemoveConcatAutocastRector.php
@@ -79,7 +79,8 @@ private function removeStringCast(Expr $expr): Expr
         }
 
         $targetExpr = $expr->expr;
-        $tokens = $this->getFile()->getOldTokens();
+        $tokens = $this->getFile()
+            ->getOldTokens();
 
         if ($expr->expr instanceof BinaryOp) {
             $castStartTokenPos = $expr->getStartTokenPos();
diff --git a/rules/Php53/Rector/Ternary/TernaryToElvisRector.php b/rules/Php53/Rector/Ternary/TernaryToElvisRector.php
@@ -77,7 +77,8 @@ public function provideMinPhpVersion(): int
 
     private function isParenthesized(Expr $ifExpr, Expr $elseExpr): bool
     {
-        $tokens = $this->getFile()->getOldTokens();
+        $tokens = $this->getFile()
+            ->getOldTokens();
 
         $ifExprTokenEnd = $ifExpr->getEndTokenPos();
         $elseExprTokenStart = $elseExpr->getStartTokenPos();
diff --git a/rules/Php54/Rector/Array_/LongArrayToShortArrayRector.php b/rules/Php54/Rector/Array_/LongArrayToShortArrayRector.php
@@ -78,7 +78,8 @@ public function refactor(Node $node): ?Node
 
         $node->setAttribute(AttributeKey::KIND, Array_::KIND_SHORT);
 
-        $tokens = $this->getFile()->getOldTokens();
+        $tokens = $this->getFile()
+            ->getOldTokens();
 
         $startTokenPos = $node->getStartTokenPos();
         $endTokenPos = $node->getEndTokenPos();
diff --git a/rules/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector.php b/rules/Php82/Rector/Encapsed/VariableInStringInterpolationFixerRector.php
@@ -51,7 +51,8 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $oldTokens = $this->getFile()->getOldTokens();
+        $oldTokens = $this->getFile()
+            ->getOldTokens();
         $hasChanged = false;
 
         foreach ($node->parts as $part) {
diff --git a/rules/Php84/Rector/MethodCall/NewMethodCallWithoutParenthesesRector.php b/rules/Php84/Rector/MethodCall/NewMethodCallWithoutParenthesesRector.php
@@ -53,7 +53,8 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $oldTokens = $this->getFile()->getOldTokens();
+        $oldTokens = $this->getFile()
+            ->getOldTokens();
 
         $loop = 1;
         while (isset($oldTokens[$node->var->getStartTokenPos() + $loop])) {
diff --git a/rules/Php85/Rector/Switch_/ColonAfterSwitchCaseRector.php b/rules/Php85/Rector/Switch_/ColonAfterSwitchCaseRector.php
@@ -50,7 +50,8 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         $hasChanged = false;
-        $oldTokens = $this->getFile()->getOldTokens();
+        $oldTokens = $this->getFile()
+            ->getOldTokens();
 
         foreach ($node->cases as $key => $case) {
             $cond = $case->cond;
diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php
@@ -157,7 +157,6 @@ public function refactor(Node $node): ?Node
 
             $inferredType = $this->allAssignNodePropertyTypeInferer->inferProperty(
                 $property,
-
                 $classReflection,
                 $this->getFile()
             );
diff --git a/rules/TypeDeclaration/Rector/StmtsAwareInterface/DeclareStrictTypesRector.php b/rules/TypeDeclaration/Rector/StmtsAwareInterface/DeclareStrictTypesRector.php
@@ -86,7 +86,8 @@ public function beforeTraverse(array $nodes): ?array
         }
 
         $rectorWithLineChange = new RectorWithLineChange(self::class, $rootStmt->getStartLine());
-        $this->getFile()->addRectorClassWithLine($rectorWithLineChange);
+        $this->getFile()
+            ->addRectorClassWithLine($rectorWithLineChange);
 
         return [$this->nodeFactory->createDeclaresStrictType(), new Nop(), ...$nodes];
     }
diff --git a/src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php b/src/PhpParser/NodeTraverser/AbstractImmutableNodeTraverser.php
@@ -59,21 +59,21 @@ public function removeVisitor(NodeVisitor $visitor): void
     public function traverse(array $nodes): array
     {
         $this->stopTraversal = false;
-//        foreach ($this->visitors as $visitor) {
-//            if (null !== $return = $visitor->beforeTraverse($nodes)) {
-//                $nodes = $return;
-//            }
-//        }
+        //        foreach ($this->visitors as $visitor) {
+        //            if (null !== $return = $visitor->beforeTraverse($nodes)) {
+        //                $nodes = $return;
+        //            }
+        //        }
 
         return $this->traverseArray($nodes);
-//        for ($i = \count($this->visitors) - 1; $i >= 0; --$i) {
-//            $visitor = $this->visitors[$i];
-//            if (null !== $return = $visitor->afterTraverse($nodes)) {
-//                $nodes = $return;
-//            }
-//        }
-
-//        return $nodes;
+        //        for ($i = \count($this->visitors) - 1; $i >= 0; --$i) {
+        //            $visitor = $this->visitors[$i];
+        //            if (null !== $return = $visitor->afterTraverse($nodes)) {
+        //                $nodes = $return;
+        //            }
+        //        }
+
+        //        return $nodes;
     }
 
     /**
diff --git a/src/PostRector/Rector/AbstractPostRector.php b/src/PostRector/Rector/AbstractPostRector.php
@@ -41,6 +41,7 @@ protected function addRectorClassWithLine(Node $node): void
         Assert::isInstanceOf($this->file, File::class);
 
         $rectorWithLineChange = new RectorWithLineChange(static::class, $node->getStartLine());
-        $this->getFile()->addRectorClassWithLine($rectorWithLineChange);
+        $this->getFile()
+            ->addRectorClassWithLine($rectorWithLineChange);
     }
 }
diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
@@ -114,31 +114,19 @@ public function autowire(
      */
     public function beforeTraverse(array $nodes): ?array
     {
-//        // workaround for file around refactor()
-//        $file = $this->currentFileProvider->getFile();
-//        if (! $file instanceof File) {
-//            throw new ShouldNotHappenException(
-//                'File object is missing. Make sure you call $this->currentFileProvider->setFile(...) before traversing.'
-//            );
-//        }
-//
-//        $this->getFile() = $file;
+        //        // workaround for file around refactor()
+        //        $file = $this->currentFileProvider->getFile();
+        //        if (! $file instanceof File) {
+        //            throw new ShouldNotHappenException(
+        //                'File object is missing. Make sure you call $this->currentFileProvider->setFile(...) before traversing.'
+        //            );
+        //        }
+        //
+        //        $this->getFile() = $file;
 
         return null;
     }
 
-    protected function getFile(): File
-    {
-        $file = $this->currentFileProvider->getFile();
-        if (! $file instanceof File) {
-            throw new ShouldNotHappenException(
-                'File object is missing. Make sure you call $this->currentFileProvider->setFile(...) before traversing.'
-            );
-        }
-
-        return $file;
-    }
-
     /**
      * @return NodeTraverser::REMOVE_NODE|Node|null
      */
@@ -148,7 +136,8 @@ final public function enterNode(Node $node): int|Node|null
             return null;
         }
 
-        $filePath = $this->getFile()->getFilePath();
+        $filePath = $this->getFile()
+            ->getFilePath();
         if ($this->skipper->shouldSkipCurrentNode($this, $filePath, static::class, $node)) {
             return null;
         }
@@ -184,7 +173,8 @@ final public function enterNode(Node $node): int|Node|null
 
             // notify this rule changed code
             $rectorWithLineChange = new RectorWithLineChange(static::class, $originalNode->getStartLine());
-            $this->getFile()->addRectorClassWithLine($rectorWithLineChange);
+            $this->getFile()
+                ->addRectorClassWithLine($rectorWithLineChange);
 
             // keep original node as node will be removed in leaveNode()
             return $originalNode;
@@ -220,6 +210,18 @@ final public function leaveNode(Node $node): array|int|Node|null
         return $this->nodesToReturn[$objectId] ?? $node;
     }
 
+    protected function getFile(): File
+    {
+        $file = $this->currentFileProvider->getFile();
+        if (! $file instanceof File) {
+            throw new ShouldNotHappenException(
+                'File object is missing. Make sure you call $this->currentFileProvider->setFile(...) before traversing.'
+            );
+        }
+
+        return $file;
+    }
+
     protected function isName(Node $node, string $name): bool
     {
         return $this->nodeNameResolver->isName($node, $name);
@@ -293,7 +295,8 @@ private function postRefactorProcess(
         $this->createdByRuleDecorator->decorate($refactoredNode, $originalNode, static::class);
 
         $rectorWithLineChange = new RectorWithLineChange(static::class, $originalNode->getStartLine());
-        $this->getFile()->addRectorClassWithLine($rectorWithLineChange);
+        $this->getFile()
+            ->addRectorClassWithLine($rectorWithLineChange);
 
         /** @var MutatingScope|null $currentScope */
         $currentScope = $node->getAttribute(AttributeKey::SCOPE);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public function refactor(Node $node): ?Node`
`68`	`68`	`return null;`
`69`	`69`	`}`
`70`	`70`
`71`		`- $oldTokens = $this->getFile()->getOldTokens();`
	`71`	`+ $oldTokens = $this->getFile()`
	`72`	`+ ->getOldTokens();`
`72`	`73`	`if ($this->isIfConditionFollowedByOpeningCurlyBracket($node, $oldTokens)) {`
`73`	`74`	`return null;`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ public function getNodeTypes(): array`
`52`	`52`	`public function refactor(Node $node): ?Node`
`53`	`53`	`{`
`54`	`54`	`$hasVariableBeenWrapped = false;`
`55`		`- $oldTokens = $this->getFile()->getOldTokens();`
	`55`	`+ $oldTokens = $this->getFile()`
	`56`	`+ ->getOldTokens();`
`56`	`57`
`57`	`58`	`foreach ($node->parts as $index => $nodePart) {`
`58`	`59`	`if ($nodePart instanceof Variable && $nodePart->getStartTokenPos() >= 0) {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ private function removeStringCast(Expr $expr): Expr`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`$targetExpr = $expr->expr;`
`82`		`- $tokens = $this->getFile()->getOldTokens();`
	`82`	`+ $tokens = $this->getFile()`
	`83`	`+ ->getOldTokens();`
`83`	`84`
`84`	`85`	`if ($expr->expr instanceof BinaryOp) {`
`85`	`86`	`$castStartTokenPos = $expr->getStartTokenPos();`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ public function provideMinPhpVersion(): int`
`77`	`77`
`78`	`78`	`private function isParenthesized(Expr $ifExpr, Expr $elseExpr): bool`
`79`	`79`	`{`
`80`		`- $tokens = $this->getFile()->getOldTokens();`
	`80`	`+ $tokens = $this->getFile()`
	`81`	`+ ->getOldTokens();`
`81`	`82`
`82`	`83`	`$ifExprTokenEnd = $ifExpr->getEndTokenPos();`
`83`	`84`	`$elseExprTokenStart = $elseExpr->getStartTokenPos();`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ public function getNodeTypes(): array`
`51`	`51`	`*/`
`52`	`52`	`public function refactor(Node $node): ?Node`
`53`	`53`	`{`
`54`		`- $oldTokens = $this->getFile()->getOldTokens();`
	`54`	`+ $oldTokens = $this->getFile()`
	`55`	`+ ->getOldTokens();`
`55`	`56`	`$hasChanged = false;`
`56`	`57`
`57`	`58`	`foreach ($node->parts as $part) {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ public function refactor(Node $node): ?Node`
`53`	`53`	`return null;`
`54`	`54`	`}`
`55`	`55`
`56`		`- $oldTokens = $this->getFile()->getOldTokens();`
	`56`	`+ $oldTokens = $this->getFile()`
	`57`	`+ ->getOldTokens();`
`57`	`58`
`58`	`59`	`$loop = 1;`
`59`	`60`	`while (isset($oldTokens[$node->var->getStartTokenPos() + $loop])) {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ public function getNodeTypes(): array`
`50`	`50`	`public function refactor(Node $node): ?Node`
`51`	`51`	`{`
`52`	`52`	`$hasChanged = false;`
`53`		`- $oldTokens = $this->getFile()->getOldTokens();`
	`53`	`+ $oldTokens = $this->getFile()`
	`54`	`+ ->getOldTokens();`
`54`	`55`
`55`	`56`	`foreach ($node->cases as $key => $case) {`
`56`	`57`	`$cond = $case->cond;`