diff --git a/lib/Mount/MountProvider.php b/lib/Mount/MountProvider.php index 3bea91c23..7a664cf7f 100644 --- a/lib/Mount/MountProvider.php +++ b/lib/Mount/MountProvider.php @@ -197,11 +197,11 @@ private function getCurrentUID(): ?string { } public function getMount( - int $id, - string $mountPoint, - int $permissions, - int $quota, - ?ICacheEntry $cacheEntry = null, + int $id, + string $mountPoint, + int $permissions, + int $quota, + ?ICacheEntry $cacheEntry = null, ?IStorageFactory $loader = null, bool $acl = false, ?IUser $user = null, @@ -285,11 +285,11 @@ public function getMount( } public function getTrashMount( - int $id, - string $mountPoint, - int $quota, + int $id, + string $mountPoint, + int $quota, IStorageFactory $loader, - IUser $user, + IUser $user, ): IMountPoint { $storage = $this->getRootFolder()->getStorage(); @@ -310,11 +310,11 @@ public function getTrashMount( } public function getGroupFolderStorage( - int $id, - IStorage $rootStorage, - ?IUser $user, - string $rootPath, - int $quota, + int $id, + IStorage $rootStorage, + ?IUser $user, + string $rootPath, + int $quota, ?ICacheEntry $rootCacheEntry, ): IStorage { if ($this->enableEncryption) { diff --git a/lib/Trash/GroupTrashItem.php b/lib/Trash/GroupTrashItem.php index 7371f0487..0c4aff168 100644 --- a/lib/Trash/GroupTrashItem.php +++ b/lib/Trash/GroupTrashItem.php @@ -6,7 +6,6 @@ namespace OCA\GroupFolders\Trash; -use OC\Files\Storage\Wrapper\Jail; use OCA\Files_Trashbin\Trash\ITrashBackend; use OCA\Files_Trashbin\Trash\TrashItem; use OCP\Files\FileInfo; diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php index c738de01a..28b351b2f 100644 --- a/lib/Trash/TrashBackend.php +++ b/lib/Trash/TrashBackend.php @@ -234,7 +234,7 @@ public function moveToTrash(IStorage $storage, string $internalPath): bool { $folderId = $storage->getFolderId(); $user = $this->userSession->getUser(); if (!$user) { - throw new \Exception("file moved to trash with no user in context"); + throw new \Exception('file moved to trash with no user in context'); } // ensure the folder exists $this->getTrashFolder($folderId);