[deprecated] Remove deprecated properties from AbstractRector (#5243)

packages/PostRector/Rector/ClassRenamingPostRector.php

@@ -16,8 +16,8 @@
 use Rector\Core\Configuration\RenamedClassesDataCollector;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\Renaming\NodeManipulator\ClassRenamer;
 use Rector\Renaming\Collector\RenamedNameCollector;
+use Rector\Renaming\NodeManipulator\ClassRenamer;
 
 final class ClassRenamingPostRector extends AbstractPostRector
 {

rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php74.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
+use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersion;
-use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->phpVersion(PhpVersion::PHP_74);

rules-tests/CodingStyle/Rector/FuncCall/ArraySpreadInsteadOfArrayMergeRector/config/configured_rule_php81.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
+use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersion;
-use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->phpVersion(PhpVersion::PHP_81);

rules/CodingStyle/Application/UseImportsRemover.php

@@ -10,8 +10,9 @@
 
 final class UseImportsRemover
 {
-    public function __construct(private readonly RenamedNameCollector $renamedNameCollector)
-    {
+    public function __construct(
+        private readonly RenamedNameCollector $renamedNameCollector
+    ) {
     }
 
     /**

rules/Php74/Rector/Property/RestoreDefaultNullToNullableTypePropertyRector.php

@@ -4,11 +4,11 @@
 
 namespace Rector\Php74\Rector\Property;
 
-use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
+use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector;
@@ -22,7 +22,8 @@
 final class RestoreDefaultNullToNullableTypePropertyRector extends AbstractRector implements MinPhpVersionInterface
 {
     public function __construct(
-        private readonly ConstructorAssignDetector $constructorAssignDetector, private readonly PhpDocInfoFactory $phpDocInfoFactory
+        private readonly ConstructorAssignDetector $constructorAssignDetector,
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
     ) {
     }
 
@@ -120,7 +121,8 @@ private function shouldSkip(Property $property, Class_ $class): bool
         return $this->constructorAssignDetector->isPropertyAssigned($class, $propertyName);
     }
 
-    private function isReadonly(Property $property): bool {
+    private function isReadonly(Property $property): bool
+    {
         // native readonly
         if ($property->isReadonly()) {
             return true;

src/DependencyInjection/LazyContainerFactory.php

@@ -65,9 +65,7 @@
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PhpParser\Node\NodeFactory;
-use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\Core\PhpParser\NodeTraverser\RectorNodeTraverser;
 use Rector\Core\Provider\CurrentFileProvider;
 use Rector\Core\Rector\AbstractRector;
@@ -531,15 +529,7 @@ static function (AbstractRector $rector, Container $container): void {
                     $container->get(NodeTypeResolver::class),
                     $container->get(SimpleCallableNodeTraverser::class),
                     $container->get(NodeFactory::class),
-                    // @deprecated, use injected service in your Rector rules
-                    $container->get(PhpDocInfoFactory::class),
-                    // @deprecated, use injected service in your Rector rules
-                    $container->get(StaticTypeMapper::class),
                     $container->get(Skipper::class),
-                    // @deprecated, use injected service in your Rector rules
-                    $container->get(ValueResolver::class),
-                    // @deprecated, use injected service in your Rector rules
-                    $container->get(BetterNodeFinder::class),
                     $container->get(NodeComparator::class),
                     $container->get(CurrentFileProvider::class),
                     $container->get(CreatedByRuleDecorator::class),

src/Rector/AbstractRector.php

@@ -12,34 +12,21 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
-use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
 use Rector\Core\Application\ChangedNodeScopeRefresher;
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\Exception\ShouldNotHappenException;
 use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
 use Rector\Core\PhpParser\Comparing\NodeComparator;
-use Rector\Core\PhpParser\Node\BetterNodeFinder;
 use Rector\Core\PhpParser\Node\NodeFactory;
-use Rector\Core\PhpParser\Node\Value\ValueResolver;
 use Rector\Core\Provider\CurrentFileProvider;
 use Rector\Core\ValueObject\Application\File;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 use Rector\Skipper\Skipper\Skipper;
-use Rector\StaticTypeMapper\StaticTypeMapper;
-
-/**
- * @property-read PhpDocInfoFactory $phpDocInfoFactory; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
- *
- * @property-read ValueResolver $valueResolver; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
- *
- * @property-read BetterNodeFinder $betterNodeFinder; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
- *
- * @property-read StaticTypeMapper $staticTypeMapper; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
- */
+
 abstract class AbstractRector extends NodeVisitorAbstract implements RectorInterface
 {
     /**
@@ -118,11 +105,7 @@ public function autowire(
         NodeTypeResolver $nodeTypeResolver,
         SimpleCallableNodeTraverser $simpleCallableNodeTraverser,
         NodeFactory $nodeFactory,
-        PhpDocInfoFactory $phpDocInfoFactory,
-        StaticTypeMapper $staticTypeMapper,
         Skipper $skipper,
-        ValueResolver $valueResolver,
-        BetterNodeFinder $betterNodeFinder,
         NodeComparator $nodeComparator,
         CurrentFileProvider $currentFileProvider,
         CreatedByRuleDecorator $createdByRuleDecorator,
@@ -137,11 +120,6 @@ public function autowire(
         $this->currentFileProvider = $currentFileProvider;
         $this->createdByRuleDecorator = $createdByRuleDecorator;
         $this->changedNodeScopeRefresher = $changedNodeScopeRefresher;
-
-        $this->deprecatedDependencies['phpDocInfoFactory'] = $phpDocInfoFactory;
-        $this->deprecatedDependencies['valueResolver'] = $valueResolver;
-        $this->deprecatedDependencies['betterNodeFinder'] = $betterNodeFinder;
-        $this->deprecatedDependencies['staticTypeMapper'] = $staticTypeMapper;
     }
 
     /**