diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-16 08:55:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 08:55:06 +0200 |
| commit | 4c558c99f326d4b399cc503c8c1a43e1099ba9d9 (patch) | |
| tree | 2a86f93aa7b4549cdd95ff7acf3f0e0008a57f2b /apps/files_sharing | |
| parent | d7406e515952bfa2c2659ecd44599bb0e5afbeec (diff) | |
| parent | a55e794bfdafc3719b0053709dbefd506692fa1b (diff) | |
| download | nextcloud-server-4c558c99f326d4b399cc503c8c1a43e1099ba9d9.tar.gz nextcloud-server-4c558c99f326d4b399cc503c8c1a43e1099ba9d9.zip | |
Merge pull request #6130 from nextcloud/cleanup-unused-methods
Cleanup unused methods
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareesAPIController.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/lib/ExpireSharesJob.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/SharedStorageTest.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/tests/UpdaterTest.php | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index a2ab03bd853..94a4854dbde 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -506,7 +506,7 @@ class ShareesAPIController extends OCSController { */ protected function isRemoteSharingAllowed($itemType) { try { - $backend = Share::getBackend($itemType); + $backend = \OC\Share\Share::getBackend($itemType); return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE); } catch (\Exception $e) { return false; diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php index 212b7fa008e..e7e10b30c12 100644 --- a/apps/files_sharing/lib/ExpireSharesJob.php +++ b/apps/files_sharing/lib/ExpireSharesJob.php @@ -68,7 +68,7 @@ class ExpireSharesJob extends TimedJob { $shares = $qb->execute(); while($share = $shares->fetch()) { - \OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']); + \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']); } $shares->closeCursor(); } diff --git a/apps/files_sharing/tests/SharedStorageTest.php b/apps/files_sharing/tests/SharedStorageTest.php index 7d007cb6414..c443aa9c45f 100644 --- a/apps/files_sharing/tests/SharedStorageTest.php +++ b/apps/files_sharing/tests/SharedStorageTest.php @@ -298,7 +298,7 @@ class SharedStorageTest extends TestCase { //cleanup self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - $result = \OCP\Share::unshare('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, + $result = \OC\Share\Share::unshare('folder', $fileinfoFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2); $this->assertTrue($result); } diff --git a/apps/files_sharing/tests/UpdaterTest.php b/apps/files_sharing/tests/UpdaterTest.php index c35bcf1a08c..63000152b5a 100644 --- a/apps/files_sharing/tests/UpdaterTest.php +++ b/apps/files_sharing/tests/UpdaterTest.php @@ -93,7 +93,7 @@ class UpdaterTest extends TestCase { // check if user2 can see the shared folder $this->assertTrue($view->file_exists($this->folder)); - $foldersShared = \OCP\Share::getItemsSharedWith('folder'); + $foldersShared = \OC\Share\Share::getItemsSharedWith('folder'); $this->assertSame(1, count($foldersShared)); $view->mkdir('localFolder'); @@ -110,7 +110,7 @@ class UpdaterTest extends TestCase { $this->loginHelper(self::TEST_FILES_SHARING_API_USER2); // shared folder should be unshared - $foldersShared = \OCP\Share::getItemsSharedWith('folder'); + $foldersShared = \OC\Share\Share::getItemsSharedWith('folder'); $this->assertTrue(empty($foldersShared)); // trashbin should contain the local file but not the mount point |