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

Use IBootstrap for the testing app

2 files changed, 15 insertions, 35 deletions

diff --git a/apps/testing/appinfo/app.php b/apps/testing/appinfo/app.php
deleted file mode 100644
index e1690b476ea..00000000000
--- a/apps/testing/appinfo/app.php
+++ /dev/null
@@ -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);
diff --git a/apps/testing/lib/AppInfo/Application.php b/apps/testing/lib/AppInfo/Application.php
index f5eb2ef9b30..1df948ec8e5 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);
+	}
+
+	public function register(IRegistrationContext $context): void {
+	}
 
-		$c = $this->getContainer();
-		$config = $c->getServer()->getConfig();
-		if ($config->getAppValue($appName, 'enable_alt_user_backend', 'no') === 'yes') {
-			$userManager = $c->getServer()->getUserManager();
+	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));
 		}
 	}
 }