Merge pull request #34791 from nextcloud/backport/32859/stable25

[stable25] Fix Uninitialized string offset 0 at GenerateMimetypeFileBuilder.php#39
This commit is contained in:
Côme Chilliet 2022-10-25 14:10:09 +02:00 committed by GitHub
commit d49c7a3bdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View 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');