PHP 8.0 | PSR12/BooleanOperatorPlacement: include match expressions

Allows the sniff to also check the placement of boolean operators in match expressions. Includes unit test.
squizlabs · Feb 23, 2021 · ab7af46 · ab7af46
1 parent b52a018
commit ab7af46
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()