1 files changed, 40 insertions, 25 deletions

diff --git a/apps/dav/lib/RootCollection.php b/apps/dav/lib/RootCollection.php
index 751ab17bb7a..870aa0d4540 100644
--- a/apps/dav/lib/RootCollection.php
+++ b/apps/dav/lib/RootCollection.php
@@ -30,38 +30,46 @@ use OCA\DAV\Upload\CleanupService;
 use OCP\Accounts\IAccountManager;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Comments\ICommentsManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\IConfig;
+use OCP\IDBConnection;
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\Security\ISecureRandom;
 use OCP\Server;
+use OCP\SystemTag\ISystemTagManager;
+use OCP\SystemTag\ISystemTagObjectMapper;
 use Psr\Log\LoggerInterface;
 use Sabre\DAV\SimpleCollection;
 
 class RootCollection extends SimpleCollection {
 	public function __construct() {
 		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->get(LoggerInterface::class);
-		$userManager = \OC::$server->getUserManager();
-		$userSession = \OC::$server->getUserSession();
-		$groupManager = \OC::$server->getGroupManager();
-		$shareManager = \OC::$server->getShareManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->get(IEventDispatcher::class);
-		$config = \OC::$server->get(IConfig::class);
-		$proxyMapper = \OC::$server->query(ProxyMapper::class);
+		$random = Server::get(ISecureRandom::class);
+		$logger = Server::get(LoggerInterface::class);
+		$userManager = Server::get(IUserManager::class);
+		$userSession = Server::get(IUserSession::class);
+		$groupManager = Server::get(IGroupManager::class);
+		$shareManager = Server::get(\OCP\Share\IManager::class);
+		$db = Server::get(IDBConnection::class);
+		$dispatcher = Server::get(IEventDispatcher::class);
+		$config = Server::get(IConfig::class);
+		$proxyMapper = Server::get(ProxyMapper::class);
 		$rootFolder = Server::get(IRootFolder::class);
 
 		$userPrincipalBackend = new Principal(
 			$userManager,
 			$groupManager,
-			\OC::$server->get(IAccountManager::class),
+			Server::get(IAccountManager::class),
 			$shareManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getAppManager(),
+			Server::get(IUserSession::class),
+			Server::get(IAppManager::class),
 			$proxyMapper,
-			\OC::$server->get(KnownUserService::class),
-			\OC::$server->getConfig(),
+			Server::get(KnownUserService::class),
+			Server::get(IConfig::class),
 			\OC::$server->getL10NFactory()
 		);
 
@@ -80,7 +88,7 @@ class RootCollection extends SimpleCollection {
 		$systemPrincipals->disableListing = $disableListing;
 		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
 		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarSharingBackend = \OC::$server->get(Backend::class);
+		$calendarSharingBackend = Server::get(Backend::class);
 
 		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
 		$filesCollection->disableListing = $disableListing;
@@ -107,31 +115,33 @@ class RootCollection extends SimpleCollection {
 
 		$systemTagCollection = Server::get(SystemTagsByIdCollection::class);
 		$systemTagRelationsCollection = new SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
+			Server::get(ISystemTagManager::class),
+			Server::get(ISystemTagObjectMapper::class),
+			Server::get(IUserSession::class),
 			$groupManager,
 			$dispatcher,
 			$rootFolder,
 		);
 		$systemTagInUseCollection = Server::get(SystemTagsInUseCollection::class);
 		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
+			Server::get(ICommentsManager::class),
 			$userManager,
-			\OC::$server->getUserSession(),
+			Server::get(IUserSession::class),
 			$dispatcher,
 			$logger
 		);
 
-		$contactsSharingBackend = \OC::$server->get(\OCA\DAV\CardDAV\Sharing\Backend::class);
+		$contactsSharingBackend = Server::get(\OCA\DAV\CardDAV\Sharing\Backend::class);
+		$config = Server::get(IConfig::class);
 
-		$pluginManager = new PluginManager(\OC::$server, \OC::$server->query(IAppManager::class));
+		$pluginManager = new PluginManager(\OC::$server, Server::get(IAppManager::class));
 		$usersCardDavBackend = new CardDavBackend(
 			$db,
 			$userPrincipalBackend,
 			$userManager,
 			$dispatcher,
 			$contactsSharingBackend,
+			$config
 		);
 		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/users');
 		$usersAddressBookRoot->disableListing = $disableListing;
@@ -142,6 +152,7 @@ class RootCollection extends SimpleCollection {
 			$userManager,
 			$dispatcher,
 			$contactsSharingBackend,
+			$config
 		);
 		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, $pluginManager, $userSession->getUser(), $groupManager, 'principals/system');
 		$systemAddressBookRoot->disableListing = $disableListing;
@@ -149,14 +160,18 @@ class RootCollection extends SimpleCollection {
 		$uploadCollection = new Upload\RootCollection(
 			$userPrincipalBackend,
 			'principals/users',
-			\OC::$server->query(CleanupService::class));
+			Server::get(CleanupService::class),
+			$rootFolder,
+			$userSession,
+			$shareManager,
+		);
 		$uploadCollection->disableListing = $disableListing;
 
 		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
 		$avatarCollection->disableListing = $disableListing;
 
 		$appleProvisioning = new AppleProvisioningNode(
-			\OC::$server->query(ITimeFactory::class));
+			Server::get(ITimeFactory::class));
 
 		$children = [
 			new SimpleCollection('principals', [