Move console command registration to info.xml for encryption as well as files_external

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

2 files changed, 13 insertions, 60 deletions

diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index f99ef3b6c49..21e28134688 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -29,4 +29,17 @@
 		<admin>OCA\Files_External\Settings\Admin</admin>
 		<admin-section>OCA\Files_External\Settings\Section</admin-section>
 	</settings>
+
+	<commands>
+		<command>OCA\Files_External\Command\ListCommand</command>
+		<command>OCA\Files_External\Command\Config</command>
+		<command>OCA\Files_External\Command\Option</command>
+		<command>OCA\Files_External\Command\Applicable</command>
+		<command>OCA\Files_External\Command\Import</command>
+		<command>OCA\Files_External\Command\Export</command>
+		<command>OCA\Files_External\Command\Delete</command>
+		<command>OCA\Files_External\Command\Create</command>
+		<command>OCA\Files_External\Command\Backends</command>
+		<command>OCA\Files_External\Command\Verify</command>
+	</commands>
 </info>
diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php
deleted file mode 100644
index 614f0c0a97a..00000000000
--- a/apps/files_external/appinfo/register_command.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @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/>
- *
- */
-
-
-use OCA\Files_External\Command\ListCommand;
-use OCA\Files_External\Command\Config;
-use OCA\Files_External\Command\Option;
-use OCA\Files_External\Command\Applicable;
-use OCA\Files_External\Command\Import;
-use OCA\Files_External\Command\Export;
-use OCA\Files_External\Command\Delete;
-use OCA\Files_External\Command\Create;
-use OCA\Files_External\Command\Backends;
-use OCA\Files_External\Command\Verify;
-use OCA\Files_External\Command\Notify;
-
-$userManager = OC::$server->getUserManager();
-$userSession = OC::$server->getUserSession();
-$groupManager = OC::$server->getGroupManager();
-
-$app = \OC_Mount_Config::$app;
-
-$globalStorageService = $app->getContainer()->query('\OCA\Files_External\Service\GlobalStoragesService');
-$userStorageService = $app->getContainer()->query('\OCA\Files_External\Service\UserStoragesService');
-$importLegacyStorageService = $app->getContainer()->query('\OCA\Files_External\Service\ImportLegacyStoragesService');
-$backendService = $app->getContainer()->query('OCA\Files_External\Service\BackendService');
-$connection = $app->getContainer()->getServer()->getDatabaseConnection();
-
-/** @var Symfony\Component\Console\Application $application */
-$application->add(new ListCommand($globalStorageService, $userStorageService, $userSession, $userManager));
-$application->add(new Config($globalStorageService));
-$application->add(new Option($globalStorageService));
-$application->add(new Applicable($globalStorageService, $userManager, $groupManager));
-$application->add(new Import($globalStorageService, $userStorageService, $userSession, $userManager, $importLegacyStorageService, $backendService));
-$application->add(new Export($globalStorageService, $userStorageService, $userSession, $userManager));
-$application->add(new Delete($globalStorageService, $userStorageService, $userSession, $userManager));
-$application->add(new Create($globalStorageService, $userStorageService, $userManager, $userSession, $backendService));
-$application->add(new Backends($backendService));
-$application->add(new Verify($globalStorageService));
-$application->add(new Notify($globalStorageService, $connection));