inluce non-core special nodes

Author: TomasVotruba

rules-tests/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector/Fixture/remove_on_caller_via_self.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector\Fixture;
+
+class RemoveOnCallerViaSelf
+{
+	private static function just_a_test(
+        string $foo,
+        array $bar,
+        $used_parameter
+    ): void {
+		\external::whatever($foo, $used_parameter);
+	}
+
+	public static function trigger(): void
+	{
+		self::just_a_test('hello', [], 'test');
+	}
+}
+
+?>

rules/CodeQuality/Rector/If_/SimplifyIfReturnBoolRector.php

@@ -80,6 +80,10 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            if ($key === 0) {
+                continue;
+            }
+
             $previousStmt = $node->stmts[$key - 1] ?? null;
             if (! $previousStmt instanceof If_) {
                 continue;

src/Bridge/PhpParser/NodeClassFinder.php

@@ -5,6 +5,8 @@
 namespace Rector\Bridge\PhpParser;
 
 use Nette\Loaders\RobotLoader;
+use PHPStan\Node\AnonymousClassNode;
+use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use ReflectionClass;
 
 final class NodeClassFinder
@@ -26,13 +28,21 @@ public static function find(): array
         /** @var array<class-string> $nodeClasses */
         $nodeClasses = array_keys($robotLoader->getIndexedClasses());
 
-        return array_filter($nodeClasses, function (string $nodeClass): bool {
+        $instantiableNodeClasses = array_filter($nodeClasses, function (string $nodeClass): bool {
             $nodeClassReflection = new ReflectionClass($nodeClass);
             if ($nodeClassReflection->isAbstract()) {
                 return false;
             }
 
             return ! $nodeClassReflection->isInterface();
         });
+
+        // this is needed, as PHPStan replaces the Class_ node of anonymous class completely
+        // @see https://github.com/phpstan/phpstan-src/blob/2.1.x/src/Parser/AnonymousClassVisitor.php
+        $specialPHPStanNodes = [AnonymousClassNode::class];
+
+        $specialRectorNodes = [FileWithoutNamespace::class];
+
+        return array_merge($instantiableNodeClasses, $specialPHPStanNodes, $specialRectorNodes);
     }
 }

src/Configuration/ConfigurationRuleFilter.php

@@ -31,7 +31,11 @@ public function filter(array $rectors): array
 
         $onlyRule = $this->configuration->getOnlyRule();
         if ($onlyRule !== null) {
-            return [$onlyRule];
+            foreach ($rectors as $rector) {
+                if ($rector instanceof $onlyRule) {
+                    return [$rector];
+                }
+            }
         }
 
         return $rectors;

src/PhpParser/NodeTraverser/RectorNodeTraverser.php

@@ -65,7 +65,6 @@ public function refreshPhpRectors(array $rectors): void
     public function getVisitorsForNode(Node $node): array
     {
         Assert::true($this->areNodeVisitorsPrepared);
-
         return $this->visitorsPerNodeClass[$node::class] ?? [];
     }
 
@@ -85,13 +84,11 @@ private function prepareNodeVisitors(): void
         // filter by configuration
         $this->visitors = $this->configurationRuleFilter->filter($this->visitors);
 
-        // static $counter = 0;
-
         // 1. get all node non-interface, non-abstract classes
         // 2. iterate through them
-        foreach (\Rector\Bridge\PhpParser\NodeClassFinder::find() as $nodeClass) {
-            /** @var RectorInterface $visitor */
-            foreach ($this->visitors as $visitor) {
+        /** @var RectorInterface $visitor */
+        foreach ($this->visitors as $visitor) {
+            foreach (\Rector\Bridge\PhpParser\NodeClassFinder::find() as $nodeClass) {
                 foreach ($visitor->getNodeTypes() as $matchingNodeType) {
                     if (is_a($nodeClass, $matchingNodeType, true)) {
                         $this->visitorsPerNodeClass[$nodeClass][] = $visitor;

src/ValueObject/Configuration.php

@@ -7,7 +7,6 @@
 use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
 use Rector\Configuration\Option;
 use Rector\Configuration\Parameter\SimpleParameterProvider;
-use Rector\Contract\Rector\RectorInterface;
 use Rector\ValueObject\Configuration\LevelOverflow;
 use Webmozart\Assert\Assert;
 
@@ -62,9 +61,6 @@ public function getFileExtensions(): array
         return $this->fileExtensions;
     }
 
-    /**
-     * @return class-string<RectorInterface>|null
-     */
     public function getOnlyRule(): ?string
     {
         return $this->onlyRule;