]> source.dussan.org Git - nextcloud-server.git/commitdiff
Fix Uninitialized string offset 0 at GenerateMimetypeFileBuilder.php#39 34793/head
authorDaniel Kesselberg <mail@danielkesselberg.de>
Mon, 13 Jun 2022 09:58:16 +0000 (11:58 +0200)
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>
Tue, 25 Oct 2022 08:32:07 +0000 (08:32 +0000)
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php

index 97432473722980fc68681dd92a7ed7b6f73a35b4..873744e6f9480b00f68095f69beed002b4b5e28e 100644 (file)
@@ -30,17 +30,15 @@ namespace OC\Core\Command\Maintenance\Mimetype;
 class GenerateMimetypeFileBuilder {
        /**
         * Generate mime type list file
-        * @param $aliases
+        *
+        * @param array $aliases
         * @return string
         */
        public function generateFile(array $aliases): string {
                // Remove comments
-               $keys = array_filter(array_keys($aliases), function ($k) {
-                       return $k[0] === '_';
-               });
-               foreach ($keys as $key) {
-                       unset($aliases[$key]);
-               }
+               $aliases = array_filter($aliases, static function ($key) {
+                       return !($key === '' || $key[0] === '_');
+               }, ARRAY_FILTER_USE_KEY);
 
                // Fetch all files
                $dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');