From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 8 Jul 2020 07:41:28 +0000 (+0200)
Subject: Move lookup server connector to bootstrap mechanism
X-Git-Tag: v20.0.0beta1~290^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F21745%2Fhead;p=nextcloud-server.git

Move lookup server connector to bootstrap mechanism

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/apps/lookup_server_connector/appinfo/app.php b/apps/lookup_server_connector/appinfo/app.php
deleted file mode 100644
index 3dcf79df357..00000000000
--- a/apps/lookup_server_connector/appinfo/app.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org>
- *
- * @author Bjoern Schiessle <bjoern@schiessle.org>
- * @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * 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
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-use OCA\LookupServerConnector\AppInfo\Application;
-
-$app = \OC::$server->query(Application::class);
-$app->register();
diff --git a/apps/lookup_server_connector/lib/AppInfo/Application.php b/apps/lookup_server_connector/lib/AppInfo/Application.php
index e318a077d41..c2bb61000c1 100644
--- a/apps/lookup_server_connector/lib/AppInfo/Application.php
+++ b/apps/lookup_server_connector/lib/AppInfo/Application.php
@@ -30,32 +30,33 @@ namespace OCA\LookupServerConnector\AppInfo;
 
 use OCA\LookupServerConnector\UpdateLookupServer;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\IUser;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
-class Application extends App {
+class Application extends App implements IBootstrap {
+	public const APP_ID = 'lookup_server_connector';
+
 	public function __construct() {
-		parent::__construct('lookup_server_connector');
+		parent::__construct(self::APP_ID);
 	}
 
-	/**
-	 * Register the different app parts
-	 */
-	public function register(): void {
-		$this->registerHooksAndEvents();
+	public function register(IRegistrationContext $context): void {
 	}
 
-	/**
-	 * Register the hooks and events
-	 */
-	public function registerHooksAndEvents(): void {
-		$dispatcher = $this->getContainer()->getServer()->getEventDispatcher();
-		$dispatcher->addListener('OC\AccountManager::userUpdated', static function (GenericEvent $event) {
+	public function boot(IBootContext $context): void {
+		/*
+		 * @todo move the OCP events and then move the registration to `register`
+		 */
+		$dispatcher = $context->getServerContainer()->getEventDispatcher();
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($context) {
 			/** @var IUser $user */
 			$user = $event->getSubject();
 
 			/** @var UpdateLookupServer $updateLookupServer */
-			$updateLookupServer = \OC::$server->query(UpdateLookupServer::class);
+			$updateLookupServer = $context->getServerContainer()->query(UpdateLookupServer::class);
 			$updateLookupServer->userUpdated($user);
 		});
 	}