Skip to content

perf(dav): only create the calendar reminder providers when used #65429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CarlSchwan wants to merge 1 commit into from
Closed

perf(dav): only create the calendar reminder providers when used #65429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions apps/dav/lib/CalDAV/Reminder/NotificationProviderManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@
*/
class NotificationProviderManager {

/** @var INotificationProvider[] */
private $providers = [];
/** @var array<string, class-string<INotificationProvider>> */
private array $providerClasses = [];

/** @var array<string, INotificationProvider> */
private array $providers = [];

/**
* Checks whether a provider for a given ACTION exists
Expand All @@ -31,7 +34,7 @@ class NotificationProviderManager {
*/
public function hasProvider(string $type):bool {
return (\in_array($type, ReminderService::REMINDER_TYPES, true)
&& isset($this->providers[$type]));
&& isset($this->providerClasses[$type]));
}

/**
Expand All @@ -41,30 +44,35 @@ public function hasProvider(string $type):bool {
* @return INotificationProvider
* @throws NotificationProvider\ProviderNotAvailableException
* @throws NotificationTypeDoesNotExistException
* @throws ContainerExceptionInterface
*/
public function getProvider(string $type):INotificationProvider {
if (in_array($type, ReminderService::REMINDER_TYPES, true)) {
if (isset($this->providers[$type])) {
return $this->providers[$type];
if (!isset($this->providerClasses[$type])) {
throw new ProviderNotAvailableException($type);
}
if (!isset($this->providers[$type])) {
$provider = Server::get($this->providerClasses[$type]);
if (!$provider instanceof INotificationProvider) {
throw new \InvalidArgumentException('Invalid notification provider registered');
}
$this->providers[$type] = $provider;
}
throw new ProviderNotAvailableException($type);
return $this->providers[$type];
}
throw new NotificationTypeDoesNotExistException($type);
}

/**
* Registers a new provider
* Registers a new provider, it is only instantiated when it is used
*
* @param string $providerClassName
* @throws ContainerExceptionInterface
* @param class-string<INotificationProvider> $providerClassName
*/
public function registerProvider(string $providerClassName):void {
$provider = Server::get($providerClassName);

if (!$provider instanceof INotificationProvider) {
if (!is_subclass_of($providerClassName, INotificationProvider::class)) {
throw new \InvalidArgumentException('Invalid notification provider registered');
}

$this->providers[$provider::NOTIFICATION_TYPE] = $provider;
$this->providerClasses[$providerClassName::NOTIFICATION_TYPE] = $providerClassName;
}
}
10 changes: 10 additions & 0 deletions apps/dav/tests/unit/CalDAV/Reminder/NotificationProviderManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@ public function testRegisterBadProvider(): void {
$this->providerManager->registerProvider(Capabilities::class);
}

public function testProviderIsCreatedWhenUsed(): void {
$provider = $this->createMock(PushProvider::class);
$this->providerManager->registerProvider(PushProvider::class);
$this->overwriteService(PushProvider::class, $provider);

$this->assertSame($provider, $this->providerManager->getProvider('DISPLAY'));
$this->assertSame($provider, $this->providerManager->getProvider('DISPLAY'));
$this->restoreService(PushProvider::class);
}

public function testHasProvider(): void {
$this->assertTrue($this->providerManager->hasProvider('EMAIL'));
$this->assertFalse($this->providerManager->hasProvider('EMAIL123'));
Expand Down
Loading