Merge pull request #32859 from nextcloud/bug/31973/array-key-might-be-empty

Fix Uninitialized string offset 0 at GenerateMimetypeFileBuilder.php#39

1 files changed, 5 insertions, 7 deletions

diff --git a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php
index 97432473722..873744e6f94 100644
--- a/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php
+++ b/core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php
@@ -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');