Skip to content

Commit dae5077

Browse files
committed
Minor Tweak
1 parent d16407b commit dae5077

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/PhpSpreadsheet/Reader/Csv.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -646,14 +646,12 @@ private static function guessEncodingTestBom(string &$encoding, string $first4,
646646
public static function guessEncodingBom(string $filename, ?string $convertString = null): string
647647
{
648648
$encoding = '';
649-
$first4 = $convertString ?? file_get_contents($filename, false, null, 0, 4);
650-
if ($first4 !== false) {
651-
self::guessEncodingTestBom($encoding, $first4, self::UTF8_BOM, 'UTF-8');
652-
self::guessEncodingTestBom($encoding, $first4, self::UTF16BE_BOM, 'UTF-16BE');
653-
self::guessEncodingTestBom($encoding, $first4, self::UTF32BE_BOM, 'UTF-32BE');
654-
self::guessEncodingTestBom($encoding, $first4, self::UTF32LE_BOM, 'UTF-32LE');
655-
self::guessEncodingTestBom($encoding, $first4, self::UTF16LE_BOM, 'UTF-16LE');
656-
}
649+
$first4 = $convertString ?? (string) file_get_contents($filename, false, null, 0, 4);
650+
self::guessEncodingTestBom($encoding, $first4, self::UTF8_BOM, 'UTF-8');
651+
self::guessEncodingTestBom($encoding, $first4, self::UTF16BE_BOM, 'UTF-16BE');
652+
self::guessEncodingTestBom($encoding, $first4, self::UTF32BE_BOM, 'UTF-32BE');
653+
self::guessEncodingTestBom($encoding, $first4, self::UTF32LE_BOM, 'UTF-32LE');
654+
self::guessEncodingTestBom($encoding, $first4, self::UTF16LE_BOM, 'UTF-16LE');
657655

658656
return $encoding;
659657
}

0 commit comments

Comments
 (0)