diff --git a/src/Configuration/RectorConfigBuilder.php b/src/Configuration/RectorConfigBuilder.php index b1b3649dd6f..d36fdba3426 100644 --- a/src/Configuration/RectorConfigBuilder.php +++ b/src/Configuration/RectorConfigBuilder.php @@ -26,7 +26,6 @@ use Rector\Doctrine\Set\DoctrineSetList; use Rector\Enum\Config\Defaults; use Rector\Exception\Configuration\InvalidConfigurationException; -use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface; use Rector\Php\PhpVersionResolver\ComposerJsonPhpVersionResolver; use Rector\Php80\Rector\Class_\AnnotationToAttributeRector; use Rector\Php80\ValueObject\AnnotationToAttribute; @@ -1240,11 +1239,6 @@ public function withTreatClassesAsFinal(bool $isTreatClassesAsFinal = true): sel public function registerService(string $className, ?string $alias = null, ?string $tag = null): self { - // BC layer since 2.2.9 - if ($tag === ScopeResolverNodeVisitorInterface::class) { - $tag = DecoratingNodeVisitorInterface::class; - } - $this->registerServices[] = new RegisteredService($className, $alias, $tag); return $this; diff --git a/src/Console/Command/ProcessCommand.php b/src/Console/Command/ProcessCommand.php index a8e7451628f..42c3256d6aa 100644 --- a/src/Console/Command/ProcessCommand.php +++ b/src/Console/Command/ProcessCommand.php @@ -183,7 +183,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int // 4. Deprecations reporter $this->deprecatedRulesReporter->reportDeprecatedRules(); $this->deprecatedRulesReporter->reportDeprecatedSkippedRules(); - $this->deprecatedRulesReporter->reportDeprecatedNodeTypes(); $this->deprecatedRulesReporter->reportDeprecatedRectorUnsupportedMethods(); $this->missConfigurationReporter->reportSkippedNeverRegisteredRules(); diff --git a/src/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php b/src/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php deleted file mode 100644 index df374f9627e..00000000000 --- a/src/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php +++ /dev/null @@ -1,14 +0,0 @@ -visitors as $visitor) { foreach ($visitor->getNodeTypes() as $nodeType) { - // BC layer matching - if ($nodeType === FileWithoutNamespace::class && $nodeClass === FileNode::class) { - $this->visitorsPerNodeClass[$nodeClass][] = $visitor; - continue; - } - if (is_a($nodeClass, $nodeType, true)) { $this->visitorsPerNodeClass[$nodeClass][] = $visitor; continue 2; diff --git a/src/Reporting/DeprecatedRulesReporter.php b/src/Reporting/DeprecatedRulesReporter.php index 6f058558015..042ad8d05ce 100644 --- a/src/Reporting/DeprecatedRulesReporter.php +++ b/src/Reporting/DeprecatedRulesReporter.php @@ -8,7 +8,6 @@ use Rector\Configuration\Option; use Rector\Configuration\Parameter\SimpleParameterProvider; use Rector\Contract\Rector\RectorInterface; -use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace; use Rector\PhpParser\Node\FileNode; use ReflectionMethod; use Symfony\Component\Console\Style\SymfonyStyle; @@ -75,36 +74,4 @@ public function reportDeprecatedRectorUnsupportedMethods(): void } } } - - public function reportDeprecatedNodeTypes(): void - { - // helper property to avoid reporting multiple times - static $reportedClasses = []; - - foreach ($this->rectors as $rector) { - if (in_array(FileWithoutNamespace::class, $rector->getNodeTypes(), true)) { - $this->reportDeprecatedFileWithoutNamespace($rector); - continue; - } - - // already reported, skip - if (in_array($rector::class, $reportedClasses, true)) { - continue; - } - - $reportedClasses[] = $rector::class; - } - } - - private function reportDeprecatedFileWithoutNamespace(RectorInterface $rector): void - { - $this->symfonyStyle->warning(sprintf( - 'Node type "%s" is deprecated and will be removed. Use "%s" in the "%s" rule instead instead.%sSee %s for upgrade path', - FileWithoutNamespace::class, - FileNode::class, - $rector::class, - PHP_EOL . PHP_EOL, - 'https://github.com/rectorphp/rector-src/blob/main/UPGRADING.md' - )); - } } diff --git a/tests/Issues/FileWithoutNamespaceCompat/FileWithoutNamespaceCompatTest.php b/tests/Issues/FileWithoutNamespaceCompat/FileWithoutNamespaceCompatTest.php deleted file mode 100644 index f4f57be3b9e..00000000000 --- a/tests/Issues/FileWithoutNamespaceCompat/FileWithoutNamespaceCompatTest.php +++ /dev/null @@ -1,28 +0,0 @@ -doTestFile($filePath); - } - - public static function provideData(): Iterator - { - return self::yieldFilesFromDirectory(__DIR__ . '/Fixture'); - } - - public function provideConfigFilePath(): string - { - return __DIR__ . '/config/configured_rule.php'; - } -} diff --git a/tests/Issues/FileWithoutNamespaceCompat/Fixture/namespace_less_file.php.inc b/tests/Issues/FileWithoutNamespaceCompat/Fixture/namespace_less_file.php.inc deleted file mode 100644 index c6a2f6dbc4d..00000000000 --- a/tests/Issues/FileWithoutNamespaceCompat/Fixture/namespace_less_file.php.inc +++ /dev/null @@ -1,16 +0,0 @@ - ------ -namespacedName = new Name('someFunction'); - - $node->stmts[] = $function; - - return $node; - } -} diff --git a/tests/Issues/FileWithoutNamespaceCompat/config/configured_rule.php b/tests/Issues/FileWithoutNamespaceCompat/config/configured_rule.php deleted file mode 100644 index ddceb900caf..00000000000 --- a/tests/Issues/FileWithoutNamespaceCompat/config/configured_rule.php +++ /dev/null @@ -1,9 +0,0 @@ -withRules([SubscribedToFileWithoutNamespaceRector::class]);