Make use of RenameClassNonPhpRector (#4124)

rectorphp · Jun 8, 2023 · e012a3e · e012a3e
1 parent d003424
commit e012a3e
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 101 deletions.
diff --git a/easy-ci.php b/easy-ci.php
@@ -29,7 +29,6 @@
 use Rector\ReadWrite\Contract\ParentNodeReadAnalyzerInterface;
 use Rector\ReadWrite\Contract\ReadNodeAnalyzerInterface;
 use Rector\Set\Contract\SetListInterface;
-use Rector\Skipper\Contract\SkipVoterInterface;
 use Rector\StaticTypeMapper\Contract\PhpDocParser\PhpDocTypeMapperInterface;
 use Rector\StaticTypeMapper\Contract\PhpParser\PhpParserNodeMapperInterface;
 use Rector\Testing\PHPUnit\AbstractTestCase;
@@ -40,7 +39,6 @@
 
 return static function (EasyCIConfig $easyCiConfig): void {
     $easyCiConfig->typesToSkip([
-        SkipVoterInterface::class,
         AttributeDecoratorInterface::class,
         ArrayItemNode::class,
         PhpDocNodeDecoratorInterface::class,
@@ -75,16 +73,6 @@
         ParentNodeReadAnalyzerInterface::class,
         StmtsAwareInterface::class,
         NodeTypeGroup::class,
-        // deprecated, keep it for now
-        TemplateResolverInterface::class,
-
-        MethodTypeAnalyzer::class,
-        DoctrineAnnotationFactory::class,
-        ClassFromEnumFactory::class,
-        CoalesceAnalyzer::class,
-        NamespacedNameDecorator::class,
-        NamedVariableFactory::class,
-        BinaryOpTreeRootLocator::class,
 
         ScopeResolverNodeVisitorInterface::class,
     ]);

diff --git a/packages/ReadWrite/NodeAnalyzer/ReadExprAnalyzer.php b/packages/ReadWrite/NodeAnalyzer/ReadExprAnalyzer.php
@@ -7,15 +7,21 @@
 use PhpParser\Node\Expr;
 use Rector\Core\Exception\NotImplementedYetException;
 use Rector\ReadWrite\Contract\ReadNodeAnalyzerInterface;
+use Rector\ReadWrite\ReadNodeAnalyzer\LocalPropertyFetchReadNodeAnalyzer;
+use Rector\ReadWrite\ReadNodeAnalyzer\VariableReadNodeAnalyzer;
 
 final class ReadExprAnalyzer
 {
     /**
-     * @param ReadNodeAnalyzerInterface[] $readNodeAnalyzers
+     * @var ReadNodeAnalyzerInterface[]
      */
+    private array $readNodeAnalyzers = [];
+
     public function __construct(
-        private readonly array $readNodeAnalyzers
+        VariableReadNodeAnalyzer $variableReadNodeAnalyzer,
+        LocalPropertyFetchReadNodeAnalyzer $localPropertyFetchReadNodeAnalyzer,
     ) {
+        $this->readNodeAnalyzers = [$variableReadNodeAnalyzer, $localPropertyFetchReadNodeAnalyzer];
     }
 
     /**

diff --git a/packages/Skipper/Skipper/Skipper.php b/packages/Skipper/Skipper/Skipper.php
@@ -5,6 +5,8 @@
 namespace Rector\Skipper\Skipper;
 
 use Rector\Skipper\Contract\SkipVoterInterface;
+use Rector\Skipper\SkipVoter\ClassSkipVoter;
+use Rector\Skipper\SkipVoter\PathSkipVoter;
 
 /**
  * @api
@@ -18,11 +20,13 @@ final class Skipper
     private const FILE_ELEMENT = 'file_elements';
 
     /**
-     * @param SkipVoterInterface[] $skipVoters
+     * @var SkipVoterInterface[]
      */
-    public function __construct(
-        private readonly array $skipVoters
-    ) {
+    private array $skipVoters = [];
+
+    public function __construct(ClassSkipVoter $classSkipVoter, PathSkipVoter $pathSkipVoter)
+    {
+        $this->skipVoters = [$classSkipVoter, $pathSkipVoter];
     }
 
     public function shouldSkipElement(string | object $element): bool

diff --git a/rules/Naming/PropertyRenamer/MatchTypePropertyRenamer.php b/rules/Naming/PropertyRenamer/MatchTypePropertyRenamer.php
@@ -5,14 +5,17 @@
 namespace Rector\Naming\PropertyRenamer;
 
 use PhpParser\Node\Stmt\Property;
+use PhpParser\Node\VarLikeIdentifier;
 use Rector\Naming\Guard\PropertyConflictingNameGuard\MatchPropertyTypeConflictingNameGuard;
+use Rector\Naming\RenameGuard\PropertyRenameGuard;
 use Rector\Naming\ValueObject\PropertyRename;
 
 final class MatchTypePropertyRenamer
 {
     public function __construct(
-        private readonly PropertyRenamer $propertyRenamer,
-        private readonly MatchPropertyTypeConflictingNameGuard $matchPropertyTypeConflictingNameGuard
+        private readonly MatchPropertyTypeConflictingNameGuard $matchPropertyTypeConflictingNameGuard,
+        private readonly PropertyRenameGuard $propertyRenameGuard,
+        private readonly PropertyFetchRenamer $propertyFetchRenamer,
     ) {
     }
 
@@ -22,6 +25,27 @@ public function rename(PropertyRename $propertyRename): ?Property
             return null;
         }
 
-        return $this->propertyRenamer->rename($propertyRename);
+        if ($propertyRename->isAlreadyExpectedName()) {
+            return null;
+        }
+
+        if ($this->propertyRenameGuard->shouldSkip($propertyRename)) {
+            return null;
+        }
+
+        $onlyPropertyProperty = $propertyRename->getPropertyProperty();
+        $onlyPropertyProperty->name = new VarLikeIdentifier($propertyRename->getExpectedName());
+        $this->renamePropertyFetchesInClass($propertyRename);
+
+        return $propertyRename->getProperty();
+    }
+
+    private function renamePropertyFetchesInClass(PropertyRename $propertyRename): void
+    {
+        $this->propertyFetchRenamer->renamePropertyFetchesInClass(
+            $propertyRename->getClassLike(),
+            $propertyRename->getCurrentName(),
+            $propertyRename->getExpectedName()
+        );
     }
 }
diff --git a/rules/Naming/PropertyRenamer/PropertyRenamer.php b/rules/Naming/PropertyRenamer/PropertyRenamer.php
diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
diff --git a/src/Kernel/RectorKernel.php b/src/Kernel/RectorKernel.php
@@ -17,7 +17,7 @@ final class RectorKernel
     /**
      * @var string
      */
-    private const CACHE_KEY = 'v73';
+    private const CACHE_KEY = 'v74';
 
     private ContainerInterface|null $container = null;