[DeadCode] Skip re-assigned variable in RemoveJustPropertyFetchRector

rules-tests/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchRector/Fixture/skip_overriden_assign.php.inc

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\StmtsAwareInterface\RemoveJustPropertyFetchRector\Fixture;
+
+final class SkipOverridenAssign
+{
+    private $firstOption;
+
+    private $secondOption;
+
+    public function run()
+    {
+        $chosenOption = $this->firstOption;
+
+        if (mt_rand(0, 10)) {
+            $chosenOption = $this->secondOption;
+        }
+
+        return $chosenOption;
+    }
+}

rules/DeadCode/Rector/StmtsAwareInterface/RemoveJustPropertyFetchRector.php

@@ -124,16 +124,15 @@ public function refactor(Node $node): ?Node
 
         // filter out variable usages that are part of nested property fetch, or change variable
         $variableUsages = $this->filterOutReferencedVariableUsages($variableUsages);
-
-        if ($this->isOverridenWithConcatAssign($variableUsages)) {
+        if ($variableUsages === []) {
             return null;
         }
 
-        if (! $variableToPropertyAssign instanceof PropertyFetchToVariableAssign) {
+        if ($this->isOverridenWithAssign($variableUsages)) {
             return null;
         }
 
-        if ($variableUsages === []) {
+        if (! $variableToPropertyAssign instanceof PropertyFetchToVariableAssign) {
             return null;
         }
 
@@ -274,15 +273,16 @@ private function isPropertyFetchCallerNode(PropertyFetch $propertyFetch): bool
     /**
      * @param Variable[] $variables
      */
-    private function isOverridenWithConcatAssign(array $variables): bool
+    private function isOverridenWithAssign(array $variables): bool
     {
         foreach ($variables as $variable) {
             $parentNode = $variable->getAttribute(AttributeKey::PARENT_NODE);
-            if (! $parentNode instanceof Concat) {
-                continue;
+            if ($parentNode instanceof Concat && $parentNode->var === $variable) {
+                return true;
             }
 
-            if ($parentNode->var === $variable) {
+            // variable is overriden
+            if ($parentNode instanceof Assign && $parentNode->var === $variable) {
                 return true;
             }
         }