Merge branch 'php-8.0/psr12-booleanoperatorplacement-support-match' of …

…https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Feb 24, 2021 · 1106d65 · 1106d65
2 parents b27f086 + ab7af46
commit 1106d65
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php b/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php
@@ -37,6 +37,7 @@ public function register()
             T_WHILE,
             T_SWITCH,
             T_ELSEIF,
+            T_MATCH,
         ];
 
     }//end register()

diff --git a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.inc b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.inc
@@ -118,3 +118,14 @@ if (
 ) {
     return 5;
 }
+
+// Reset to default.
+// phpcs:set PSR12.ControlStructures.BooleanOperatorPlacement allowOnly
+
+match (
+    $expr1
+    && $expr2 &&
+    $expr3
+) {
+    // structure body
+};
diff --git a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.inc.fixed b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.inc.fixed
@@ -128,3 +128,14 @@ if (
 ) {
     return 5;
 }
+
+// Reset to default.
+// phpcs:set PSR12.ControlStructures.BooleanOperatorPlacement allowOnly
+
+match (
+    $expr1
+    && $expr2
+    && $expr3
+) {
+    // structure body
+};
diff --git a/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php b/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php
@@ -35,6 +35,7 @@ public function getErrorList()
             90  => 1,
             98  => 1,
             104 => 1,
+            125 => 1,
         ];
 
     }//end getErrorList()