diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index 539f9f116d2c3..f6632b2ae92f5 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -30,4 +30,8 @@ OCA\Encryption\Settings\Admin + + OCA\Encryption\Command\EnableMasterKey + OCA\Encryption\Command\MigrateKeys + diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php deleted file mode 100644 index ced82d21a647b..0000000000000 --- a/apps/encryption/appinfo/register_command.php +++ /dev/null @@ -1,38 +0,0 @@ - - * - * @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 - * - */ - -use OCA\Encryption\Command\MigrateKeys; -use Symfony\Component\Console\Helper\QuestionHelper; - -$userManager = OC::$server->getUserManager(); -$view = new \OC\Files\View(); -$config = \OC::$server->getConfig(); -$l = \OC::$server->getL10N('encryption'); -$userSession = \OC::$server->getUserSession(); -$connection = \OC::$server->getDatabaseConnection(); -$logger = \OC::$server->getLogger(); -$questionHelper = new QuestionHelper(); -$crypt = new \OCA\Encryption\Crypto\Crypt($logger, $userSession, $config, $l); -$util = new \OCA\Encryption\Util($view, $crypt, $logger, $userSession, $config, $userManager); - -$application->add(new MigrateKeys($userManager, $view, $connection, $config, $logger)); -$application->add(new \OCA\Encryption\Command\EnableMasterKey($util, $config, $questionHelper)); diff --git a/apps/encryption/lib/Command/MigrateKeys.php b/apps/encryption/lib/Command/MigrateKeys.php index c3935277661ce..1cdd76795d90a 100644 --- a/apps/encryption/lib/Command/MigrateKeys.php +++ b/apps/encryption/lib/Command/MigrateKeys.php @@ -22,13 +22,13 @@ namespace OCA\Encryption\Command; -use OC\DB\Connection; use OC\Files\View; -use OC\User\Manager; use OCA\Encryption\Migration; use OCP\IConfig; +use OCP\IDBConnection; use OCP\ILogger; use OCP\IUserBackend; +use OCP\IUserManager; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -36,12 +36,11 @@ class MigrateKeys extends Command { - /** @var \OC\User\Manager */ + /** @var IUserManager */ private $userManager; - /** @var View */ private $view; - /** @var \OC\DB\Connection */ + /** @var IDBConnection */ private $connection; /** @var IConfig */ private $config; @@ -49,15 +48,15 @@ class MigrateKeys extends Command { private $logger; /** - * @param Manager $userManager + * @param IUserManager $userManager * @param View $view - * @param Connection $connection + * @param IDBConnection $connection * @param IConfig $config * @param ILogger $logger */ - public function __construct(Manager $userManager, + public function __construct(IUserManager $userManager, View $view, - Connection $connection, + IDBConnection $connection, IConfig $config, ILogger $logger) { diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml index f99ef3b6c49e1..375d660bf621c 100644 --- a/apps/files_external/appinfo/info.xml +++ b/apps/files_external/appinfo/info.xml @@ -29,4 +29,18 @@ OCA\Files_External\Settings\Admin OCA\Files_External\Settings\Section + + + OCA\Files_External\Command\ListCommand + OCA\Files_External\Command\Config + OCA\Files_External\Command\Option + OCA\Files_External\Command\Applicable + OCA\Files_External\Command\Import + OCA\Files_External\Command\Export + OCA\Files_External\Command\Delete + OCA\Files_External\Command\Create + OCA\Files_External\Command\Backends + OCA\Files_External\Command\Verify + OCA\Files_External\Command\Notify + diff --git a/apps/files_external/appinfo/register_command.php b/apps/files_external/appinfo/register_command.php deleted file mode 100644 index 614f0c0a97ab3..0000000000000 --- a/apps/files_external/appinfo/register_command.php +++ /dev/null @@ -1,60 +0,0 @@ - - * @author Robin Appelman - * - * @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 - * - */ - - -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));