Merge branch 'php-8.0/squiz-operatorbracket-support-match' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php

@@ -165,7 +165,7 @@ public function process(File $phpcsFile, $stackPtr)
                     break;
                 }
 
-                if ($prevCode === T_STRING || $prevCode === T_SWITCH) {
+                if ($prevCode === T_STRING || $prevCode === T_SWITCH || $prevCode === T_MATCH) {
                     // We allow simple operations to not be bracketed.
                     // For example, ceil($one / $two).
                     for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
@@ -204,8 +204,8 @@ public function process(File $phpcsFile, $stackPtr)
                 if (in_array($prevCode, Tokens::$scopeOpeners, true) === true) {
                     // This operation is inside a control structure like FOREACH
                     // or IF, but has no bracket of it's own.
-                    // The only control structure allowed to do this is SWITCH.
-                    if ($prevCode !== T_SWITCH) {
+                    // The only control structures allowed to do this are SWITCH and MATCH.
+                    if ($prevCode !== T_SWITCH && $prevCode !== T_MATCH) {
                         break;
                     }
                 }

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc

@@ -176,3 +176,15 @@ $errorPos = $params[$x]?->getLine() + $commentStart;
 $foo = $this->gmail ?? $this->gmail = new Google_Service_Gmail($this->google);
 
 exit -1;
+
+$expr = match ($number - 10) {
+    -1 => 0,
+};
+
+$expr = match ($number % 10) {
+    1 => 2 * $num,
+};
+
+$expr = match (true) {
+    $num * 100 > 500 => 'expression in key',
+};

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed

@@ -176,3 +176,15 @@ $errorPos = ($params[$x]?->getLine() + $commentStart);
 $foo = ($this->gmail ?? $this->gmail = new Google_Service_Gmail($this->google));
 
 exit -1;
+
+$expr = match ($number - 10) {
+    -1 => 0,
+};
+
+$expr = match ($number % 10) {
+    1 => (2 * $num),
+};
+
+$expr = match (true) {
+    ($num * 100) > 500 => 'expression in key',
+};

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php

@@ -68,6 +68,8 @@ public function getErrorList($testFile='OperatorBracketUnitTest.inc')
                 169 => 1,
                 174 => 1,
                 176 => 1,
+                185 => 1,
+                189 => 1,
             ];
             break;
         case 'OperatorBracketUnitTest.js':