[Php80] Handle default in previous not used in next switch (#2335)

* [Php80] Handle default in previous not used in next switch * debug * Fixed 🎉 * Fixed 🎉
rectorphp · May 19, 2022 · 1a56ec1 · 1a56ec1
1 parent 3f0a0b7
commit 1a56ec1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/...witch_/ChangeSwitchToMatchRector/Fixture/default_in_previous_not_used_next_switch.php.inc b/...witch_/ChangeSwitchToMatchRector/Fixture/default_in_previous_not_used_next_switch.php.inc
@@ -0,0 +1,40 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture;
+
+final class DefaultInPreviousNotUsedNextSwitch
+{
+    public function run($input)
+    {
+        $result = '';
+        switch ($input) {
+            case 'a':
+            case 'b':
+                $result = 0;
+                break;
+            case 'Monsieur':
+                $result = 1;
+                break;
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture;
+
+final class DefaultInPreviousNotUsedNextSwitch
+{
+    public function run($input)
+    {
+        $result = match ($input) {
+            'a', 'b' => 0,
+            'Monsieur' => 1,
+            default => '',
+        };
+    }
+}
+
+?>
diff --git a/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php b/rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\Match_;
 use PhpParser\Node\Expr\Throw_;
+use PhpParser\Node\MatchArm;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Switch_;
@@ -161,6 +162,8 @@ private function changeToAssign(Switch_ $switch, Match_ $match, Expr $assignExpr
             if ($this->nodeComparator->areNodesEqual($default, $prevInitializedAssign->var)) {
                 return $assign;
             }
+        } else {
+            $match->arms[count($match->arms)] = new MatchArm(null, $prevInitializedAssign->expr);
         }
 
         $parentAssign = $prevInitializedAssign->getAttribute(AttributeKey::PARENT_NODE);