From a10f9b28c017410ff913608c4f7e71b8215b7f03 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 7 Aug 2025 14:53:09 +0200 Subject: [PATCH] fix(trashbackend): Fix type in userHasAccessToFolder Fix crash caused by the following exception: OCA\\GroupFolders\\Trash\\TrashBackend::OCA\\GroupFolders\\Trash\\{closure}(): Argument #1 ($folder) must be of type array, OCA\\GroupFolders\\Folder\\FolderDefinitionWithPermissions given in file '/var/www/html/apps-extra/groupfolders/lib/Trash/TrashBackend.php' line 333 Signed-off-by: Carl Schwan --- lib/Trash/TrashBackend.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php index 49607b911..a16549aea 100644 --- a/lib/Trash/TrashBackend.php +++ b/lib/Trash/TrashBackend.php @@ -16,6 +16,7 @@ use OCA\Files_Trashbin\Trash\ITrashBackend; use OCA\Files_Trashbin\Trash\ITrashItem; use OCA\GroupFolders\ACL\ACLManagerFactory; +use OCA\GroupFolders\Folder\FolderDefinition; use OCA\GroupFolders\Folder\FolderDefinitionWithPermissions; use OCA\GroupFolders\Folder\FolderManager; use OCA\GroupFolders\Folder\FolderWithMappingsAndCache; @@ -330,7 +331,7 @@ private function moveFromEncryptedStorage(IStorage $sourceStorage, IStorage $tar private function userHasAccessToFolder(IUser $user, int $folderId): bool { $folders = $this->folderManager->getFoldersForUser($user); - $folderIds = array_map(fn (array $folder): int => $folder->id, $folders); + $folderIds = array_map(fn (FolderDefinition $folder): int => $folder->id, $folders); return in_array($folderId, $folderIds); }