diff --git a/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/Fixture/skip_reset_before_throwing_assign.php.inc b/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/Fixture/skip_reset_before_throwing_assign.php.inc new file mode 100644 index 00000000000..4f417375531 --- /dev/null +++ b/rules-tests/DeadCode/Rector/Assign/RemoveDoubleAssignRector/Fixture/skip_reset_before_throwing_assign.php.inc @@ -0,0 +1,24 @@ + diff --git a/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php index 46d15c30a3e..a9181c0417f 100644 --- a/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php +++ b/rules/DeadCode/Rector/Assign/RemoveDoubleAssignRector.php @@ -10,6 +10,7 @@ use PhpParser\Node\Expr\StaticPropertyFetch; use PhpParser\Node\Expr\Variable; use PhpParser\Node\Stmt\Expression; +use PhpParser\Node\Stmt\TryCatch; use Rector\DeadCode\SideEffect\SideEffectNodeDetector; use Rector\PhpParser\Enum\NodeGroup; use Rector\PhpParser\Node\BetterNodeFinder; @@ -110,6 +111,11 @@ public function refactor(Node $node): ?Node continue; } + // side effect may throw exception, and may be handled by catch block + if ($node instanceof TryCatch && $this->sideEffectNodeDetector->detectCallExpr($nextAssign->expr)) { + continue; + } + // remove current Stmt if will be overridden in next stmt unset($node->stmts[$key]);