[DeadCode] Remove direct return STOP_TRAVERSAL on RemoveDeadInstanceO…

…fRector (#4188) Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Jun 12, 2023 · a9efd72 · a9efd72
1 parent 9141715
commit a9efd72
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/rector.php b/rector.php
@@ -8,6 +8,7 @@
 use Rector\CodingStyle\Rector\String_\UseClassKeywordForClassNameResolutionRector;
 use Rector\CodingStyle\ValueObject\ReturnArrayClassMethodToYield;
 use Rector\Config\RectorConfig;
+use Rector\Naming\Rector\Assign\RenameVariableToMatchMethodCallReturnTypeRector;
 use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;
 use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
@@ -76,6 +77,10 @@
             __DIR__ . '/src/PhpParser/NodeTraverser/RectorNodeTraverser.php',
         ],
 
+        RenameVariableToMatchMethodCallReturnTypeRector::class => [
+            __DIR__ . '/packages/Config/RectorConfig.php',
+        ],
+
         StringClassNameToClassConstantRector::class,
         __DIR__ . '/bin/validate-phpstan-version.php',
         // tests

diff --git a/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php b/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php
@@ -13,11 +13,7 @@
 use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\Do_;
-use PhpParser\Node\Stmt\For_;
-use PhpParser\Node\Stmt\Foreach_;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\While_;
 use PhpParser\NodeTraverser;
 use PHPStan\Type\MixedType;
 use Rector\Core\NodeManipulator\IfManipulator;
@@ -65,20 +61,15 @@ function run(stdClass $stdClass)
      */
     public function getNodeTypes(): array
     {
-        return [If_::class, For_::class, Foreach_::class, While_::class, Do_::class];
+        return [If_::class];
     }
 
     /**
-     * @param If_|For_|Foreach_|While_|Do_ $node
+     * @param If_ $node
      * @return Stmt[]|null|int
      */
-    public function refactor(Node $node)
+    public function refactor(Node $node): array|null|int
     {
-        // avoid ifs in a loop, as unexpected behavior
-        if (! $node instanceof If_) {
-            return NodeTraverser::STOP_TRAVERSAL;
-        }
-
         if (! $this->ifManipulator->isIfWithoutElseAndElseIfs($node)) {
             return null;
         }

diff --git a/src/PhpParser/NodeFinder/PropertyFetchFinder.php b/src/PhpParser/NodeFinder/PropertyFetchFinder.php
@@ -170,7 +170,11 @@ private function isInAnonymous(PropertyFetch $propertyFetch, Class_|Trait_ $clas
             return false;
         }
 
-        return $classReflection->getName() !== $this->nodeNameResolver->getName($class) && ! $hasTrait;
+        if ($classReflection->getName() === $this->nodeNameResolver->getName($class)) {
+            return false;
+        }
+
+        return ! $hasTrait;
     }
 
     private function isNamePropertyNameEquals(