Make guessEncodingBom Public

oleibman · oleibman · commit d16407bea82b · 2024-10-13T15:04:26.000-07:00
It can be used elsewhere.
diff --git a/src/PhpSpreadsheet/Reader/Csv.php b/src/PhpSpreadsheet/Reader/Csv.php
@@ -643,10 +643,10 @@ private static function guessEncodingTestBom(string &$encoding, string $first4,
         }
     }
 
-    private static function guessEncodingBom(string $filename): string
+    public static function guessEncodingBom(string $filename, ?string $convertString = null): string
     {
         $encoding = '';
-        $first4 = file_get_contents($filename, false, null, 0, 4);
+        $first4 = $convertString ?? file_get_contents($filename, false, null, 0, 4);
         if ($first4 !== false) {
             self::guessEncodingTestBom($encoding, $first4, self::UTF8_BOM, 'UTF-8');
             self::guessEncodingTestBom($encoding, $first4, self::UTF16BE_BOM, 'UTF-16BE');

Original file line number	Diff line number	Diff line change
`@@ -643,10 +643,10 @@ private static function guessEncodingTestBom(string &$encoding, string $first4,`
`643`	`643`	`}`
`644`	`644`	`}`
`645`	`645`
`646`		`- private static function guessEncodingBom(string $filename): string`
	`646`	`+ public static function guessEncodingBom(string $filename, ?string $convertString = null): string`
`647`	`647`	`{`
`648`	`648`	`$encoding = '';`
`649`		`- $first4 = file_get_contents($filename, false, null, 0, 4);`
	`649`	`+ $first4 = $convertString ?? file_get_contents($filename, false, null, 0, 4);`
`650`	`650`	`if ($first4 !== false) {`
`651`	`651`	`self::guessEncodingTestBom($encoding, $first4, self::UTF8_BOM, 'UTF-8');`
`652`	`652`	`self::guessEncodingTestBom($encoding, $first4, self::UTF16BE_BOM, 'UTF-16BE');`