From df814bf7f8a876c7564253d74b9bc913d3522f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 8 Sep 2020 13:11:06 +0200 Subject: [PATCH] Call register functions once the container is ready MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/AppInfo/Application20.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/AppInfo/Application20.php b/lib/AppInfo/Application20.php index 91020d60c..a51012bff 100644 --- a/lib/AppInfo/Application20.php +++ b/lib/AppInfo/Application20.php @@ -59,6 +59,7 @@ use OCP\IServerContainer; use OCP\IUser; use OCP\IUserManager; use OCP\Util; +use Psr\Container\ContainerInterface; class Application20 extends App implements IBootstrap { public const APP_ID = 'deck'; @@ -84,6 +85,12 @@ class Application20 extends App implements IBootstrap { $notificationManager = $context->getServerContainer()->get(\OCP\Notification\IManager::class); $notificationManager->registerNotifierService(Notifier::class); \OCP\Util::addStyle('deck', 'deck'); + + $this->registerUserGroupHooks(); + + $this->registerCommentsEntity(); + $this->registerFullTextSearch(); + $this->registerCollaborationResources(); } public function register(IRegistrationContext $context): void { @@ -95,22 +102,15 @@ class Application20 extends App implements IBootstrap { $context->registerMiddleWare(ExceptionMiddleware::class); $context->registerMiddleWare(DefaultBoardMiddleware::class); - $context->registerService('databaseType', static function (IContainer $c) { + $context->registerService('databaseType', static function (ContainerInterface $c) { return $c->get(IConfig::class)->getSystemValue('dbtype', 'sqlite'); }); - $context->registerService('database4ByteSupport', static function (IContainer $c) { + $context->registerService('database4ByteSupport', static function (ContainerInterface $c) { return $c->get(IDBConnection::class)->supports4ByteText(); }); $context->registerSearchProvider(DeckProvider::class); - $context->registerDashboardWidget(DeckWidget::class); - - $this->registerUserGroupHooks(); - - $this->registerCommentsEntity(); - $this->registerFullTextSearch(); - $this->registerCollaborationResources(); } private function registerUserGroupHooks(): void {