From 153337a5becd52e621b1bc948b93889d1df0b77b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 22 Jul 2020 22:28:04 +0200 Subject: [PATCH] Use IBootstrap for the testing app Signed-off-by: Morris Jobke --- apps/testing/appinfo/app.php | 27 ------------------------ apps/testing/lib/AppInfo/Application.php | 23 +++++++++++++------- 2 files changed, 15 insertions(+), 35 deletions(-) delete mode 100644 apps/testing/appinfo/app.php diff --git a/apps/testing/appinfo/app.php b/apps/testing/appinfo/app.php deleted file mode 100644 index e1690b476e..0000000000 --- a/apps/testing/appinfo/app.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @author Vincent Petry - * - * @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 - * - */ - -$app = \OC::$server->query(\OCA\Testing\AppInfo\Application::class); diff --git a/apps/testing/lib/AppInfo/Application.php b/apps/testing/lib/AppInfo/Application.php index f5eb2ef9b3..1df948ec8e 100644 --- a/apps/testing/lib/AppInfo/Application.php +++ b/apps/testing/lib/AppInfo/Application.php @@ -26,20 +26,27 @@ namespace OCA\Testing\AppInfo; use OCA\Testing\AlternativeHomeUserBackend; use OCP\AppFramework\App; +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; -class Application extends App { +class Application extends App implements IBootstrap { public function __construct(array $urlParams = []) { - $appName = 'testing'; - parent::__construct($appName, $urlParams); + parent::__construct('testing', $urlParams); + } - $c = $this->getContainer(); - $config = $c->getServer()->getConfig(); - if ($config->getAppValue($appName, 'enable_alt_user_backend', 'no') === 'yes') { - $userManager = $c->getServer()->getUserManager(); + public function register(IRegistrationContext $context): void { + } + + public function boot(IBootContext $context): void { + $server = $context->getServerContainer(); + $config = $server->getConfig(); + if ($config->getAppValue('testing', 'enable_alt_user_backend', 'no') === 'yes') { + $userManager = $server->getUserManager(); // replace all user backends with this one $userManager->clearBackends(); - $userManager->registerBackend($c->query(AlternativeHomeUserBackend::class)); + $userManager->registerBackend($context->getAppContainer()->get(AlternativeHomeUserBackend::class)); } } }