diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/accessibility/lib/AppInfo/Application.php | 17 | ||||
| -rw-r--r-- | apps/admin_audit/lib/AppInfo/Application.php | 8 | ||||
| -rw-r--r-- | apps/dav/lib/AppInfo/Application.php | 36 |
3 files changed, 19 insertions, 42 deletions
diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php index 6d583af07f4..9f596e460e0 100644 --- a/apps/accessibility/lib/AppInfo/Application.php +++ b/apps/accessibility/lib/AppInfo/Application.php @@ -56,16 +56,11 @@ class Application extends App implements IBootstrap { } public function boot(IBootContext $context): void { - $this->injectCss( - $context->getAppContainer()->query(IUserSession::class), - $context->getAppContainer()->query(IConfig::class), - $context->getAppContainer()->query(IURLGenerator::class) - ); - - $this->registerInitialState($context->getAppContainer()); + $context->injectFn([$this, 'injectCss']); + $context->injectFn([$this, 'registerInitialState']); } - private function injectCss(IUserSession $userSession, + public function injectCss(IUserSession $userSession, IConfig $config, IURLGenerator $urlGenerator) { // Inject the fake css on all pages if enabled and user is logged @@ -87,10 +82,8 @@ class Application extends App implements IBootstrap { } } - private function registerInitialState(IAppContainer $container) { - /** @var IInitialStateService $initialState */ - $initialState = $container->query(IInitialStateService::class); - + public function registerInitialState(IInitialStateService $initialState, + IAppContainer $container) { $initialState->provideLazyInitialState(self::APP_ID, 'data', function () use ($container) { /** @var JSDataService $data */ $data = $container->query(JSDataService::class); diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php index dde0605103c..6c79aef84c8 100644 --- a/apps/admin_audit/lib/AppInfo/Application.php +++ b/apps/admin_audit/lib/AppInfo/Application.php @@ -33,6 +33,7 @@ declare(strict_types=1); namespace OCA\AdminAudit\AppInfo; +use Closure; use OC\Files\Filesystem; use OC\Files\Node\File; use OC\Group\Manager; @@ -78,10 +79,9 @@ class Application extends App implements IBootstrap { } public function boot(IBootContext $context): void { - $logger = $this->getLogger( - $context->getAppContainer()->query(IConfig::class), - $context->getAppContainer()->query(ILogger::class), - $context->getAppContainer()->query(ILogFactory::class) + /** @var ILogger $logger */ + $logger = $context->injectFn( + Closure::fromCallable([$this, 'getLogger']) ); /* diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index a0d75f5fe25..083bd8a474f 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -105,30 +105,14 @@ class Application extends App implements IBootstrap { // Load all dav apps \OC_App::loadApps(['dav']); - $this->registerHooks( - $context->getAppContainer()->query(HookManager::class), - $context->getServerContainer()->getEventDispatcher(), - $context->getAppContainer(), - $context->getServerContainer() - ); - $this->registerContactsManager( - $context->getAppContainer()->query(IContactsManager::class), - $context->getAppContainer() - ); - $this->registerCalendarManager( - $context->getAppContainer()->query(ICalendarManager::class), - $context->getAppContainer() - ); - $this->registerNotifier( - $context->getServerContainer()->getNotificationManager() - ); - $this->registerCalendarReminders( - $context->getAppContainer()->query(NotificationProviderManager::class), - $context->getAppContainer()->query(ILogger::class) - ); + $context->injectFn([$this, 'registerHooks']); + $context->injectFn([$this, 'registerContactsManager']); + $context->injectFn([$this, 'registerCalendarManager']); + $context->injectFn([$this, 'registerNotifier']); + $context->injectFn([$this, 'registerCalendarReminders']); } - private function registerHooks(HookManager $hm, + public function registerHooks(HookManager $hm, EventDispatcherInterface $dispatcher, IAppContainer $container, IServerContainer $serverContainer) { @@ -349,7 +333,7 @@ class Application extends App implements IBootstrap { $dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler); } - private function registerContactsManager(IContactsManager $cm, IAppContainer $container): void { + public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void { $cm->register(function () use ($container, $cm): void { $user = \OC::$server->getUserSession()->getUser(); if (!is_null($user)) { @@ -377,7 +361,7 @@ class Application extends App implements IBootstrap { $cm->setupSystemContactsProvider($contactsManager, $urlGenerator); } - private function registerCalendarManager(ICalendarManager $calendarManager, + public function registerCalendarManager(ICalendarManager $calendarManager, IAppContainer $container): void { $calendarManager->register(function () use ($container, $calendarManager) { $user = \OC::$server->getUserSession()->getUser(); @@ -394,11 +378,11 @@ class Application extends App implements IBootstrap { $cm->setupCalendarProvider($calendarManager, $userId); } - private function registerNotifier(INotificationManager $manager): void { + public function registerNotifier(INotificationManager $manager): void { $manager->registerNotifierService(Notifier::class); } - private function registerCalendarReminders(NotificationProviderManager $manager, + public function registerCalendarReminders(NotificationProviderManager $manager, ILogger $logger): void { try { $manager->registerProvider(AudioProvider::class); |