Fix next catch variable override in CatchExceptionNameMatchingTypeRector

Author: TomasVotruba

rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php

@@ -130,6 +130,7 @@ public function refactor(Node $node): ?Node
             }
 
             $catch->var = new Variable($newVariableName);
+
             $this->renameVariableInStmts(
                 $catch,
                 $oldVariableName,
@@ -149,6 +150,23 @@ public function refactor(Node $node): ?Node
         return null;
     }
 
+    private function shouldSkipFollowingCatch(Catch_ $catch, string $newVariableName, string $oldVariableName): bool
+    {
+        if ($catch->var instanceof Variable) {
+            $nextCatchVariableName = $this->getName($catch->var);
+
+            return in_array($nextCatchVariableName, [$newVariableName, $oldVariableName], true);
+        }
+
+        if (count($catch->types) === 1) {
+            $soleType = $catch->types[0]->toString();
+
+            return lcfirst($soleType) === $newVariableName;
+        }
+
+        return false;
+    }
+
     private function resolveNewVariableName(string $typeShortName): string
     {
         return Strings::replace(
@@ -229,12 +247,17 @@ private function replaceNextUsageVariable(
 
         $this->traverseNodesWithCallable($nextNode, function (Node $node) use (
             $oldVariableName,
+            $newVariableName,
             &$nonAssignedVariables
         ): ?int {
             if ($node instanceof Assign && $node->var instanceof Variable) {
                 return NodeVisitor::STOP_TRAVERSAL;
             }
 
+            if ($node instanceof Catch_ && $this->shouldSkipFollowingCatch($node, $newVariableName, $oldVariableName)) {
+                return NodeVisitor::STOP_TRAVERSAL;
+            }
+
             if (! $node instanceof Variable) {
                 return null;
             }