diff options
author | John Molakvoæ <skjnldsv@protonmail.com> | 2022-10-28 15:05:07 +0200 |
---|---|---|
committer | John Molakvoæ <skjnldsv@protonmail.com> | 2024-01-09 10:56:14 +0100 |
commit | 82b5a19a35b780bf18ebac46711166158a5a6cb2 (patch) | |
tree | bbc44ee4e65f4b7c2f480962f15a9aeb0ca9587f /apps/files_sharing/lib | |
parent | 7b6a650b6e09b07d4b85a4ae84eb64a6c32b217f (diff) | |
download | nextcloud-server-82b5a19a35b780bf18ebac46711166158a5a6cb2.tar.gz nextcloud-server-82b5a19a35b780bf18ebac46711166158a5a6cb2.zip |
fix: public dav and files_sharing testing fixes
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r-- | apps/files_sharing/lib/Controller/PublicPreviewController.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 2 | ||||
-rw-r--r-- | apps/files_sharing/lib/ResponseDefinitions.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_sharing/lib/Controller/PublicPreviewController.php b/apps/files_sharing/lib/Controller/PublicPreviewController.php index 54a1a321665..c59baac73c4 100644 --- a/apps/files_sharing/lib/Controller/PublicPreviewController.php +++ b/apps/files_sharing/lib/Controller/PublicPreviewController.php @@ -61,7 +61,7 @@ class PublicPreviewController extends PublicShareController { $this->previewManager = $previewManager; } - protected function getPasswordHash(): string { + protected function getPasswordHash(): ?string { return $this->share->getPassword(); } diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index bd9cdffa83d..eebf964c8f9 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -204,7 +204,7 @@ class ShareController extends AuthPublicShareController { return $this->shareManager->checkPassword($this->share, $password); } - protected function getPasswordHash(): string { + protected function getPasswordHash(): ?string { return $this->share->getPassword(); } diff --git a/apps/files_sharing/lib/ResponseDefinitions.php b/apps/files_sharing/lib/ResponseDefinitions.php index aa1ee004971..313cf82bd51 100644 --- a/apps/files_sharing/lib/ResponseDefinitions.php +++ b/apps/files_sharing/lib/ResponseDefinitions.php @@ -50,18 +50,18 @@ namespace OCA\Files_Sharing; * mimetype: string, * note: string, * parent: null, - * password?: string, + * password?: null|string, * password_expiration_time?: ?string, * path: ?string, * permissions: int, * send_password_by_talk?: bool, * share_type: int, - * share_with?: string, + * share_with?: null|string, * share_with_avatar?: string, * share_with_displayname?: string, * share_with_displayname_unique?: ?string, * share_with_link?: string, - * status?: array{clearAt?: int|null, icon?: ?string, message?: ?string, status?: string}, + * status?: array{clearAt: int|null, icon: ?string, message: ?string, status: string}, * stime: int, * storage: int, * storage_id: string, |