aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2024-03-15 16:05:59 +0100
committerGitHub <noreply@github.com>2024-03-15 16:05:59 +0100
commit5a1ed2d9eac523c3c530baff5aa933964c0f67d0 (patch)
treee6e458418c7ec94bad5dbd985b0dc5f27b73f29e
parente0faca6170e9bf39bfe34fcac225d4ae2ae8c3b7 (diff)
parent2c8d410f674b74d33ce187e7aa3e20ffbfc5d26a (diff)
downloadnextcloud-server-5a1ed2d9eac523c3c530baff5aa933964c0f67d0.tar.gz
nextcloud-server-5a1ed2d9eac523c3c530baff5aa933964c0f67d0.zip
Merge pull request #40131 from summersab/refactor/OC-Server-getShareManager
-rw-r--r--lib/private/Share20/Hooks.php6
-rw-r--r--lib/private/Template/JSConfigHelper.php3
-rw-r--r--lib/public/Util.php4
-rw-r--r--tests/lib/Files/ViewTest.php3
-rw-r--r--tests/lib/Share20/DefaultShareProviderTest.php7
-rw-r--r--tests/lib/Share20/LegacyHooksTest.php3
6 files changed, 16 insertions, 10 deletions
diff --git a/lib/private/Share20/Hooks.php b/lib/private/Share20/Hooks.php
index ae08b20fde6..2ab328b6bd9 100644
--- a/lib/private/Share20/Hooks.php
+++ b/lib/private/Share20/Hooks.php
@@ -21,12 +21,14 @@
*/
namespace OC\Share20;
+use OCP\Share\IManager as IShareManager;
+
class Hooks {
public static function post_deleteUser($arguments) {
- \OC::$server->getShareManager()->userDeleted($arguments['uid']);
+ \OC::$server->get(IShareManager::class)->userDeleted($arguments['uid']);
}
public static function post_deleteGroup($arguments) {
- \OC::$server->getShareManager()->groupDeleted($arguments['gid']);
+ \OC::$server->get(IShareManager::class)->groupDeleted($arguments['gid']);
}
}
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index 8cba93f1f4e..d2cd536fa9f 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -49,6 +49,7 @@ use OCP\ILogger;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUser;
+use OCP\Share\IManager as IShareManager;
use OCP\User\Backend\IPasswordConfirmationBackend;
use OCP\Util;
@@ -261,7 +262,7 @@ class JSConfigHelper {
'resharingAllowed' => Share::isResharingAllowed(),
'remoteShareAllowed' => $outgoingServer2serverShareEnabled,
'federatedCloudShareDoc' => $this->urlGenerator->linkToDocs('user-sharing-federated'),
- 'allowGroupSharing' => \OC::$server->getShareManager()->allowGroupSharing(),
+ 'allowGroupSharing' => \OC::$server->get(IShareManager::class)->allowGroupSharing(),
'defaultInternalExpireDateEnabled' => $defaultInternalExpireDateEnabled,
'defaultInternalExpireDate' => $defaultInternalExpireDate,
'defaultInternalExpireDateEnforced' => $defaultInternalExpireDateEnforced,
diff --git a/lib/public/Util.php b/lib/public/Util.php
index e3f394c1ca9..11229567188 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -110,11 +110,11 @@ class Util {
*
* @return boolean
* @since 7.0.0
- * @deprecated 9.1.0 Use \OC::$server->getShareManager()->sharingDisabledForUser
+ * @deprecated 9.1.0 Use \OC::$server->get(\OCP\Share\IManager::class)->sharingDisabledForUser
*/
public static function isSharingDisabledForUser() {
if (self::$shareManager === null) {
- self::$shareManager = \OC::$server->getShareManager();
+ self::$shareManager = \OC::$server->get(IManager::class);
}
$user = \OC::$server->getUserSession()->getUser();
diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php
index c4e17fd3118..f67c4e9642b 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -26,6 +26,7 @@ use OCP\Files\Storage\IStorage;
use OCP\IDBConnection;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
+use OCP\Share\IManager as IShareManager;
use OCP\Share\IShare;
use OCP\Util;
use Test\HookHelper;
@@ -1684,7 +1685,7 @@ class ViewTest extends \Test\TestCase {
$userFolder = \OC::$server->getUserFolder($this->user);
$shareDir = $userFolder->get('shareddir');
- $shareManager = \OC::$server->getShareManager();
+ $shareManager = \OC::$server->get(IShareManager::class);
$share = $shareManager->newShare();
$share->setSharedWith('test2')
->setSharedBy($this->user)
diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index e1cdb8530c3..315ee66bb31 100644
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -39,6 +39,7 @@ use OCP\IUser;
use OCP\IUserManager;
use OCP\L10N\IFactory;
use OCP\Mail\IMailer;
+use OCP\Share\IManager as IShareManager;
use OCP\Share\IShare;
use PHPUnit\Framework\MockObject\MockObject;
@@ -2541,7 +2542,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$file1 = $folder1->newFile('bar');
$folder2 = $folder1->newFolder('baz');
- $shareManager = \OC::$server->getShareManager();
+ $shareManager = \OC::$server->get(IShareManager::class);
$share1 = $shareManager->newShare();
$share1->setNode($folder1)
->setSharedBy($u1->getUID())
@@ -2645,7 +2646,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertCount(0, $result['users']);
$this->assertFalse($result['public']);
- $shareManager = \OC::$server->getShareManager();
+ $shareManager = \OC::$server->get(IShareManager::class);
$share1 = $shareManager->newShare();
$share1->setNode($folder1)
->setSharedBy($u1->getUID())
@@ -2741,7 +2742,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertCount(0, $result['users']);
$this->assertFalse($result['public']);
- $shareManager = \OC::$server->getShareManager();
+ $shareManager = \OC::$server->get(IShareManager::class);
$share1 = $shareManager->newShare();
$share1->setNode($folder1)
->setSharedBy($u1->getUID())
diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php
index 728f320ea9e..239b3c91ca1 100644
--- a/tests/lib/Share20/LegacyHooksTest.php
+++ b/tests/lib/Share20/LegacyHooksTest.php
@@ -35,6 +35,7 @@ use OCP\Share\Events\BeforeShareDeletedEvent;
use OCP\Share\Events\ShareCreatedEvent;
use OCP\Share\Events\ShareDeletedEvent;
use OCP\Share\Events\ShareDeletedFromSelfEvent;
+use OCP\Share\IManager as IShareManager;
use OCP\Share\IShare;
use Psr\Log\LoggerInterface;
use Test\TestCase;
@@ -56,7 +57,7 @@ class LegacyHooksTest extends TestCase {
$logger = $this->createMock(LoggerInterface::class);
$this->eventDispatcher = new \OC\EventDispatcher\EventDispatcher($symfonyDispatcher, \OC::$server->get(IServerContainer::class), $logger);
$this->hooks = new LegacyHooks($this->eventDispatcher);
- $this->manager = \OC::$server->getShareManager();
+ $this->manager = \OC::$server->get(IShareManager::class);
}
public function testPreUnshare() {