Skip to content

Support multiple extensions for MIME types in FileExtensionTrait #1538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garak merged 1 commit into from
Sep 20, 2025
+7 −4
Merged

Support multiple extensions for MIME types in FileExtensionTrait #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Naming/Polyfill/FileExtensionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ trait FileExtensionTrait
{
// extensions safe to keep
private static array $keep = [
'txt' => 'csv',
'xml' => 'gpx',
'xlsx' => 'xlsb',
'txt' => ['csv', 'srt', 'vtt'],
'xml' => ['gpx', 'kml'],
'xlsx' => ['xlsb'],
];

/**
Expand All @@ -27,7 +27,7 @@ private function getExtension(File $file): ?string
if ('' !== ($extension = $file->guessExtension())) {
if (isset(self::$keep[$extension])) {
$originalExtension = \pathinfo($file->getClientOriginalName(), \PATHINFO_EXTENSION);
if (self::$keep[$extension] === $originalExtension) {
if (\in_array($originalExtension, self::$keep[$extension], true)) {
return $originalExtension;
}
}
Expand Down
3 changes: 3 additions & 0 deletions tests/Naming/SmartUniqidNamerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ public static function fileDataProvider(): array
'dot in filename' => ['filename has . spaces (2).jpg', 'jpg', '/filename-has-spaces-2-[[:xdigit:]]{22}\.jpg/'],
'file with no extension with null mimetype' => ['lala', null, '/lala-[[:xdigit:]]{22}$/'],
'csv retains extension even if guessed as txt' => ['lala.csv', 'txt', '/lala-[[:xdigit:]]{22}\.csv/'],
'srt retains extension even if guessed as txt' => ['lala.srt', 'txt', '/lala-[[:xdigit:]]{22}\.srt/'],
'vtt retains extension even if guessed as txt' => ['lala.vtt', 'txt', '/lala-[[:xdigit:]]{22}\.vtt/'],
'gpx retains extension even if guessed as xml' => ['baz.gpx', 'xml', '/^baz-[[:xdigit:]]{22}\.gpx$/'],
'kml retains extension even if guessed as xml' => ['baz.kml', 'xml', '/^baz-[[:xdigit:]]{22}\.kml$/'],
'xlsb retains extension even if guessed as xlsx' => ['lala.xlsb', 'xlsx', '/lala-[[:xdigit:]]{22}\.xlsb/'],
];
}
Expand Down