upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Refactor OC\Server::getShareManager

Browse source 
Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com>
This commit is contained in:
Andrew Summers 2023-08-29 17:07:38 -05:00
parent 9d1547f59d
commit 6b09a79227
No known key found for this signature in database
GPG key ID: 1E0B639A223E3E2D
6 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/Share20/Hooks.php
View file

@ -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']);
}
}

3
lib/private/Template/JSConfigHelper.php
View file

@ -49,6 +49,7 @@ use OCP\ISession;
use OCP\IURLGenerator;
use OCP\ILogger;
use OCP\IUser;
use OCP\Share\IManager as IShareManager;
use OCP\User\Backend\IPasswordConfirmationBackend;
use OCP\Util;
@ -260,7 +261,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,

5
lib/public/Util.php
View file

@ -48,6 +48,7 @@ namespace OCP;
use OC\AppScriptDependency;
use OC\AppScriptSort;
use OCP\Share\IManager as IShareManager;
use bantu\IniGetWrapper\IniGetWrapper;
use Psr\Container\ContainerExceptionInterface;
@ -127,11 +128,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(IShareManager::class);
}
$user = \OC::$server->getUserSession()->getUser();

7
tests/lib/Files/ViewTest.php
View file

@ -25,6 +25,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;
@ -296,7 +297,7 @@ class ViewTest extends \Test\TestCase {
*/
public function testRemoveSharePermissionWhenSharingDisabledForUser($excludeGroups, $excludeGroupsList, $expectedShareable) {
// Reset sharing disabled for users cache
self::invokePrivate(\OC::$server->getShareManager(), 'sharingDisabledForUsersCache', [new CappedMemoryCache()]);
self::invokePrivate(\OC::$server->get(IShareManager::class), 'sharingDisabledForUsersCache', [new CappedMemoryCache()]);
$config = \OC::$server->getConfig();
$oldExcludeGroupsFlag = $config->getAppValue('core', 'shareapi_exclude_groups', 'no');
@ -321,7 +322,7 @@ class ViewTest extends \Test\TestCase {
$config->setAppValue('core', 'shareapi_exclude_groups_list', $oldExcludeGroupsList);
// Reset sharing disabled for users cache
self::invokePrivate(\OC::$server->getShareManager(), 'sharingDisabledForUsersCache', [new CappedMemoryCache()]);
self::invokePrivate(\OC::$server->get(IShareManager::class), 'sharingDisabledForUsersCache', [new CappedMemoryCache()]);
}
public function testCacheIncompleteFolder() {
@ -1683,7 +1684,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)

7
tests/lib/Share20/DefaultShareProviderTest.php
View file

@ -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;
@ -2540,7 +2541,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())
@ -2644,7 +2645,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())
@ -2740,7 +2741,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())

3
tests/lib/Share20/LegacyHooksTest.php
View file

@ -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() {