From 39b2fed47e321aefab64d3f7a55543133fe4fc27 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Tue, 16 Jan 2024 11:42:16 -0300
Subject: [PATCH 1/2] Generic/ByteOrderMark: rename test case file

To add more tests that need to go into separate files.
---
 ...rMarkUnitTest.inc => ByteOrderMarkUnitTest.1.inc} |  0
 .../Generic/Tests/Files/ByteOrderMarkUnitTest.php    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 rename src/Standards/Generic/Tests/Files/{ByteOrderMarkUnitTest.inc => ByteOrderMarkUnitTest.1.inc} (100%)

diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.inc b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc
similarity index 100%
rename from src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.inc
rename to src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc
diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
index 3d80c618f6..c777d64047 100644
--- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
@@ -26,11 +26,19 @@ final class ByteOrderMarkUnitTest extends AbstractSniffUnitTest
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return [1 => 1];
+        switch ($testFile) {
+        case 'ByteOrderMarkUnitTest.1.inc':
+            return [1 => 1];
+
+        default:
+            return [];
+        }
 
     }//end getErrorList()
 

From a9642e50ce2cfc0049837d53725598b4b06ed9fc Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Tue, 16 Jan 2024 11:58:23 -0300
Subject: [PATCH 2/2] Generic/ByteOrderMark: improve test coverage

This commit adds four more tests case files:
* 2 to cover the cases where the sniff is triggered but the file does not contain a BOM character.
    One of these files is in UTF-8 encoding without a BOM, the other is in ANSI/iso-8859-1 encoding.
* 2 to cover the different UTF-16 encodings with a BOM character.

Includes adding a comment to the original test case file to document the encoding (UTF-8 with BOM) of that file.
---
 .../Tests/Files/ByteOrderMarkUnitTest.1.inc       |   7 ++++---
 .../Tests/Files/ByteOrderMarkUnitTest.2.inc       |   3 +++
 .../Tests/Files/ByteOrderMarkUnitTest.3.inc       |   1 +
 .../Tests/Files/ByteOrderMarkUnitTest.4.inc       | Bin 0 -> 208 bytes
 .../Tests/Files/ByteOrderMarkUnitTest.5.inc       | Bin 0 -> 202 bytes
 .../Generic/Tests/Files/ByteOrderMarkUnitTest.php |   2 ++
 6 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.2.inc
 create mode 100644 src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.3.inc
 create mode 100644 src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.4.inc
 create mode 100644 src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.5.inc

diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc
index dc3bf59670..a50b622609 100644
--- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.1.inc
@@ -1,3 +1,4 @@
-<?php
-echo 'foo';
-?>
+<?php
+// File in UTF-8 encoding with byte order mark (BOM) character before the opening PHP tag.
+echo 'foo';
+?>
\ No newline at end of file
diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.2.inc b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.2.inc
new file mode 100644
index 0000000000..6d61f0e1e7
--- /dev/null
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.2.inc
@@ -0,0 +1,3 @@
+<?php // File in UTF-8 encoding without a byte order mark (BOM) character before the opening PHP tag. ?>
+
+<p>Some HTML</p>
diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.3.inc b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.3.inc
new file mode 100644
index 0000000000..ff1e2bf7d5
--- /dev/null
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.3.inc
@@ -0,0 +1 @@
+<p>Some HTML at the beginning of an ANSI/iso-8859-1 encoded file without a byte order mark (BOM) character</p>
diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.4.inc b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.4.inc
new file mode 100644
index 0000000000000000000000000000000000000000..312974a8286305fd6c2f894b66e061ad4da9bbd0
GIT binary patch
literal 208
zcmXYr%?<%U5QM+8r<fxL#KlP>kq`&Mfd`mn{bX62%_idI@y(J>PghrU*YxK-VM@it
z>=;8Mu;9v#T=Wz*s)1<k*{SszF}7Q^TJxWrQ*xAv)<DL~z2xwqmd||ych#Cg)Mdto
oH9he`|HMa8+DVg{_0;Yrk95J$tFo5<QgW8xvNV$(?FZif1<|e}X8-^I

literal 0
HcmV?d00001

diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.5.inc b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.5.inc
new file mode 100644
index 0000000000000000000000000000000000000000..7aea9550dd1d9ecc7c95362f49108a8d976b6159
GIT binary patch
literal 202
zcmXAiy$ZrW5QM)vPjRIdDmGSvASgCs3Vnc!#vjx(1VMax^}EQjH?uo8JD)F8W;C4b
z!WvnDB^PegvX|_s8i@9et=fPw6Q{Y_NnDUP$fFpjc<adC2d(?sH*i;NxypL_HmvE(
k_g>EXD9fJwvl5S;H{ZzF|67fiOi5j4$%?Ymqw|pB2e5%63jhEB

literal 0
HcmV?d00001

diff --git a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
index c777d64047..c1c3e292e3 100644
--- a/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
+++ b/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php
@@ -34,6 +34,8 @@ public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'ByteOrderMarkUnitTest.1.inc':
+        case 'ByteOrderMarkUnitTest.4.inc':
+        case 'ByteOrderMarkUnitTest.5.inc':
             return [1 => 1];
 
         default: