MDL-78930 filetypes: Add MIME for PSD and JSON icon

- The PSD icon has been there all this time, but no MIME type was using it.
A new MIME has been added (image/vnd.adobe.photoshop) for the .psd files.
The MIME type for existing PSD files will be also upgraded.

- A new JSON icon has been added. It will be used by the JSON, CSS and SCSS
MIME types.

admin/tool/filetypes/tests/tool_filetypes_test.php

@@ -88,6 +88,6 @@ public function test_get_icons_from_path() {
      */
     public function test_get_file_icons() {
         $icons = utils::get_file_icons();
-        $this->assertCount(30, $icons);
+        $this->assertCount(31, $icons);
     }
 }

lib/classes/filetypes.php

@@ -68,7 +68,7 @@ protected static function get_default_types() {
             'cct' => array('type' => 'shockwave/director', 'icon' => 'flash'),
             'cpp' => array('type' => 'text/plain', 'icon' => 'sourcecode'),
             'cs' => array('type' => 'application/x-csh', 'icon' => 'sourcecode'),
-            'css' => array('type' => 'text/css', 'icon' => 'text', 'groups' => array('web_file')),
+            'css' => array('type' => 'text/css', 'icon' => 'json', 'groups' => array('web_file')),
             'csv' => array('type' => 'text/csv', 'icon' => 'spreadsheet', 'groups' => array('spreadsheet')),
             'dv' => array('type' => 'video/x-dv', 'icon' => 'video', 'groups' => array('video'), 'string' => 'video'),
             'dmg' => array('type' => 'application/octet-stream', 'icon' => 'unknown'),
@@ -145,7 +145,7 @@ protected static function get_default_types() {
                 'string' => 'image'),
             'jqz' => array('type' => 'text/xml', 'icon' => 'markup'),
             'js' => array('type' => 'application/x-javascript', 'icon' => 'text', 'groups' => array('web_file')),
-            'json' => array('type' => 'application/json', 'icon' => 'text'),
+            'json' => array('type' => 'application/json', 'icon' => 'json'),
             'latex' => array('type' => 'application/x-latex', 'icon' => 'text'),
             'm' => array('type' => 'text/plain', 'icon' => 'sourcecode'),
             'mbz' => array('type' => 'application/vnd.moodle.backup', 'icon' => 'moodle'),
@@ -229,6 +229,7 @@ protected static function get_default_types() {
             'ppsm' => array('type' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12', 'icon' => 'powerpoint',
                     'groups' => array('presentation')),
             'ps' => array('type' => 'application/postscript', 'icon' => 'pdf'),
+            'psd' => array('type' => 'image/vnd.adobe.photoshop', 'icon' => 'psd'),
             'pub' => array('type' => 'application/x-mspublisher', 'icon' => 'publisher', 'groups' => array('presentation')),
 
             'qt' => array('type' => 'video/quicktime', 'icon' => 'video',
@@ -248,7 +249,7 @@ protected static function get_default_types() {
             'rtx' => array('type' => 'text/richtext', 'icon' => 'text'),
             'rv' => array('type' => 'audio/x-pn-realaudio-plugin', 'icon' => 'audio',
                     'groups' => array('video'), 'string' => 'video'),
-            'scss' => array('type' => 'text/x-scss', 'icon' => 'text', 'groups' => array('web_file')),
+            'scss' => array('type' => 'text/x-scss', 'icon' => 'json', 'groups' => array('web_file')),
             'sh' => array('type' => 'application/x-sh', 'icon' => 'sourcecode'),
             'sit' => array('type' => 'application/x-stuffit', 'icon' => 'archive',
                     'groups' => array('archive'), 'string' => 'archive'),

lib/db/upgrade.php

@@ -3501,5 +3501,19 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2023082200.04);
     }
 
+    if ($oldversion < 2023082600.01) {
+        // Upgrade MIME type for existing PSD files.
+        $DB->set_field_select(
+            'files',
+            'mimetype',
+            'image/vnd.adobe.photoshop',
+            $DB->sql_like('filename', '?', false),
+            ['%.psd']
+        );
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2023082600.01);
+    }
+
     return true;
 }

version.php

@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2023082600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2023082600.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.3dev+ (Build: 20230826)'; // Human-friendly version name