Merge pull request #21957 from nextcloud/techdebt/noid/bootstrap-testing

Use IBootstrap for the testing app
This commit is contained in:
Julius Härtl 2020-07-23 08:50:25 +02:00 committed by GitHub
commit 8af979f56d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 35 deletions

View File

@ -1,27 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2016, ownCloud GmbH.
*
* @author Joas Schilling <coding@schilljs.com>
* @author Vincent Petry <pvince81@owncloud.com>
*
* @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/>
*
*/
$app = \OC::$server->query(\OCA\Testing\AppInfo\Application::class);

View File

@ -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));
}
}
}