[Php80] Skip no default on case collection assign on ChangeSwitchToMa…

…tchRector (#2631)

* [Php80] Skip no default on case collection assign on ChangeSwitchToMatchRector

* Fixed 🎉

* clean up

* clean up

* final touch: clean up

rules-tests/Php80/Rector/Switch_/ChangeSwitchToMatchRector/Fixture/skip_no_default_case_collection_assign.php.inc

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Php80\Rector\Switch_\ChangeSwitchToMatchRector\Fixture;
+
+final class SkipNoDefaultCaseCollectionAssign
+{
+    function foo(string $var): void {
+        switch ($var) {
+            case 'hey':
+                $var = 'oh';
+                break;
+            case 'foo':
+            case 'bar':
+                $var = "baz";
+                break;
+        }
+
+        dump($var);
+    }
+}

rules/Php80/Rector/Switch_/ChangeSwitchToMatchRector.php

@@ -116,33 +116,28 @@ public function refactor(Node $node): ?Node
 
         $match = $this->processImplicitThrowsAfterSwitch($node, $match, $condAndExprs);
 
-        if ($isReturn) {
-            return $this->processReturn($match);
-        }
-
         $assignVar = $this->resolveAssignVar($condAndExprs);
+        $hasDefaultValue = $this->matchSwitchAnalyzer->hasDefaultValue($match);
+
         if ($assignVar instanceof Expr) {
-            return $this->changeToAssign($node, $match, $assignVar);
+            return $this->changeToAssign($node, $match, $assignVar, $hasDefaultValue);
+        }
+
+        if (! $hasDefaultValue) {
+            return null;
         }
 
-        return $match;
+        return $isReturn
+            ? new Return_($match)
+            : $match;
     }
 
     public function provideMinPhpVersion(): int
     {
         return PhpVersionFeature::MATCH_EXPRESSION;
     }
 
-    private function processReturn(Match_ $match): ?Return_
-    {
-        if (! $this->matchSwitchAnalyzer->hasDefaultValue($match)) {
-            return null;
-        }
-
-        return new Return_($match);
-    }
-
-    private function changeToAssign(Switch_ $switch, Match_ $match, Expr $expr): ?Assign
+    private function changeToAssign(Switch_ $switch, Match_ $match, Expr $expr, bool $hasDefaultValue): ?Assign
     {
         $nextReturn = $switch->getAttribute(AttributeKey::NEXT_NODE);
 
@@ -163,10 +158,10 @@ private function changeToAssign(Switch_ $switch, Match_ $match, Expr $expr): ?As
 
         $assign = new Assign($expr, $match);
         if (! $prevInitializedAssign instanceof Assign) {
-            return $assign;
+            return $this->resolveCurrentAssign($hasDefaultValue, $assign);
         }
 
-        if ($this->matchSwitchAnalyzer->hasDefaultValue($match)) {
+        if ($hasDefaultValue) {
             $default = $match->arms[count($match->arms) - 1]->body;
             if ($this->nodeComparator->areNodesEqual($default, $prevInitializedAssign->var)) {
                 return $assign;
@@ -183,6 +178,13 @@ private function changeToAssign(Switch_ $switch, Match_ $match, Expr $expr): ?As
         return $assign;
     }
 
+    private function resolveCurrentAssign(bool $hasDefaultValue, Assign $assign): ?Assign
+    {
+        return $hasDefaultValue
+            ? $assign
+            : null;
+    }
+
     /**
      * @param CondAndExpr[] $condAndExprs
      */