Working fix

Author: peterfox

rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php

@@ -294,7 +294,11 @@ private function createSwitchStmts(
         } elseif ($matchArm->body instanceof Throw_) {
             $stmts[] = new Expression($matchArm->body);
         } elseif ($node instanceof Return_) {
-            $stmts[] = new Return_($matchArm->body);
+            if ($node->expr instanceof Node\Expr\BinaryOp) {
+                $stmts[] = $this->replicateBinaryOp($node->expr, $matchArm->body);
+            } else {
+                $stmts[] = new Return_($matchArm->body);
+            }
         } elseif ($node instanceof Echo_) {
             $stmts[] = new Echo_([$matchArm->body]);
             $stmts[] = new Break_();
@@ -314,4 +318,19 @@ private function createSwitchStmts(
 
         return $stmts;
     }
+
+    private function replicateBinaryOp(Node\Expr\BinaryOp $expr, Node\Expr $body): Return_
+    {
+        $newExpr = clone $expr;
+        // remove the match statement from the binary operation
+        $this->traverseNodesWithCallable($newExpr, function (Node $node) use ($body): ?Node\Expr {
+            if ($node instanceof Match_) {
+                return $body;
+            }
+
+            return null;
+        });
+
+        return new Return_($newExpr);
+    }
 }

…match_maintains_return_condition.php.inc …s/Set/Fixture/match_in_binary_op.php.inctests/Set/Fixture/match_maintains_return_condition.php.inc renamed to tests/Set/Fixture/match_in_binary_op.php.inc tests/Set/Fixture/match_maintains_return_condition.php.inc renamed to tests/Set/Fixture/match_in_binary_op.php.inc

@@ -2,7 +2,7 @@
 
 namespace Rector\Tests\Set\Fixture;
 
-final class MatchBoolean
+final class MatchInBinaryOp
 {
     public function run($value, $booleanFlag)
     {
@@ -11,6 +11,14 @@ final class MatchBoolean
             default => false,
         } && $booleanFlag;
     }
+
+    public function runTwo($value, $booleanFlag)
+    {
+        return match (true) {
+                $value === 2 => true,
+                default => false,
+        } || $booleanFlag;
+    }
 }
 
 ?>
@@ -19,7 +27,7 @@ final class MatchBoolean
 
 namespace Rector\Tests\Set\Fixture;
 
-final class MatchBoolean
+final class MatchInBinaryOp
 {
     public function run($value, $booleanFlag)
     {
@@ -30,6 +38,16 @@ final class MatchBoolean
                 return false && $booleanFlag;
         }
     }
+
+    public function runTwo($value, $booleanFlag)
+    {
+        switch (true) {
+            case $value === 2:
+                return true || $booleanFlag;
+            default:
+                return false || $booleanFlag;
+        }
+    }
 }
 
 ?>