Refactor DowngradePipeToMultiCatchExceptionRector to work directly wi…

…th stmts (#2245)
rectorphp · May 6, 2022 · 6d814fb · 6d814fb
1 parent 176d6d7
commit 6d814fb
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 26 deletions.
diff --git a/...adePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/Fixture/fixture.php.inc b/...adePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/Fixture/fixture.php.inc
@@ -14,12 +14,6 @@ function pipedExceptionCatch()
         // ...
     }
 
-    try {
-        // Some code...
-    } catch (ExceptionType1|ExceptionType2 $e) {
-        // Code to handle the exception
-    }
-
     try {
         // Some code...
     } catch (ExceptionType1 $e) {
@@ -56,14 +50,6 @@ function pipedExceptionCatch()
     } catch (ExceptionType2 $e) {
         // Code to handle the exception
     }
-
-    try {
-        // Some code...
-    } catch (ExceptionType1 $e) {
-        // Code to handle the exception
-    } catch (ExceptionType2 $e) {
-        // Code to handle the exception
-    }
 }
 
 ?>
diff --git a/...Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/Fixture/single_try_catch.php.inc b/...Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector/Fixture/single_try_catch.php.inc
@@ -0,0 +1,31 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp71\Rector\TryCatch\DowngradePipeToMultiCatchExceptionRector\Fixture;
+
+function singleTryCatch()
+{
+    try {
+        // Some code...
+    } catch (ExceptionType1|ExceptionType2 $e) {
+        // Code to handle the exception
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp71\Rector\TryCatch\DowngradePipeToMultiCatchExceptionRector\Fixture;
+
+function singleTryCatch()
+{
+    try {
+        // Some code...
+    } catch (ExceptionType1 $e) {
+        // Code to handle the exception
+    } catch (ExceptionType2 $e) {
+        // Code to handle the exception
+    }
+}
+
+?>
diff --git a/rules/DowngradePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector.php b/rules/DowngradePhp71/Rector/TryCatch/DowngradePipeToMultiCatchExceptionRector.php
@@ -57,27 +57,29 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $originalCatches = $node->catches;
+        $hasChanged = false;
+
         foreach ($node->catches as $key => $catch) {
             if (count($catch->types) === 1) {
                 continue;
             }
 
-            $types = $catch->types;
-            $node->catches[$key]->types = [$catch->types[0]];
-            foreach ($types as $keyCatchType => $catchType) {
-                if ($keyCatchType === 0) {
-                    continue;
-                }
+            $catchTypes = $catch->types;
+
+            /** @var Node\Name $firstType */
+            $firstType = array_shift($catchTypes);
+
+            $catch->types = [$firstType];
+
+            foreach ($catchTypes as $catchType) {
+                $newCatch = new Catch_([$catchType], $catch->var, $catch->stmts);
+                array_splice($node->catches, $key + 1, 0, [$newCatch]);
 
-                $this->nodesToAddCollector->addNodeAfterNode(
-                    new Catch_([$catchType], $catch->var, $catch->stmts),
-                    $node->catches[$key]
-                );
+                $hasChanged = true;
             }
         }
 
-        if ($this->nodeComparator->areNodesEqual($originalCatches, $node->catches)) {
+        if (! $hasChanged) {
             return null;
         }