Fix #19683: Updated framework\mimeType.php to the actual value. Fix typo in build/controllers/MimeTypeController.php

Author: DeryabinSergey

build/controllers/MimeTypeController.php

@@ -101,10 +101,6 @@ private function generateMimeTypesFile($outFile, $content)
         ksort($mimeMap);
         $array = VarDumper::export($mimeMap);
 
-        if (PHP_VERSION_ID >= 80100) {
-            $array = array_replace($array, array('xz' => 'application/octet-stream'));
-        }
-
         $content = <<<EOD
 <?php
 /**
@@ -116,8 +112,13 @@ private function generateMimeTypesFile($outFile, $content)
  * https://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?view=markup
  * This file has been placed in the public domain for unlimited redistribution.
  */
-return $array;
+\$mimeTypes = $array;
+
+if (PHP_VERSION_ID >= 80100) {
+    \$mimeTypes = array_replace(\$mimeTypes, array('xz' => 'application/octet-stream'));
+}
 
+return \$mimeTypes;
 EOD;
         file_put_contents($outFile, $content);
         $this->stdout("done.\n", Console::FG_GREEN);

framework/CHANGELOG.md

@@ -4,6 +4,7 @@ Yii Framework 2 Change Log
 2.0.48 under development
 ------------------------
 
+- Bug #19683: Updated `framework\mimeType.php` to the actual value. Fix typo in `build/controllers/MimeTypeController.php` (DeryabinSergey)
 - Bug #19705: Add binary and other data type to `$typeMap` list for MySQL (sohelahmed7)
 - Enh #19741: Added option to use a closure for `$variations` definition in `yii\filters\PageCache` (nadar)
 - Bug #15376: Added $userId for RBAC roles cache (manchenkoff)

framework/helpers/mimeTypes.php

@@ -318,11 +318,12 @@
     'htke' => 'application/vnd.kenameaapp',
     'htm' => 'text/html',
     'html' => 'text/html',
-    'hvd' => 'application/vnd.yamaha.hv-dic',
     'hvp' => 'application/vnd.yamaha.hv-voice',
     'hvs' => 'application/vnd.yamaha.hv-script',
     'i2g' => 'application/vnd.intergeo',
     'icc' => 'application/vnd.iccprofile',
+    0 => 'application/vnd.lotus-1-2-3',
+    'hvd' => 'application/vnd.yamaha.hv-dic',
     'ice' => 'x-conference/x-cooltalk',
     'icm' => 'application/vnd.iccprofile',
     'ico' => 'image/x-icon',
@@ -355,7 +356,6 @@
     'jam' => 'application/vnd.jam',
     'jar' => 'application/java-archive',
     'java' => 'text/x-java-source',
-    'jfif' => 'image/jpeg',
     'jisp' => 'application/vnd.jisp',
     'jlt' => 'application/vnd.hp-jlyt',
     'jnlp' => 'application/x-java-jnlp-file',
@@ -366,7 +366,7 @@
     'jpgm' => 'video/jpm',
     'jpgv' => 'video/jpeg',
     'jpm' => 'video/jpm',
-    'js' => 'application/javascript',
+    'js' => 'text/javascript',
     'json' => 'application/json',
     'jsonml' => 'application/jsonml+json',
     'kar' => 'audio/midi',
@@ -401,7 +401,6 @@
     'log' => 'text/plain',
     'lostxml' => 'application/lost+xml',
     'lrf' => 'application/octet-stream',
-    0 => 'application/vnd.lotus-1-2-3',
     'lrm' => 'application/vnd.ms-lrm',
     'ltf' => 'application/vnd.frogans.ltf',
     'lvp' => 'audio/vnd.lucent.voice',
@@ -1001,4 +1000,4 @@
     $mimeTypes = array_replace($mimeTypes, array('xz' => 'application/octet-stream'));
 }
 
-return $mimeTypes;
+return $mimeTypes;

tests/framework/helpers/MimeTest.php

@@ -348,11 +348,12 @@ public function testMimeTypes()
                 'htke' => 'application/vnd.kenameaapp',
                 'htm' => 'text/html',
                 'html' => 'text/html',
-                'hvd' => 'application/vnd.yamaha.hv-dic',
                 'hvp' => 'application/vnd.yamaha.hv-voice',
                 'hvs' => 'application/vnd.yamaha.hv-script',
                 'i2g' => 'application/vnd.intergeo',
                 'icc' => 'application/vnd.iccprofile',
+                0 => 'application/vnd.lotus-1-2-3',
+                'hvd' => 'application/vnd.yamaha.hv-dic',
                 'ice' => 'x-conference/x-cooltalk',
                 'icm' => 'application/vnd.iccprofile',
                 'ico' => 'image/x-icon',
@@ -385,7 +386,6 @@ public function testMimeTypes()
                 'jam' => 'application/vnd.jam',
                 'jar' => 'application/java-archive',
                 'java' => 'text/x-java-source',
-                'jfif' => 'image/jpeg',
                 'jisp' => 'application/vnd.jisp',
                 'jlt' => 'application/vnd.hp-jlyt',
                 'jnlp' => 'application/x-java-jnlp-file',
@@ -396,7 +396,7 @@ public function testMimeTypes()
                 'jpgm' => 'video/jpm',
                 'jpgv' => 'video/jpeg',
                 'jpm' => 'video/jpm',
-                'js' => 'application/javascript',
+                'js' => 'text/javascript',
                 'json' => 'application/json',
                 'jsonml' => 'application/jsonml+json',
                 'kar' => 'audio/midi',
@@ -431,7 +431,6 @@ public function testMimeTypes()
                 'log' => 'text/plain',
                 'lostxml' => 'application/lost+xml',
                 'lrf' => 'application/octet-stream',
-                0 => 'application/vnd.lotus-1-2-3',
                 'lrm' => 'application/vnd.ms-lrm',
                 'ltf' => 'application/vnd.frogans.ltf',
                 'lvp' => 'audio/vnd.lucent.voice',