Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor OC\Server::getShareManager #40131

Merged
merged 3 commits into from
Mar 15, 2024
Merged

Refactor OC\Server::getShareManager #40131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b09a79
Refactor `OC\Server::getShareManager`
summersab Aug 29, 2023
9338ef3
Merge branch 'master' into refactor/OC-Server-getShareManager
skjnldsv Mar 15, 2024
2c8d410
fix: php-cs
skjnldsv Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/private/Share20/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 1 deletion lib/private/Template/JSConfigHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\Share\IManager as IShareManager;
use OCP\User\Backend\IPasswordConfirmationBackend;
use OCP\Util;

Expand Down Expand Up @@ -261,7 +262,7 @@ public function getConfig(): string {
'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,
Expand Down
4 changes: 2 additions & 2 deletions lib/public/Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ public static function getChannel() {
*
* @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();
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/Files/ViewTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
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;
Expand Down Expand Up @@ -1684,7 +1685,7 @@ public function testMoveMountPointIntoSharedFolder() {

$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)
Expand Down
7 changes: 4 additions & 3 deletions tests/lib/Share20/DefaultShareProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
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;

Expand Down Expand Up @@ -2541,7 +2542,7 @@ public function testGetSharesInFolder() {
$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())
Expand Down Expand Up @@ -2645,7 +2646,7 @@ public function testGetAccessListNoCurrentAccessRequired() {
$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())
Expand Down Expand Up @@ -2741,7 +2742,7 @@ public function testGetAccessListCurrentAccessRequired() {
$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())
Expand Down
3 changes: 2 additions & 1 deletion tests/lib/Share20/LegacyHooksTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
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;
Expand All @@ -56,7 +57,7 @@ protected function setUp(): void {
$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() {
Expand Down
Loading