[DeadCode] Skip RemoveUnusedPrivatePropertyRector on used in Assign expr

rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/Fixture/skip_propertyfetch_used_in_assign_expr.php.inc

@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector\Fixture;
+
+abstract class SkipPropertyFetchUsedInAssignExpr
+{
+    private string $foo;
+    private string $bar;
+
+    public function __construct(string $foo, string $bar)
+    {
+        $this->foo = $foo;
+        $this->bar = $bar;
+    }
+
+    protected function calculateMac(): string
+    {
+        $foobar = $this->foo;
+        $foobar .= $this->bar;
+
+        return md5($foobar);
+    }
+}

rules-tests/DeadCode/Rector/Property/RemoveUnusedPrivatePropertyRector/Fixture/skip_propertyfetch_used_in_assign_expr2.php.inc

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector\Fixture;
+
+class SkipPropertyFetchUsedInAssignExpr2
+{
+    private int $foo;
+
+    public function __construct(int $foo)
+    {
+        $this->foo = $foo;
+    }
+
+    public function calculateMac(): int
+    {
+        $foobar = $this->foo++;
+        return $foobar;
+    }
+}

rules/Removing/NodeManipulator/ComplexNodeRemover.php

@@ -44,6 +44,8 @@ public function removePropertyAndUsages(Property $property, array $classMethodNa
 
         $propertyFetches = $this->propertyFetchFinder->findPrivatePropertyFetches($property);
 
+        $assigns = [];
+        $propertyNames = [];
         foreach ($propertyFetches as $propertyFetch) {
             if ($this->shouldSkipPropertyForClassMethod($propertyFetch, $classMethodNamesToSkip)) {
                 $shouldKeepProperty = true;
@@ -55,11 +57,13 @@ public function removePropertyAndUsages(Property $property, array $classMethodNa
                 return;
             }
 
-            // remove assigns
-            $this->assignRemover->removeAssignNode($assign);
-            $this->removeConstructorDependency($assign);
+            $propertyName = (string) $this->nodeNameResolver->getName($propertyFetch);
+            $propertyNames[] = $propertyName;
+            $assigns[$propertyName][] = $assign;
         }
 
+        $this->processRemovePropertyAssigns($assigns, $propertyNames);
+
         if ($shouldKeepProperty) {
             return;
         }
@@ -79,6 +83,22 @@ public function removePropertyAndUsages(Property $property, array $classMethodNa
         $this->nodeRemover->removeNode($property);
     }
 
+    /**
+     * @param array<string, Assign[]> $assigns
+     * @param string[] $propertyNames
+     */
+    private function processRemovePropertyAssigns(array $assigns, array $propertyNames): void
+    {
+        $propertyNames = array_unique($propertyNames);
+        foreach ($propertyNames as $propertyName) {
+            foreach ($assigns[$propertyName] as $propertyNameAssign) {
+                // remove assigns
+                $this->assignRemover->removeAssignNode($propertyNameAssign);
+                $this->removeConstructorDependency($propertyNameAssign);
+            }
+        }
+    }
+
     /**
      * @param string[] $classMethodNamesToSkip
      */
@@ -107,6 +127,15 @@ private function resolveAssign(PropertyFetch | StaticPropertyFetch $expr): ?Assi
             return null;
         }
 
+        $isInExpr = (bool) $this->betterNodeFinder->findFirst(
+            $assign->expr,
+            fn (Node $subNode): bool => $this->nodeComparator->areNodesEqual($subNode, $expr)
+        );
+
+        if ($isInExpr) {
+            return null;
+        }
+
         return $assign;
     }