1 files changed, 20 insertions, 39 deletions

diff --git a/core/Command/App/Install.php b/core/Command/App/Install.php
index a699a2e7af0..c8a396c8e36 100644
--- a/core/Command/App/Install.php
+++ b/core/Command/App/Install.php
@@ -1,33 +1,15 @@
 <?php
+
+declare(strict_types=1);
+
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Joas Schilling <coding@schilljs.com>
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Maxopoly <max@dermax.org>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author sualko <klaus@jsxc.org>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
  */
 namespace OC\Core\Command\App;
 
 use OC\Installer;
+use OCP\App\IAppManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -35,7 +17,14 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Install extends Command {
-	protected function configure() {
+	public function __construct(
+		protected IAppManager $appManager,
+		private Installer $installer,
+	) {
+		parent::__construct();
+	}
+
+	protected function configure(): void {
 		$this
 			->setName('app:install')
 			->setDescription('install an app')
@@ -67,34 +56,26 @@ class Install extends Command {
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$appId = $input->getArgument('app-id');
-		$forceEnable = (bool) $input->getOption('force');
+		$forceEnable = (bool)$input->getOption('force');
 
-		if (\OC_App::getAppPath($appId)) {
+		if ($this->appManager->isEnabledForAnyone($appId)) {
 			$output->writeln($appId . ' already installed');
 			return 1;
 		}
 
 		try {
-			/** @var Installer $installer */
-			$installer = \OC::$server->query(Installer::class);
-			$installer->downloadApp($appId, $input->getOption('allow-unstable'));
-			$result = $installer->installApp($appId, $forceEnable);
+			$this->installer->downloadApp($appId, $input->getOption('allow-unstable'));
+			$result = $this->installer->installApp($appId, $forceEnable);
 		} catch (\Exception $e) {
 			$output->writeln('Error: ' . $e->getMessage());
 			return 1;
 		}
 
-		if ($result === false) {
-			$output->writeln($appId . ' couldn\'t be installed');
-			return 1;
-		}
-
-		$appVersion = \OC_App::getAppVersion($appId);
+		$appVersion = $this->appManager->getAppVersion($appId);
 		$output->writeln($appId . ' ' . $appVersion . ' installed');
 
 		if (!$input->getOption('keep-disabled')) {
-			$appClass = new \OC_App();
-			$appClass->enable($appId);
+			$this->appManager->enableApp($appId);
 			$output->writeln($appId . ' enabled');
 		}