From 19b401a0f5cd4d84bc9ece7b0799e9adfebddaa6 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Mon, 22 Feb 2021 04:33:56 +0100
Subject: [PATCH] PHP 8.0 | Generic/ScopeIndent: add tests with match control
 structure

---
 .../WhiteSpace/ScopeIndentUnitTest.1.inc      | 27 +++++++++++++++++++
 .../ScopeIndentUnitTest.1.inc.fixed           | 27 +++++++++++++++++++
 .../WhiteSpace/ScopeIndentUnitTest.2.inc      | 27 +++++++++++++++++++
 .../ScopeIndentUnitTest.2.inc.fixed           | 27 +++++++++++++++++++
 .../Tests/WhiteSpace/ScopeIndentUnitTest.php  |  8 ++++--
 5 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc
index 291d00f683..098b2bdeb0 100644
--- 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
index 36dcadb790..67aef35ad4 100644
--- 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
index acffeb1e3a..2dac5ce552 100644
--- 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
index 390b2aa7e6..66eec4568b 100644
--- 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
index 66e82c91e3..f5adc3ac7c 100644
--- 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()