From 8a92984ce11d765cffe3eb1a05145bd517ff6a28 Mon Sep 17 00:00:00 2001
From: Andrei Tcaci <leprechaunxx@gmail.com>
Date: Thu, 8 Apr 2021 16:07:42 +0200
Subject: [PATCH] BracesFixer - fix braces of match expression

---
 src/Fixer/Basic/BracesFixer.php       |  5 +++++
 tests/Fixer/Basic/BracesFixerTest.php | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/Fixer/Basic/BracesFixer.php b/src/Fixer/Basic/BracesFixer.php
index 0a91250d616..399363084cc 100644
--- a/src/Fixer/Basic/BracesFixer.php
+++ b/src/Fixer/Basic/BracesFixer.php
@@ -819,6 +819,11 @@ private function getControlTokens()
             T_SWITCH,
         ];
 
+        // @TODO: drop condition when PHP 8.0+ is required
+        if (\defined('T_MATCH')) {
+            $tokens['match'] = T_MATCH;
+        }
+
         return $tokens;
     }
 
diff --git a/tests/Fixer/Basic/BracesFixerTest.php b/tests/Fixer/Basic/BracesFixerTest.php
index dd348ea4ccd..e50071f2dc4 100644
--- a/tests/Fixer/Basic/BracesFixerTest.php
+++ b/tests/Fixer/Basic/BracesFixerTest.php
@@ -5475,4 +5475,30 @@ public function provideFixAlternativeSyntaxCases()
 <?php endforeach; ?>',
         ];
     }
+
+    /**
+     * @requires PHP 8.0
+     *
+     * @param string $input
+     * @param string $expected
+     *
+     * @dataProvider provideFix80Cases
+     */
+    public function testFix80($expected, $input)
+    {
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFix80Cases()
+    {
+        yield 'match' => [
+            '<?php echo match ($x) {
+    1, 2 => "Same for 1 and 2",
+};',
+            '<?php echo match($x)
+{
+    1, 2 => "Same for 1 and 2",
+};',
+        ];
+    }
 }