From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 2 Aug 2019 18:43:50 +0000 (+0200)
Subject: Lets use DI where we can
X-Git-Tag: v17.0.0beta1~46^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F16643%2Fhead;p=nextcloud-server.git

Lets use DI where we can

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---

diff --git a/apps/files/lib/AppInfo/Application.php b/apps/files/lib/AppInfo/Application.php
index dc2ed59618e..cef4b31f85f 100644
--- a/apps/files/lib/AppInfo/Application.php
+++ b/apps/files/lib/AppInfo/Application.php
@@ -59,40 +59,15 @@ class Application extends App {
 			);
 		});
 
-		$container->registerService('ViewController', function (IContainer $c) use ($server) {
-			return new ViewController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getURLGenerator(),
-				$c->query('L10N'),
-				$server->getConfig(),
-				$server->getEventDispatcher(),
-				$server->getUserSession(),
-				$server->getAppManager(),
-				$server->getRootFolder(),
-				$c->query(Helper::class)
-			);
-		});
-
-		/**
-		 * Core
-		 */
-		$container->registerService('L10N', function(IContainer $c) {
-			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
-		});
-
 		/**
 		 * Services
 		 */
-		$container->registerService('Tagger', function(IContainer $c)  {
-			return $c->query('ServerContainer')->getTagManager()->load('files');
-		});
 		$container->registerService('TagService', function(IContainer $c) use ($server) {
 			$homeFolder = $c->query('ServerContainer')->getUserFolder();
 			return new TagService(
 				$c->query('ServerContainer')->getUserSession(),
 				$c->query('ServerContainer')->getActivityManager(),
-				$c->query('Tagger'),
+				$c->query('ServerContainer')->getTagManager()->load('files'),
 				$homeFolder,
 				$server->getEventDispatcher()
 			);