From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Thu, 16 Jul 2020 08:27:44 +0000 (+0200)
Subject: Migrate files sharing to the PSR container
X-Git-Tag: v20.0.0beta1~207^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F21862%2Fhead;p=nextcloud-server.git

Migrate files sharing to the PSR container

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---

diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index acf1462601d..1b1bd08d3fd 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -50,13 +50,15 @@ use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCA\Files\Event\LoadSidebar;
 use OCP\AppFramework\App;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Federation\ICloudIdManager;
 use OCP\Files\Config\IMountProviderCollection;
 use OCP\Group\Events\UserAddedEvent;
-use OCP\IContainer;
+use OCP\IDBConnection;
 use OCP\IGroup;
 use OCP\IServerContainer;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Util;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
@@ -103,15 +105,13 @@ class Application extends App {
 		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
 		$container->registerMiddleWare(ShareInfoMiddleware::class);
 
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
+		$container->registerService('ExternalMountProvider', function (ContainerInterface $c) {
 			return new \OCA\Files_Sharing\External\MountProvider(
-				$server->getDatabaseConnection(),
+				$c->get(IDBConnection::class),
 				function () use ($c) {
-					return $c->query(Manager::class);
+					return $c->get(Manager::class);
 				},
-				$server->getCloudIdManager()
+				$c->get(ICloudIdManager::class)
 			);
 		});