diff --git a/composer.lock b/composer.lock index f7457f938..69a0805d8 100644 --- a/composer.lock +++ b/composer.lock @@ -937,16 +937,16 @@ }, { "name": "psalm/phar", - "version": "5.23.1", + "version": "5.26.0", "source": { "type": "git", "url": "https://github.com/psalm/phar.git", - "reference": "07bb50acefdaf7b663087186f86d47542a9b1622" + "reference": "004fa1aa67e1d04198458a2e5b34c75b40257519" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/phar/zipball/07bb50acefdaf7b663087186f86d47542a9b1622", - "reference": "07bb50acefdaf7b663087186f86d47542a9b1622", + "url": "https://api.github.com/repos/psalm/phar/zipball/004fa1aa67e1d04198458a2e5b34c75b40257519", + "reference": "004fa1aa67e1d04198458a2e5b34c75b40257519", "shasum": "" }, "require": { @@ -966,9 +966,9 @@ "description": "Composer-based Psalm Phar", "support": { "issues": "https://github.com/psalm/phar/issues", - "source": "https://github.com/psalm/phar/tree/5.23.1" + "source": "https://github.com/psalm/phar/tree/5.26.0" }, - "time": "2024-03-11T20:43:33+00:00" + "time": "2024-09-08T17:24:40+00:00" }, { "name": "psr/clock", diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php index b113dac22..69548ac41 100644 --- a/lib/Trash/TrashBackend.php +++ b/lib/Trash/TrashBackend.php @@ -70,29 +70,29 @@ public function listTrashRoot(IUser $user): array { /** * @return list */ - public function listTrashFolder(ITrashItem $trashItem): array { - if (!$trashItem instanceof GroupTrashItem) { + public function listTrashFolder(ITrashItem $folder): array { + if (!$folder instanceof GroupTrashItem) { return []; } - $user = $trashItem->getUser(); - $folder = $this->getNodeForTrashItem($user, $trashItem); - if (!$folder instanceof Folder) { + $user = $folder->getUser(); + $folderNode = $this->getNodeForTrashItem($user, $folder); + if (!$folderNode instanceof Folder) { return []; } - $content = $folder->getDirectoryListing(); - $this->aclManagerFactory->getACLManager($user)->preloadRulesForFolder($trashItem->getPath()); - return array_values(array_filter(array_map(function (Node $node) use ($trashItem, $user) { - if (!$this->userHasAccessToPath($user, $trashItem->getPath() . '/' . $node->getName())) { + $content = $folderNode->getDirectoryListing(); + $this->aclManagerFactory->getACLManager($user)->preloadRulesForFolder($folder->getPath()); + return array_values(array_filter(array_map(function (Node $node) use ($folder, $user) { + if (!$this->userHasAccessToPath($user, $folder->getPath() . '/' . $node->getName())) { return null; } return new GroupTrashItem( $this, - $trashItem->getOriginalLocation() . '/' . $node->getName(), - $trashItem->getDeletedTime(), - $trashItem->getTrashPath() . '/' . $node->getName(), + $folder->getOriginalLocation() . '/' . $node->getName(), + $folder->getDeletedTime(), + $folder->getTrashPath() . '/' . $node->getName(), $node, $user, - $trashItem->getGroupFolderMountPoint() + $folder->getGroupFolderMountPoint() ); }, $content))); }