[utils] Add RemoveRefactorDuplicatedNodeInstanceCheckRector

Author: TomasVotruba

rector.php

@@ -6,6 +6,7 @@
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ConstFetch\RemovePhpVersionIdCheckRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Utils\Rector\RemoveRefactorDuplicatedNodeInstanceCheckRector;
 
 return RectorConfig::configure()
     ->withPreparedSets(
@@ -18,7 +19,6 @@
         naming: true,
         instanceOf: true,
         earlyReturn: true,
-        strictBooleans: true,
         rectorPreset: true,
         phpunitCodeQuality: true
     )
@@ -37,6 +37,7 @@
     ])
     ->withRootFiles()
     ->withImportNames(removeUnusedImports: true)
+    ->withRules([RemoveRefactorDuplicatedNodeInstanceCheckRector::class])
     ->withSkip([
         StringClassNameToClassConstantRector::class,
         // tests

rules/DeadCode/Rector/ClassMethod/RemoveUnusedPublicMethodParameterRector.php

@@ -13,7 +13,6 @@
 use Rector\NodeAnalyzer\MagicClassMethodAnalyzer;
 use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
 use Rector\Rector\AbstractRector;
-use Rector\Symfony\Enum\SymfonyClass;
 use Rector\ValueObject\MethodName;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

utils/Rector/RemoveRefactorDuplicatedNodeInstanceCheckRector.php

@@ -5,34 +5,36 @@
 namespace Rector\Utils\Rector;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\PropertyFetch;
-use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\ObjectType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\NodeManipulator\ClassDependencyManipulator;
-use Rector\PhpParser\Node\BetterNodeFinder;
-use Rector\PhpParser\Node\Value\ValueResolver;
-use Rector\PostRector\ValueObject\PropertyMetadata;
 use Rector\Rector\AbstractRector;
-use Rector\StaticTypeMapper\StaticTypeMapper;
+use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class RemoveRefactorDuplicatedNodeInstanceCheckRector extends AbstractRector
 {
+    public function __construct(
+        private readonly PhpDocInfoFactory $phpDocInfoFactory
+    ) {
+    }
+
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Remove refactor() method of Rector rule double check of $node instance, if already defined in @param type', []);
+        return new RuleDefinition(
+            'Remove refactor() method of Rector rule double check of $node instance, if already defined in @param type',
+            []
+        );
     }
 
     public function getNodeTypes(): array
     {
-        return [Node\Stmt\ClassMethod::class];
+        return [ClassMethod::class];
     }
 
     /**
-     * @param Node\Stmt\ClassMethod $node
+     * @param ClassMethod $node
      */
     public function refactor(Node $node): ?Node
     {
@@ -49,32 +51,48 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        // remove already added properties
+        if (! $firstStmt->cond instanceof Node\Expr\BooleanNot) {
+            return null;
+        }
+
+        $booleanNot = $firstStmt->cond;
 
-        if ($typesToAdd === []) {
+        if (! $booleanNot->expr instanceof Node\Expr\Instanceof_) {
             return null;
         }
 
-        $hasChanged = false;
+        $instanceIf = $booleanNot->expr;
+        $checkedClassType = $this->getType($instanceIf->class);
 
-        foreach ($typesToAdd as $propertyNameToAdd => $propertyTypeToAdd) {
-            // skip if property already exists
-            if ($node->getProperty($propertyNameToAdd) instanceof Property) {
-                continue;
-            }
+        if (! $checkedClassType instanceof ObjectType) {
+            return null;
+        }
 
-            $this->classDependencyManipulator->addConstructorDependency(
-                $node,
-                new PropertyMetadata($propertyNameToAdd, new ObjectType($propertyTypeToAdd))
-            );
+        $classReflection = $checkedClassType->getClassReflection();
 
-            $hasChanged = true;
+        if (! $classReflection->is(Node::class)) {
+            return null;
         }
 
-        if (! $hasChanged) {
+        $classMethodPhpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
+
+        $paramType = $classMethodPhpDocInfo->getParamType('$node');
+        if (! $paramType instanceof ObjectType) {
             return null;
         }
 
+        if ($paramType instanceof ShortenedObjectType) {
+            $className = $paramType->getFullyQualifiedName();
+        } else {
+            $className = $paramType->getClassName();
+        }
+
+        if ($className !== $checkedClassType->getClassName()) {
+            return null;
+        }
+
+        unset($node->stmts[0]);
+
         return $node;
     }
 }