[Mime] remove some extensions by mime type

desarrolla2 · desarrolla2 · commit f72727701a67 · 2020-07-06T14:25:00.000+02:00
diff --git a/src/Symfony/Component/Mime/MimeTypes.php b/src/Symfony/Component/Mime/MimeTypes.php
@@ -255,7 +255,7 @@ public function guessMimeType(string $path): ?string
         'application/n-triples' => ['nt'],
         'application/nappdf' => ['pdf'],
         'application/node' => ['cjs'],
-        'application/octet-stream' => ['bin', 'dms', 'lrf', 'mar', 'so', 'dist', 'distz', 'pkg', 'bpk', 'dump', 'elc', 'deploy', 'exe', 'dll', 'deb', 'dmg', 'iso', 'img', 'msi', 'msp', 'msm', 'buffer'],
+        'application/octet-stream' => ['bin', 'dms', 'lrf', 'mar', 'so', 'dist', 'distz', 'pkg', 'bpk', 'dump', 'elc', 'deploy', 'exe', 'dll', 'deb', 'dmg', 'iso', 'img', 'msp', 'msm', 'buffer'],
         'application/oda' => ['oda'],
         'application/oebps-package+xml' => ['opf'],
         'application/ogg' => ['ogx'],
@@ -2568,7 +2568,7 @@ public function guessMimeType(string $path): ?string
         'msf' => ['application/vnd.epson.msf'],
         'msg' => ['application/vnd.ms-outlook'],
         'msh' => ['model/mesh'],
-        'msi' => ['application/octet-stream', 'application/x-msdownload', 'application/x-msi'],
+        'msi' => ['application/x-msdownload', 'application/x-msi'],
         'msl' => ['application/vnd.mobius.msl'],
         'msm' => ['application/octet-stream'],
         'msod' => ['image/x-msod'],
diff --git a/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php b/src/Symfony/Component/Mime/Resources/bin/update_mime_types.php
@@ -64,14 +64,24 @@
 $map = array_replace_recursive($current, $new);
 ksort($map);
 
-// force some extension to be in the first position of the map
-$forceExtensionMap = [
+// remove some extensions from the map
+$removeExtensionByMimeType = [
+    'application/octet-stream' => 'msi',
+];
+foreach ($removeExtensionByMimeType as $mimeType => $extension) {
+    if (false !== ($idx = array_search($extension, $map[$mimeType]))) {
+        unset($map[$mimeType][$idx]);
+    }
+}
+
+// force an extension to be in the first position on the map
+$forceExtensionInFirstPositionByMimeType = [
     'application/vnd.apple.keynote' => 'key',
     'audio/mpeg' => 'mp3',
     'text/markdown' => 'md',
     'text/x-markdown' => 'md',
 ];
-foreach ($forceExtensionMap as $mimeType => $extension) {
+foreach ($forceExtensionInFirstPositionByMimeType as $mimeType => $extension) {
     $map[$mimeType] = array_unique(array_merge([$extension], $map[$mimeType]));
 }
 
