Merge branch 'php-8.0/generic-scopeindent-support-match' of https://g…

…ithub.com/jrfnl/PHP_CodeSniffer
squizlabs · Mar 5, 2021 · ed08850 · ed08850
2 parents 1106d65 + 19b401a
commit ed08850
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 2 deletions.
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc
@@ -1476,6 +1476,33 @@ class Foo
     }
 }
 
+$value = match ($value) {
+    '' => null,
+    false => false,
+    1, 2, 3 => true,
+    default => $value,
+};
+
+$value = match ($value) {
+    '' => null,
+false => false,
+  1, 2, 3 => true,
+    default => $value,
+};
+
+$value = match (
+  $value
+  ) {
+    '' => null,
+    false
+      => false,
+    1,
+  2,
+      3 => true,
+    default =>
+$value,
+};
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed
@@ -1476,6 +1476,33 @@ class Foo
     }
 }
 
+$value = match ($value) {
+    '' => null,
+    false => false,
+    1, 2, 3 => true,
+    default => $value,
+};
+
+$value = match ($value) {
+    '' => null,
+    false => false,
+    1, 2, 3 => true,
+    default => $value,
+};
+
+$value = match (
+  $value
+  ) {
+    '' => null,
+    false
+      => false,
+    1,
+    2,
+      3 => true,
+    default =>
+    $value,
+};
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc
@@ -1476,6 +1476,33 @@ class Foo
 	}
 }
 
+$value = match ($value) {
+	'' => null,
+	false => false,
+	1, 2, 3 => true,
+	default => $value,
+};
+
+$value = match ($value) {
+	'' => null,
+false => false,
+  1, 2, 3 => true,
+	default => $value,
+};
+
+$value = match (
+  $value
+  ) {
+	'' => null,
+	false
+	  => false,
+	1,
+  2,
+	  3 => true,
+	default =>
+$value,
+};
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed
@@ -1476,6 +1476,33 @@ class Foo
 	}
 }
 
+$value = match ($value) {
+	'' => null,
+	false => false,
+	1, 2, 3 => true,
+	default => $value,
+};
+
+$value = match ($value) {
+	'' => null,
+	false => false,
+	1, 2, 3 => true,
+	default => $value,
+};
+
+$value = match (
+  $value
+  ) {
+	'' => null,
+	false
+	  => false,
+	1,
+	2,
+	  3 => true,
+	default =>
+	$value,
+};
+
 /* ADD NEW TESTS ABOVE THIS LINE AND MAKE SURE THAT THE 1 (space-based) AND 2 (tab-based) FILES ARE IN SYNC! */
 ?>
 

diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -178,10 +178,14 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
             1340 => 1,
             1342 => 1,
             1345 => 1,
-            1487 => 1,
             1488 => 1,
             1489 => 1,
-            1490 => 1,
+            1500 => 1,
+            1503 => 1,
+            1514 => 1,
+            1515 => 1,
+            1516 => 1,
+            1517 => 1,
         ];
 
     }//end getErrorList()