rectorphp · TomasVotruba · Sep 6, 2023 · Sep 6, 2023 · Sep 6, 2023 · Sep 6, 2023
diff --git a/config/set/mysql-to-mysqli.php b/config/set/mysql-to-mysqli.php
diff --git a/packages/Config/RectorConfig.php b/packages/Config/RectorConfig.php
@@ -9,7 +9,6 @@
 use Rector\Core\Configuration\Option;
 use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
-use Rector\Core\Contract\Rector\NonPhpRectorInterface;
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\FileSystem\FilesystemTweaker;
@@ -178,7 +177,7 @@ public function ruleWithConfiguration(string $rectorClass, array $configuration)
         );
 
         $this->singleton($rectorClass);
-        $this->tagRectorService($rectorClass);
+        $this->tag($rectorClass, RectorInterface::class);
 
         $this->afterResolving($rectorClass, function (ConfigurableRectorInterface $configurableRector) use (
             $rectorClass
@@ -200,7 +199,7 @@ public function rule(string $rectorClass): void
         Assert::isAOf($rectorClass, RectorInterface::class);
 
         $this->singleton($rectorClass);
-        $this->tagRectorService($rectorClass);
+        $this->tag($rectorClass, RectorInterface::class);
 
         if (is_a($rectorClass, AbstractScopeAwareRector::class, true)) {
             $this->extend(
@@ -389,23 +388,6 @@ private function resolveDuplicatedValues(array $values): array
         return array_unique($duplicates);
     }
 
-    /**
-     * @param class-string<RectorInterface> $rectorClass
-     */
-    private function tagRectorService(string $rectorClass): void
-    {
-        $this->tag($rectorClass, RectorInterface::class);
-
-        if (is_a($rectorClass, NonPhpRectorInterface::class, true)) {
-            trigger_error(sprintf(
-                'The "%s" interface of "%s" rule is deprecated. Rector will process only PHP code, as designed to with AST. For another file format, use custom tooling.',
-                NonPhpRectorInterface::class,
-                $rectorClass,
-            ));
-            exit();
-        }
-    }
-
     /**
      * @param string[] $rectorClasses
      */

diff --git a/packages/Set/ValueObject/SetList.php b/packages/Set/ValueObject/SetList.php
@@ -36,12 +36,6 @@ final class SetList implements SetListInterface
      */
     public const GMAGICK_TO_IMAGICK = __DIR__ . '/../../../config/set/gmagick-to-imagick.php';
 
-    /**
-     * @deprecated Handle manually with explicit refactoring instead.
-     * @var string
-     */
-    public const MYSQL_TO_MYSQLI = __DIR__ . '/../../../config/set/mysql-to-mysqli.php';
-
     /**
      * @var string
      */

diff --git a/phpstan.neon b/phpstan.neon
@@ -576,8 +576,6 @@ parameters:
             message: '#Public method "Rector\\Core\\DependencyInjection\\RectorContainerFactory\:\:createFromBootstrapConfigs\(\)" is never used#'
             path: src/DependencyInjection/RectorContainerFactory.php
 
-        - '#Class "Rector\\Renaming\\Rector\\FileWithoutNamespace\\PseudoNamespaceToNamespaceRector" is missing @see annotation with test case class reference#'
-
         # chicken/egg
         -
             message: '#Function "(d|dd)\(\)" cannot be used/left in the code#'
@@ -592,11 +590,6 @@ parameters:
             message: '#Do not name "d", shorter than 2 chars#'
             path: tests/debug_functions.php
 
-        # deprecated
-        -
-            message: '#Fetching class constant class of deprecated class Rector\\Core\\Contract\\Rector\\NonPhpRectorInterface#'
-            path: packages/Config/*
-
         # method signature kept for symmetry of hasParentClassMethod() with getParentClassMethod()
         -
             message: '#Parameters should use "PhpParser\\Node\\Stmt\\ClassMethod" types as the only types passed to this method#'

diff --git a/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php b/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php
diff --git a/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php b/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php
diff --git a/src/Contract/Rector/NonPhpRectorInterface.php b/src/Contract/Rector/NonPhpRectorInterface.php
diff --git a/src/DependencyInjection/LazyContainerFactory.php b/src/DependencyInjection/LazyContainerFactory.php
@@ -710,10 +710,8 @@ static function (
             ScopeResolverNodeVisitorInterface::class
         );
 
-        // phpstan factory
         $this->createPHPStanServices($rectorConfig);
 
-        // @todo add base node visitors
         $rectorConfig->when(PhpDocNodeMapper::class)
             ->needs('$phpDocNodeVisitors')
             ->giveTagged(BasePhpDocNodeVisitorInterface::class);

diff --git a/src/NodeManipulator/IfManipulator.php b/src/NodeManipulator/IfManipulator.php
@@ -186,16 +186,6 @@ public function isIfWithoutElseAndElseIfs(If_ $if): bool
         return $if->elseifs === [];
     }
 
-    /**
-     * @deprecated Create If_ directly, this is simple new with no added value
-     */
-    public function createIfStmt(Expr $condExpr, Stmt $stmt): If_
-    {
-        return new If_($condExpr, [
-            'stmts' => [$stmt],
-        ]);
-    }
-
     private function matchComparedAndReturnedNode(NotIdentical $notIdentical, Return_ $return): ?Expr
     {
         if ($this->nodeComparator->areNodesEqual(