diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-11-24 10:27:58 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-11-25 12:00:57 +0100 |
| commit | 0e2f00ec59424b2ef5708a928856e2c75abe6deb (patch) | |
| tree | cbd61c976a34b352bb8377899a244b66ff82f40d /lib/private/legacy | |
| parent | a97a290fd5ed06dfc33d2adeed5d3b7531674827 (diff) | |
| download | nextcloud-server-0e2f00ec59424b2ef5708a928856e2c75abe6deb.tar.gz nextcloud-server-0e2f00ec59424b2ef5708a928856e2c75abe6deb.zip | |
Get the Installer via DI
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/app.php | 16 | ||||
| -rw-r--r-- | lib/private/legacy/util.php | 11 |
2 files changed, 11 insertions, 16 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index d2b0f96d593..1b9fc28873e 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -375,13 +375,7 @@ class OC_App { self::$enabledAppsCache = []; // flush // Check if app is already downloaded - $installer = new Installer( - \OC::$server->getAppFetcher(), - \OC::$server->getHTTPClientService(), - \OC::$server->getTempManager(), - \OC::$server->getLogger(), - \OC::$server->getConfig() - ); + $installer = \OC::$server->query(Installer::class); $isDownloaded = $installer->isDownloaded($appId); if(!$isDownloaded) { @@ -415,13 +409,7 @@ class OC_App { return false; } - $installer = new Installer( - \OC::$server->getAppFetcher(), - \OC::$server->getHTTPClientService(), - \OC::$server->getTempManager(), - \OC::$server->getLogger(), - \OC::$server->getConfig() - ); + $installer = \OC::$server->query(Installer::class); return $installer->removeApp($app); } diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 1e9090960c1..3ce11746672 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -708,8 +708,15 @@ class OC_Util { } $webServerRestart = false; - $setup = new \OC\Setup($config, \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), - \OC::$server->query(\OCP\Defaults::class), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); + $setup = new \OC\Setup( + $config, + \OC::$server->getIniWrapper(), + \OC::$server->getL10N('lib'), + \OC::$server->query(\OCP\Defaults::class), + \OC::$server->getLogger(), + \OC::$server->getSecureRandom(), + \OC::$server->query(\OC\Installer::class) + ); $urlGenerator = \OC::$server->getURLGenerator(); |