Skip to content

Commit d1e1ea8

Browse files
tintoutintou
committed
Replace deprecated getter function with get on the Server
These have been deprecated since Nextcloud 20 and removed in 32. Signed-off-by: Corentin Noël <[email protected]>
1 parent b274266 commit d1e1ea8

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎tests/Unit/Controller/ContactsControllerTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected function setUp(): void {
108108
//$this->userPrincipalBackend = new Principal(
109109
// $c->getServer()->getUserManager(),
110110
// $c->getServer()->getGroupManager(),
111-
// $c->getServer()->getShareManager(),
111+
// $c->getServer()->get(\OCP\Share\IManager::class),
112112
// \OC::$server->getUserSession(),
113113
// $c->query(IServerContainer::class)->getConfig(),
114114
// \OC::$server->getAppManager()
@@ -130,7 +130,7 @@ protected function setUp(): void {
130130
$this->addressService,
131131
'test',
132132
$this->cdBackend,
133-
$c->query(IServerContainer::class)->getAvatarManager(),
133+
$c->query(IServerContainer::class)->get(\OCP\IAvatarManager::class),
134134
$this->root,
135135
$urlGenerator);
136136
//$this->contactsController = $this->getMockBuilder('OCA\Maps\Controller\ContactsController')
@@ -145,7 +145,7 @@ protected function setUp(): void {
145145
$this->addressService,
146146
'test2',
147147
$this->cdBackend,
148-
$c->query(IServerContainer::class)->getAvatarManager(),
148+
$c->query(IServerContainer::class)->get(\OCP\IAvatarManager::class),
149149
$this->root,
150150
$urlGenerator
151151
);

‎tests/Unit/Controller/DevicesApiControllerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function setUp(): void {
8383
$this->request,
8484
$c->query(IServerContainer::class),
8585
$c->query(IServerContainer::class)->getConfig(),
86-
$c->getServer()->getShareManager(),
86+
$c->getServer()->get(\OCP\Share\IManager::class),
8787
$c->getServer()->getAppManager(),
8888
$c->getServer()->getUserManager(),
8989
$c->getServer()->getGroupManager(),
@@ -97,7 +97,7 @@ protected function setUp(): void {
9797
$this->request,
9898
$c->query(IServerContainer::class),
9999
$c->query(IServerContainer::class)->getConfig(),
100-
$c->getServer()->getShareManager(),
100+
$c->getServer()->get(\OCP\Share\IManager::class),
101101
$c->getServer()->getAppManager(),
102102
$c->getServer()->getUserManager(),
103103
$c->getServer()->getGroupManager(),

‎tests/Unit/Controller/DevicesControllerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ protected function setUp(): void {
8585
$this->request,
8686
$c->query(IServerContainer::class),
8787
$c->query(IServerContainer::class)->getConfig(),
88-
$c->getServer()->getShareManager(),
88+
$c->getServer()->get(\OCP\Share\IManager::class),
8989
$c->getServer()->getAppManager(),
9090
$c->getServer()->getUserManager(),
9191
$c->getServer()->getGroupManager(),
9292
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
9393
$c->query(DevicesService::class),
9494
$c->query(DeviceShareMapper::class),
95-
$c->query(IServerContainer::class)->getDateTimeZone(),
95+
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
9696
$c->query(IRootFolder::class),
9797
'test'
9898
);
@@ -102,14 +102,14 @@ protected function setUp(): void {
102102
$this->request,
103103
$c->query(IServerContainer::class),
104104
$c->query(IServerContainer::class)->getConfig(),
105-
$c->getServer()->getShareManager(),
105+
$c->getServer()->get(\OCP\Share\IManager::class),
106106
$c->getServer()->getAppManager(),
107107
$c->getServer()->getUserManager(),
108108
$c->getServer()->getGroupManager(),
109109
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
110110
$c->query(DevicesService::class),
111111
$c->query(DeviceShareMapper::class),
112-
$c->query(IServerContainer::class)->getDateTimeZone(),
112+
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
113113
$c->query(IRootFolder::class),
114114
'test2'
115115
);

‎tests/Unit/Controller/FavoritesApiControllerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function setUp(): void {
8383
$this->request,
8484
$c->query(IServerContainer::class),
8585
$c->query(IServerContainer::class)->getConfig(),
86-
$c->getServer()->getShareManager(),
86+
$c->getServer()->get(\OCP\Share\IManager::class),
8787
$c->getServer()->getAppManager(),
8888
$c->getServer()->getUserManager(),
8989
$c->getServer()->getGroupManager(),
@@ -97,7 +97,7 @@ protected function setUp(): void {
9797
$this->request,
9898
$c->query(IServerContainer::class),
9999
$c->query(IServerContainer::class)->getConfig(),
100-
$c->getServer()->getShareManager(),
100+
$c->getServer()->get(\OCP\Share\IManager::class),
101101
$c->getServer()->getAppManager(),
102102
$c->getServer()->getUserManager(),
103103
$c->getServer()->getGroupManager(),

‎tests/Unit/Controller/FavoritesControllerTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ protected function setUp(): void {
9393
$this->request,
9494
$c->query(IServerContainer::class),
9595
$c->query(IServerContainer::class)->getConfig(),
96-
$c->getServer()->getShareManager(),
96+
$c->getServer()->get(\OCP\Share\IManager::class),
9797
$c->getServer()->getAppManager(),
9898
$c->getServer()->getUserManager(),
9999
$c->getServer()->getGroupManager(),
100100
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
101101
$c->query(FavoritesService::class),
102-
$c->query(IServerContainer::class)->getDateTimeZone(),
102+
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
103103
$c->query(FavoriteShareMapper::class),
104104
'test'
105105
);
@@ -109,13 +109,13 @@ protected function setUp(): void {
109109
$this->request,
110110
$c->query(IServerContainer::class),
111111
$c->query(IServerContainer::class)->getConfig(),
112-
$c->getServer()->getShareManager(),
112+
$c->getServer()->get(\OCP\Share\IManager::class),
113113
$c->getServer()->getAppManager(),
114114
$c->getServer()->getUserManager(),
115115
$c->getServer()->getGroupManager(),
116116
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
117117
$c->query(FavoritesService::class),
118-
$c->query(IServerContainer::class)->getDateTimeZone(),
118+
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
119119
$c->query(FavoriteShareMapper::class),
120120
'test2'
121121
);

‎tests/Unit/Controller/PhotosControllerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function setUp(): void {
9292
$this->rootFolder,
9393
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
9494
$c->query(GeophotoMapper::class),
95-
$c->query(IServerContainer::class)->getShareManager(),
95+
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
9696
$c->query(\OCP\BackgroundJob\IJobList::class)
9797
);
9898

‎tests/Unit/Controller/TracksControllerTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function setUp(): void {
8585
$c->query(IServerContainer::class)->get(\Psr\Log\LoggerInterface::class),
8686
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
8787
$this->rootFolder,
88-
$c->query(IServerContainer::class)->getShareManager(),
88+
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
8989
$c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)
9090
);
9191

@@ -94,7 +94,7 @@ protected function setUp(): void {
9494
$this->request,
9595
$c->query(IServerContainer::class),
9696
$c->query(IServerContainer::class)->getConfig(),
97-
$c->query(IServerContainer::class)->getShareManager(),
97+
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
9898
$c->getServer()->getAppManager(),
9999
$c->getServer()->getUserManager(),
100100
$c->getServer()->getGroupManager(),
@@ -108,7 +108,7 @@ protected function setUp(): void {
108108
$this->request,
109109
$c->query(IServerContainer::class),
110110
$c->query(IServerContainer::class)->getConfig(),
111-
$c->query(IServerContainer::class)->getShareManager(),
111+
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
112112
$c->getServer()->getAppManager(),
113113
$c->getServer()->getUserManager(),
114114
$c->getServer()->getGroupManager(),

0 commit comments

Comments
 (0)