From 7870ca06637453f4e72dbd67edbfb3603d813196 Mon Sep 17 00:00:00 2001 From: Morris Jobke <hey@morrisjobke.de> Date: Tue, 21 Jul 2020 14:36:40 +0200 Subject: Use the proper IAppContainer and IServerContainer type hints to know which code runs with which container Signed-off-by: Morris Jobke <hey@morrisjobke.de> --- apps/settings/lib/AppInfo/Application.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'apps/settings/lib/AppInfo') diff --git a/apps/settings/lib/AppInfo/Application.php b/apps/settings/lib/AppInfo/Application.php index 3ea4d6bc080..6e6eb26d011 100644 --- a/apps/settings/lib/AppInfo/Application.php +++ b/apps/settings/lib/AppInfo/Application.php @@ -51,6 +51,7 @@ use OCP\AppFramework\App; use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; +use OCP\AppFramework\IAppContainer; use OCP\Defaults; use OCP\IGroup; use OCP\IGroupManager; @@ -59,7 +60,6 @@ use OCP\IServerContainer; use OCP\IUser; use OCP\Settings\IManager; use OCP\Util; -use Psr\Container\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; @@ -94,30 +94,30 @@ class Application extends App implements IBootstrap { } return $isSubAdmin; }); - $context->registerService('userCertificateManager', function (ContainerInterface $c) { + $context->registerService('userCertificateManager', function (IAppContainer $appContainer) { /** @var IServerContainer $serverContainer */ - $serverContainer = $c->get(IServerContainer::class); + $serverContainer = $appContainer->get(IServerContainer::class); return $serverContainer->getCertificateManager(); }, false); - $context->registerService('systemCertificateManager', function (ContainerInterface $c) { + $context->registerService('systemCertificateManager', function (IAppContainer $appContainer) { /** @var IServerContainer $serverContainer */ - $serverContainer = $c->query('ServerContainer'); + $serverContainer = $appContainer->query('ServerContainer'); return $serverContainer->getCertificateManager(null); }, false); - $context->registerService(IProvider::class, function (ContainerInterface $c) { + $context->registerService(IProvider::class, function (IAppContainer $appContainer) { /** @var IServerContainer $serverContainer */ - $serverContainer = $c->query(IServerContainer::class); + $serverContainer = $appContainer->query(IServerContainer::class); return $serverContainer->query(IProvider::class); }); - $context->registerService(IManager::class, function (ContainerInterface $c) { + $context->registerService(IManager::class, function (IAppContainer $appContainer) { /** @var IServerContainer $serverContainer */ - $serverContainer = $c->query(IServerContainer::class); + $serverContainer = $appContainer->query(IServerContainer::class); return $serverContainer->getSettingsManager(); }); - $context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) { + $context->registerService(NewUserMailHelper::class, function (IAppContainer $appContainer) { /** @var Server $server */ - $server = $c->query(IServerContainer::class); + $server = $appContainer->query(IServerContainer::class); /** @var Defaults $defaults */ $defaults = $server->query(Defaults::class); @@ -136,13 +136,13 @@ class Application extends App implements IBootstrap { } public function boot(IBootContext $context): void { - $context->injectFn(function (EventDispatcherInterface $dispatcher, ContainerInterface $container) { - $dispatcher->addListener('app_password_created', function (GenericEvent $event) use ($container) { + $context->injectFn(function (EventDispatcherInterface $dispatcher, IAppContainer $appContainer) { + $dispatcher->addListener('app_password_created', function (GenericEvent $event) use ($appContainer) { if (($token = $event->getSubject()) instanceof IToken) { /** @var IActivityManager $activityManager */ - $activityManager = $container->get(IActivityManager::class); + $activityManager = $appContainer->get(IActivityManager::class); /** @var ILogger $logger */ - $logger = $container->get(ILogger::class); + $logger = $appContainer->get(ILogger::class); $activity = $activityManager->generateEvent(); $activity->setApp('settings') -- cgit v1.2.3