[DX] Test BetterNodeFinder with Laravel container (#4106)

composer.json

@@ -15,6 +15,7 @@
         "composer/xdebug-handler": "^3.0.3",
         "doctrine/inflector": "^2.0.6",
         "fidry/cpu-core-counter": "^0.5.1",
+        "illuminate/container": "^10.13",
         "nette/neon": "^3.4",
         "nette/utils": "^3.2",
         "nikic/php-parser": "^4.15.4",

packages-tests/Comments/CommentRemover/CommentRemoverTest.php

@@ -7,7 +7,6 @@
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Comments\CommentRemover;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\FileSystemRector\Parser\FileInfoParser;
 use Rector\Testing\Fixture\FixtureFileFinder;
@@ -21,15 +20,15 @@ final class CommentRemoverTest extends AbstractTestCase
 
     private FileInfoParser $fileInfoParser;
 
-    private NodePrinterInterface $nodePrinter;
+    private BetterStandardPrinter $betterStandardPrinter;
 
     protected function setUp(): void
     {
         $this->boot();
 
         $this->commentRemover = $this->getService(CommentRemover::class);
         $this->fileInfoParser = $this->getService(FileInfoParser::class);
-        $this->nodePrinter = $this->getService(BetterStandardPrinter::class);
+        $this->betterStandardPrinter = $this->getService(BetterStandardPrinter::class);
     }
 
     #[DataProvider('provideData')]
@@ -41,14 +40,14 @@ public function test(string $filePath): void
         $nodes = $this->fileInfoParser->parseFileInfoToNodesAndDecorate($inputFilePath);
         $nodesWithoutComments = $this->commentRemover->removeFromNode($nodes);
 
-        $fileContent = $this->nodePrinter->print($nodesWithoutComments);
+        $fileContent = $this->betterStandardPrinter->print($nodesWithoutComments);
         $fileContent = trim($fileContent);
 
         $expectedContent = trim((string) $expectedOutputContents);
         $this->assertSame($fileContent, $expectedContent);
 
         // original nodes are not touched
-        $originalContent = $this->nodePrinter->print($nodes);
+        $originalContent = $this->betterStandardPrinter->print($nodes);
         $this->assertNotSame($expectedContent, $originalContent);
     }
 

packages/NodeNameResolver/NodeNameResolver.php

@@ -17,7 +17,6 @@
 use Rector\Core\NodeAnalyzer\CallAnalyzer;
 use Rector\Core\Util\StringUtils;
 use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
-use Rector\NodeNameResolver\Error\InvalidNameNodeReporter;
 use Rector\NodeNameResolver\Regex\RegexPatternDetector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
@@ -42,7 +41,6 @@ final class NodeNameResolver
     public function __construct(
         private readonly RegexPatternDetector $regexPatternDetector,
         private readonly ClassNaming $classNaming,
-        private readonly InvalidNameNodeReporter $invalidNameNodeReporter,
         private readonly CallAnalyzer $callAnalyzer,
         private readonly array $nodeNameResolvers = []
     ) {
@@ -123,12 +121,8 @@ public function getName(Node | string $node): ?string
             return $namespacedName;
         }
 
-        if ($node instanceof MethodCall || $node instanceof StaticCall) {
-            if ($this->isCallOrIdentifier($node->name)) {
-                return null;
-            }
-
-            $this->invalidNameNodeReporter->reportInvalidNodeForName($node);
+        if (($node instanceof MethodCall || $node instanceof StaticCall) && $this->isCallOrIdentifier($node->name)) {
+            return null;
         }
 
         $scope = $node->getAttribute(AttributeKey::SCOPE);

packages/Testing/PHPUnit/AbstractLazyTestCase.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Testing\PHPUnit;
+
+use Illuminate\Container\Container;
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractLazyTestCase extends TestCase
+{
+    /**
+     * @template TType as object
+     * @param class-string<TType> $class
+     * @return TType
+     */
+    protected function make(string $class): object
+    {
+        $container = new Container();
+        return $container->make($class);
+    }
+}

phpstan.neon

@@ -719,6 +719,8 @@ parameters:
         - '#Cognitive complexity for "Rector\\(.*?)\:\:refactor\(\)" is (1[0-9]|20), keep it under 11#'
         - '#Cognitive complexity for "Rector\\DeadCode\\Rector\\StaticCall\\RemoveParentCallWithoutParentRector\:\:refactor\(\)" is 26, keep it under 11#'
 
+        - '#Call to deprecated method findFirstPrevious\(\) of class Rector\\Core\\PhpParser\\Node\\BetterNodeFinder#'
+
         - '#Return type (.*?) should be covariant with return type \(1\|2\|3\|4\|array<PhpParser\\Node>\|PhpParser\\Node\|null\) of method Rector\\Core\\Contract\\Rector(.*?)\:\:(.*?)#'
 
         # false positive

rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php

@@ -21,11 +21,11 @@
 use Rector\Arguments\NodeAnalyzer\ArgumentAddingScope;
 use Rector\Arguments\NodeAnalyzer\ChangedArgumentsDetector;
 use Rector\Arguments\ValueObject\ArgumentAdder;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Enum\ObjectReference;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\PhpParser\AstResolver;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Core\Rector\AbstractRector;
 use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
@@ -48,7 +48,7 @@ public function __construct(
         private readonly ArgumentAddingScope $argumentAddingScope,
         private readonly ChangedArgumentsDetector $changedArgumentsDetector,
         private readonly AstResolver $astResolver,
-        private readonly NodePrinterInterface $nodePrinter
+        private readonly BetterStandardPrinter $betterStandardPrinter
     ) {
     }
 
@@ -215,7 +215,7 @@ private function fillGapBetweenWithDefaultValue(MethodCall | StaticCall $node, i
                 throw new ShouldNotHappenException('Previous position does not have default value');
             }
 
-            $default = $this->nodePrinter->print($param->default);
+            $default = $this->betterStandardPrinter->print($param->default);
             $node->args[$index] = new Arg(new ConstFetch(new Name($default)));
         }
     }

rules/CodeQuality/Rector/If_/SimplifyIfElseToTernaryRector.php

@@ -13,7 +13,7 @@
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\If_;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -29,7 +29,7 @@ final class SimplifyIfElseToTernaryRector extends AbstractRector
     private const LINE_LENGTH_LIMIT = 120;
 
     public function __construct(
-        private readonly NodePrinterInterface $nodePrinter
+        private readonly BetterStandardPrinter $betterStandardPrinter
     ) {
     }
 
@@ -192,7 +192,7 @@ private function haveNestedTernary(array $nodes): bool
 
     private function isNodeTooLong(Assign $assign): bool
     {
-        $assignContent = $this->nodePrinter->print($assign);
+        $assignContent = $this->betterStandardPrinter->print($assign);
         return Strings::length($assignContent) > self::LINE_LENGTH_LIMIT;
     }
 }

rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php

@@ -15,7 +15,7 @@
 use Rector\BetterPhpDocParser\Comment\CommentsMerger;
 use Rector\CodeQuality\NodeManipulator\ExprBoolCaster;
 use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -28,7 +28,7 @@ final class SimplifyIfReturnBoolRector extends AbstractRector
     public function __construct(
         private readonly CommentsMerger $commentsMerger,
         private readonly ExprBoolCaster $exprBoolCaster,
-        private readonly NodePrinterInterface $nodePrinter
+        private readonly BetterStandardPrinter $betterStandardPrinter
     ) {
     }
 
@@ -146,7 +146,7 @@ private function shouldSkipIfAndReturn(If_ $if, Return_ $return): bool
             return ! $this->valueResolver->isTrueOrFalse($return->expr);
         }
 
-        $condString = $this->nodePrinter->print($if->cond);
+        $condString = $this->betterStandardPrinter->print($if->cond);
         if (! \str_contains($condString, '!=')) {
             return ! $this->valueResolver->isTrueOrFalse($return->expr);
         }

rules/DeadCode/NodeAnalyzer/ExprUsedInNodeAnalyzer.php

@@ -8,15 +8,15 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Include_;
 use PhpParser\Node\Expr\Variable;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\NodeAnalyzer\CompactFuncCallAnalyzer;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 
 final class ExprUsedInNodeAnalyzer
 {
     public function __construct(
         private readonly UsedVariableNameAnalyzer $usedVariableNameAnalyzer,
         private readonly CompactFuncCallAnalyzer $compactFuncCallAnalyzer,
-        private readonly NodePrinterInterface $nodePrinter
+        private readonly BetterStandardPrinter $betterStandardPrinter
     ) {
     }
 
@@ -28,7 +28,7 @@ public function isUsed(Node $node, Variable $variable): bool
 
         // variable as variable variable need mark as used
         if ($node instanceof Variable) {
-            $print = $this->nodePrinter->print($node);
+            $print = $this->betterStandardPrinter->print($node);
             if (\str_starts_with($print, '${$')) {
                 return true;
             }

rules/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector.php

@@ -10,7 +10,7 @@
 use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\PreDec;
 use PhpParser\Node\Expr\PreInc;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Util\MultiInstanceofChecker;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -28,7 +28,7 @@ final class RemoveDuplicatedArrayKeyRector extends AbstractRector
     private const ALLOWED_KEY_DUPLICATES = [PreInc::class, PreDec::class];
 
     public function __construct(
-        private readonly NodePrinterInterface $nodePrinter,
+        private readonly BetterStandardPrinter $betterStandardPrinter,
         private readonly MultiInstanceofChecker $multiInstanceofChecker
     ) {
     }
@@ -102,7 +102,7 @@ private function resolveDuplicateKeysArrayItems(Array_ $array): array
                 continue;
             }
 
-            $keyValue = $this->nodePrinter->print($arrayItem->key);
+            $keyValue = $this->betterStandardPrinter->print($arrayItem->key);
             $arrayItemsByKeys[$keyValue][] = $arrayItem;
         }
 

rules/DeadCode/Rector/If_/SimplifyIfElseWithSameContentRector.php

@@ -8,8 +8,8 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Else_;
 use PhpParser\Node\Stmt\If_;
-use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\Exception\ShouldNotHappenException;
+use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -20,7 +20,7 @@
 final class SimplifyIfElseWithSameContentRector extends AbstractRector
 {
     public function __construct(
-        private readonly NodePrinterInterface $nodePrinter,
+        private readonly BetterStandardPrinter $betterStandardPrinter,
     ) {
     }
 
@@ -83,18 +83,18 @@ public function refactor(Node $node): ?array
     private function isIfWithConstantReturns(If_ $if): bool
     {
         $possibleContents = [];
-        $possibleContents[] = $this->nodePrinter->print($if->stmts);
+        $possibleContents[] = $this->betterStandardPrinter->print($if->stmts);
 
         foreach ($if->elseifs as $elseif) {
-            $possibleContents[] = $this->nodePrinter->print($elseif->stmts);
+            $possibleContents[] = $this->betterStandardPrinter->print($elseif->stmts);
         }
 
         $else = $if->else;
         if (! $else instanceof Else_) {
             throw new ShouldNotHappenException();
         }
 
-        $possibleContents[] = $this->nodePrinter->print($else->stmts);
+        $possibleContents[] = $this->betterStandardPrinter->print($else->stmts);
 
         $uniqueContents = array_unique($possibleContents);