Merge pull request #43194 from nextcloud/fix/fix-psalm-missing-template-parameter

apps/admin_audit/lib/Listener/CriticalActionPerformedEventListener.php

@@ -30,6 +30,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Log\Audit\CriticalActionPerformedEvent;
 
+/** @template-implements IEventListener<CriticalActionPerformedEvent> */
 class CriticalActionPerformedEventListener extends Action implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof CriticalActionPerformedEvent)) {

apps/comments/lib/Listener/CommentsEntityEventListener.php

@@ -30,6 +30,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\IRootFolder;
 
+/** @template-implements IEventListener<CommentsEntityEvent> */
 class CommentsEntityEventListener implements IEventListener {
 	public function __construct(
 		private IRootFolder $rootFolder,

apps/comments/lib/Listener/LoadAdditionalScripts.php

@@ -33,6 +33,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalScripts implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadAdditionalScriptsEvent)) {

apps/comments/lib/Listener/LoadSidebarScripts.php

@@ -35,6 +35,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadSidebar> */
 class LoadSidebarScripts implements IEventListener {
 	public function __construct(
 		private ICommentsManager $commentsManager,

apps/contactsinteraction/lib/Listeners/ContactInteractionListener.php

@@ -40,6 +40,7 @@ use Psr\Log\LoggerInterface;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\UUIDUtil;
 
+/** @template-implements IEventListener<ContactInteractedWithEvent> */
 class ContactInteractionListener implements IEventListener {
 
 	use TTransactional;
@@ -74,7 +75,7 @@ class ContactInteractionListener implements IEventListener {
 			$uid = $event->getUid();
 			$email = $event->getEmail();
 			$federatedCloudId = $event->getFederatedCloudId();
-		
+
 			$existingContact = $this->cardSearchDao->findExisting(
 				$event->getActor(),
 				$uid,

apps/dav/lib/Listener/ActivityUpdaterListener.php

@@ -44,6 +44,7 @@ use Psr\Log\LoggerInterface;
 use Throwable;
 use function sprintf;
 
+/** @template-implements IEventListener<CalendarCreatedEvent|CalendarUpdatedEvent|CalendarMovedToTrashEvent|CalendarRestoredEvent|CalendarDeletedEvent|CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectMovedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent|CalendarObjectDeletedEvent> */
 class ActivityUpdaterListener implements IEventListener {
 
 	/** @var ActivityBackend */

apps/dav/lib/Listener/AddressbookListener.php

@@ -36,6 +36,7 @@ use Psr\Log\LoggerInterface;
 use Throwable;
 use function sprintf;
 
+/** @template-implements IEventListener<AddressBookCreatedEvent|AddressBookUpdatedEvent|AddressBookDeletedEvent|AddressBookShareUpdatedEvent> */
 class AddressbookListener implements IEventListener {
 	/** @var ActivityBackend */
 	private $activityBackend;

apps/dav/lib/Listener/BirthdayListener.php

@@ -32,6 +32,7 @@ use OCA\DAV\Events\CardUpdatedEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<CardCreatedEvent|CardUpdatedEvent|CardDeletedEvent> */
 class BirthdayListener implements IEventListener {
 	private BirthdayService $birthdayService;
 

apps/dav/lib/Listener/CalendarContactInteractionListener.php

@@ -45,6 +45,7 @@ use Throwable;
 use function strlen;
 use function substr;
 
+/** @template-implements IEventListener<CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarShareUpdatedEvent> */
 class CalendarContactInteractionListener implements IEventListener {
 	private const URI_USERS = 'principals/users/';
 

apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php

@@ -33,7 +33,7 @@ use Psr\Log\LoggerInterface;
 use Throwable;
 
 /**
- * @template-implements IEventListener<\OCA\DAV\Events\CalendarDeletedEvent>
+ * @template-implements IEventListener<CalendarDeletedEvent>
  */
 class CalendarDeletionDefaultUpdaterListener implements IEventListener {
 

apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php

@@ -42,6 +42,7 @@ use Psr\Log\LoggerInterface;
 use Throwable;
 use function sprintf;
 
+/** @template-implements IEventListener<CalendarMovedToTrashEvent|CalendarDeletedEvent|CalendarRestoredEvent|CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent|CalendarObjectDeletedEvent> */
 class CalendarObjectReminderUpdaterListener implements IEventListener {
 
 	/** @var ReminderBackend */

apps/dav/lib/Listener/CalendarPublicationListener.php

@@ -32,6 +32,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<CalendarPublishedEvent|CalendarUnpublishedEvent> */
 class CalendarPublicationListener implements IEventListener {
 	private Backend $activityBackend;
 	private LoggerInterface $logger;

apps/dav/lib/Listener/CalendarShareUpdateListener.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<CalendarShareUpdatedEvent> */
 class CalendarShareUpdateListener implements IEventListener {
 	private Backend $activityBackend;
 	private LoggerInterface $logger;

apps/dav/lib/Listener/CardListener.php

@@ -36,6 +36,7 @@ use Psr\Log\LoggerInterface;
 use Throwable;
 use function sprintf;
 
+/** @template-implements IEventListener<CardCreatedEvent|CardUpdatedEvent|CardDeletedEvent> */
 class CardListener implements IEventListener {
 	/** @var ActivityBackend */
 	private $activityBackend;

apps/dav/lib/Listener/ClearPhotoCacheListener.php

@@ -31,6 +31,7 @@ use OCA\DAV\Events\CardUpdatedEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<CardUpdatedEvent|CardDeletedEvent> */
 class ClearPhotoCacheListener implements IEventListener {
 	private PhotoCache $photoCache;
 

apps/dav/lib/Listener/SubscriptionListener.php

@@ -35,6 +35,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<SubscriptionCreatedEvent|SubscriptionDeletedEvent> */
 class SubscriptionListener implements IEventListener {
 	private IJobList $jobList;
 	private RefreshWebcalService $refreshWebcalService;

apps/dav/lib/Listener/TrustedServerRemovedListener.php

@@ -30,6 +30,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Federation\Events\TrustedServerRemovedEvent;
 
+/** @template-implements IEventListener<TrustedServerRemovedEvent> */
 class TrustedServerRemovedListener implements IEventListener {
 	private CardDavBackend $cardDavBackend;
 

apps/dav/lib/Listener/UserPreferenceListener.php

@@ -31,6 +31,7 @@ use OCP\Config\BeforePreferenceSetEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<BeforePreferenceSetEvent|BeforePreferenceDeletedEvent> */
 class UserPreferenceListener implements IEventListener {
 
 	protected IJobList $jobList;

apps/federatedfilesharing/lib/Listeners/LoadAdditionalScriptsListener.php

@@ -30,6 +30,7 @@ use OCA\Files\Event\LoadAdditionalScriptsEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalScriptsListener implements IEventListener {
 	/** @var FederatedShareProvider */
 	protected $federatedShareProvider;

apps/federation/lib/Listener/SabrePluginAuthInitListener.php

@@ -33,6 +33,7 @@ use Sabre\DAV\Auth\Plugin;
 
 /**
  * @since 20.0.0
+ * @template-implements IEventListener<SabrePluginAuthInitEvent>
  */
 class SabrePluginAuthInitListener implements IEventListener {
 	private FedAuth $fedAuth;

apps/files/lib/Listener/LoadSidebarListener.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadSidebar> */
 class LoadSidebarListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadSidebar)) {

apps/files/lib/Listener/RenderReferenceEventListener.php

@@ -28,6 +28,7 @@ use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<RenderReferenceEvent> */
 class RenderReferenceEventListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!$event instanceof RenderReferenceEvent) {

apps/files_external/lib/Listener/GroupDeletedListener.php

@@ -28,6 +28,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Group\Events\GroupDeletedEvent;
 
+/** @template-implements IEventListener<GroupDeletedEvent> */
 class GroupDeletedListener implements IEventListener {
 	/** @var DBConfigService */
 	private $config;

apps/files_external/lib/Listener/LoadAdditionalListener.php

@@ -34,7 +34,7 @@ use OCP\IConfig;
 use OCP\Util;
 
 /**
- * @template-implements IEventListener<Event|LoadAdditionalScriptsEvent>
+ * @template-implements IEventListener<LoadAdditionalScriptsEvent>
  */
 class LoadAdditionalListener implements IEventListener {
 

apps/files_external/lib/Listener/StorePasswordListener.php

@@ -33,6 +33,7 @@ use OCP\Security\ICredentialsManager;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserLoggedInEvent;
 
+/** @template-implements IEventListener<PasswordUpdatedEvent|UserLoggedInEvent> */
 class StorePasswordListener implements IEventListener {
 	/** @var ICredentialsManager */
 	private $credentialsManager;

apps/files_external/lib/Listener/UserDeletedListener.php

@@ -28,6 +28,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<UserDeletedEvent> */
 class UserDeletedListener implements IEventListener {
 	/** @var DBConfigService */
 	private $config;

apps/files_reminders/lib/Listener/LoadAdditionalScriptsListener.php

@@ -33,6 +33,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalScriptsListener implements IEventListener {
 	public function __construct(
 		private IAppManager $appManager,

apps/files_reminders/lib/Listener/NodeDeletedListener.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Events\Node\NodeDeletedEvent;
 
+/** @template-implements IEventListener<NodeDeletedEvent> */
 class NodeDeletedListener implements IEventListener {
 	public function __construct(
 		private ReminderService $reminderService,

apps/files_reminders/lib/Listener/UserDeletedListener.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<UserDeletedEvent> */
 class UserDeletedListener implements IEventListener {
 	public function __construct(
 		private ReminderService $reminderService,

apps/files_sharing/lib/Listener/LoadAdditionalListener.php

@@ -32,6 +32,7 @@ use OCP\EventDispatcher\IEventListener;
 use OCP\Share\IManager;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadAdditionalScriptsEvent)) {

apps/files_sharing/lib/Listener/LoadSidebarListener.php

@@ -35,7 +35,7 @@ use OCP\Share\IManager;
 use OCP\Util;
 
 /**
- * @template-implements IEventListener<Event>
+ * @template-implements IEventListener<LoadSidebar>
  */
 class LoadSidebarListener implements IEventListener {
 

apps/files_sharing/lib/Listener/ShareInteractionListener.php

@@ -36,6 +36,7 @@ use OCP\Share\IShare;
 use Psr\Log\LoggerInterface;
 use function in_array;
 
+/** @template-implements IEventListener<ShareCreatedEvent> */
 class ShareInteractionListener implements IEventListener {
 	private const SUPPORTED_SHARE_TYPES = [
 		IShare::TYPE_USER,

apps/files_sharing/lib/Listener/UserAddedToGroupListener.php

@@ -33,6 +33,7 @@ use OCP\IConfig;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
 
+/** @template-implements IEventListener<UserAddedEvent> */
 class UserAddedToGroupListener implements IEventListener {
 
 	/** @var IManager */

apps/files_sharing/lib/Listener/UserShareAcceptanceListener.php

@@ -36,6 +36,7 @@ use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
 
+/** @template-implements IEventListener<ShareCreatedEvent> */
 class UserShareAcceptanceListener implements IEventListener {
 
 	/** @var IConfig */

apps/files_trashbin/lib/Listeners/LoadAdditionalScripts.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalScripts implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadAdditionalScriptsEvent)) {

apps/files_versions/lib/Listener/FileEventsListener.php

@@ -62,6 +62,7 @@ use OCP\Files\Node;
 use OCP\IUserSession;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<BeforeNodeCopiedEvent|BeforeNodeDeletedEvent|BeforeNodeRenamedEvent|BeforeNodeTouchedEvent|BeforeNodeWrittenEvent|NodeCopiedEvent|NodeCreatedEvent|NodeDeletedEvent|NodeRenamedEvent|NodeTouchedEvent|NodeWrittenEvent> */
 class FileEventsListener implements IEventListener {
 	/**
 	 * @var array<int, array>

apps/files_versions/lib/Listener/LoadAdditionalListener.php

@@ -33,6 +33,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadAdditionalScriptsEvent> */
 class LoadAdditionalListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadAdditionalScriptsEvent)) {

apps/files_versions/lib/Listener/LoadSidebarListener.php

@@ -33,6 +33,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
+/** @template-implements IEventListener<LoadSidebar> */
 class LoadSidebarListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof LoadSidebar)) {

apps/provisioning_api/lib/Listener/UserDeletedListener.php

@@ -30,6 +30,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<UserDeletedEvent> */
 class UserDeletedListener implements IEventListener {
 
 	/** @var KnownUserService */

apps/settings/lib/Listener/GroupRemovedListener.php

@@ -28,6 +28,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Group\Events\GroupDeletedEvent;
 
+/** @template-implements IEventListener<GroupDeletedEvent> */
 class GroupRemovedListener implements IEventListener {
 
 	/** @var AuthorizedGroupService $authorizedGroupService */

apps/settings/lib/Listener/UserAddedToGroupActivityListener.php

@@ -34,6 +34,7 @@ use OCP\Group\Events\UserAddedEvent;
 use OCP\IUser;
 use OCP\IUserSession;
 
+/** @template-implements IEventListener<UserAddedEvent> */
 class UserAddedToGroupActivityListener implements IEventListener {
 
 	/** @var Manager */

apps/settings/lib/Listener/UserRemovedFromGroupActivityListener.php

@@ -34,6 +34,7 @@ use OCP\Group\Events\UserRemovedEvent;
 use OCP\IUser;
 use OCP\IUserSession;
 
+/** @template-implements IEventListener<UserRemovedEvent> */
 class UserRemovedFromGroupActivityListener implements IEventListener {
 
 	/** @var Manager */

apps/theming/lib/Listener/BeforePreferenceListener.php

@@ -32,6 +32,7 @@ use OCP\Config\BeforePreferenceSetEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<BeforePreferenceDeletedEvent|BeforePreferenceSetEvent> */
 class BeforePreferenceListener implements IEventListener {
 	public function __construct(
 		private IAppManager $appManager,

apps/theming/lib/Listener/BeforeTemplateRenderedListener.php

@@ -29,6 +29,7 @@ use OCA\Theming\AppInfo\Application;
 use OCA\Theming\Service\BackgroundService;
 use OCA\Theming\Service\JSDataService;
 use OCA\Theming\Service\ThemeInjectionService;
+use OCP\AppFramework\Http\Events\BeforeLoginTemplateRenderedEvent;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
@@ -38,6 +39,7 @@ use OCP\IConfig;
 use OCP\IUserSession;
 use Psr\Container\ContainerInterface;
 
+/** @template-implements IEventListener<BeforeTemplateRenderedEvent|BeforeLoginTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 
 	private IInitialState $initialState;
@@ -66,7 +68,7 @@ class BeforeTemplateRenderedListener implements IEventListener {
 			fn () => $this->container->get(JSDataService::class),
 		);
 
-		/** @var BeforeTemplateRenderedEvent $event */
+		/** @var BeforeTemplateRenderedEvent|BeforeLoginTemplateRenderedEvent $event */
 		if ($event->getResponse()->getRenderAs() === TemplateResponse::RENDER_AS_USER) {
 			$this->initialState->provideLazyInitialState('shortcutsDisabled', function () {
 				if ($this->userSession->getUser()) {

apps/twofactor_backupcodes/lib/AppInfo/Application.php

@@ -40,7 +40,8 @@ use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\Authentication\TwoFactorAuth\IRegistry;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserRegistered;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserUnregistered;
 use OCP\User\Events\UserDeletedEvent;
 
 class Application extends App implements IBootstrap {
@@ -56,8 +57,8 @@ class Application extends App implements IBootstrap {
 		$context->registerEventListener(CodesGenerated::class, ActivityPublisher::class);
 		$context->registerEventListener(CodesGenerated::class, RegistryUpdater::class);
 		$context->registerEventListener(CodesGenerated::class, ClearNotifications::class);
-		$context->registerEventListener(IRegistry::EVENT_PROVIDER_ENABLED, ProviderEnabled::class);
-		$context->registerEventListener(IRegistry::EVENT_PROVIDER_DISABLED, ProviderDisabled::class);
+		$context->registerEventListener(TwoFactorProviderForUserRegistered::class, ProviderEnabled::class);
+		$context->registerEventListener(TwoFactorProviderForUserUnregistered::class, ProviderDisabled::class);
 		$context->registerEventListener(UserDeletedEvent::class, UserDeleted::class);
 
 

apps/twofactor_backupcodes/lib/Listener/ActivityPublisher.php

@@ -32,6 +32,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<CodesGenerated> */
 class ActivityPublisher implements IEventListener {
 	public function __construct(
 		private IManager $activityManager,

apps/twofactor_backupcodes/lib/Listener/ClearNotifications.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Notification\IManager;
 
+/** @template-implements IEventListener<CodesGenerated> */
 class ClearNotifications implements IEventListener {
 
 	/** @var IManager */

apps/twofactor_backupcodes/lib/Listener/ProviderDisabled.php

@@ -28,11 +28,12 @@ namespace OCA\TwoFactorBackupCodes\Listener;
 
 use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
-use OCP\Authentication\TwoFactorAuth\RegistryEvent;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserUnregistered;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<TwoFactorProviderForUserUnregistered> */
 class ProviderDisabled implements IEventListener {
 
 	/** @var IRegistry */
@@ -48,7 +49,7 @@ class ProviderDisabled implements IEventListener {
 	}
 
 	public function handle(Event $event): void {
-		if (!($event instanceof RegistryEvent)) {
+		if (!($event instanceof TwoFactorProviderForUserUnregistered)) {
 			return;
 		}
 

apps/twofactor_backupcodes/lib/Listener/ProviderEnabled.php

@@ -28,11 +28,12 @@ namespace OCA\TwoFactorBackupCodes\Listener;
 
 use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
-use OCP\Authentication\TwoFactorAuth\RegistryEvent;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserRegistered;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<TwoFactorProviderForUserRegistered> */
 class ProviderEnabled implements IEventListener {
 
 	/** @var IRegistry */
@@ -48,7 +49,7 @@ class ProviderEnabled implements IEventListener {
 	}
 
 	public function handle(Event $event): void {
-		if (!($event instanceof RegistryEvent)) {
+		if (!($event instanceof TwoFactorProviderForUserRegistered)) {
 			return;
 		}
 

apps/twofactor_backupcodes/lib/Listener/RegistryUpdater.php

@@ -31,6 +31,7 @@ use OCP\Authentication\TwoFactorAuth\IRegistry;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<CodesGenerated> */
 class RegistryUpdater implements IEventListener {
 
 	/** @var IRegistry */

apps/twofactor_backupcodes/lib/Listener/UserDeleted.php

@@ -30,6 +30,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<UserDeletedEvent> */
 class UserDeleted implements IEventListener {
 
 	/** @var BackupCodeMapper */

apps/twofactor_backupcodes/tests/Unit/Listener/ProviderDisabledTest.php

@@ -29,22 +29,16 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\Listener;
 use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
 use OCA\TwoFactorBackupCodes\Listener\ProviderDisabled;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
-use OCP\Authentication\TwoFactorAuth\RegistryEvent;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserUnregistered;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\IUser;
 use Test\TestCase;
 
 class ProviderDisabledTest extends TestCase {
-
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	private $registy;
-
-	/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var ProviderDisabled */
-	private $listener;
+	private IRegistry $registy;
+	private IJobList $jobList;
+	private ProviderDisabled $listener;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -67,7 +61,7 @@ class ProviderDisabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserUnregistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 
@@ -88,7 +82,7 @@ class ProviderDisabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserUnregistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 

apps/twofactor_backupcodes/tests/Unit/Listener/ProviderEnabledTest.php

@@ -29,22 +29,16 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\Listener;
 use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
 use OCA\TwoFactorBackupCodes\Listener\ProviderEnabled;
 use OCP\Authentication\TwoFactorAuth\IRegistry;
-use OCP\Authentication\TwoFactorAuth\RegistryEvent;
+use OCP\Authentication\TwoFactorAuth\TwoFactorProviderForUserRegistered;
 use OCP\BackgroundJob\IJobList;
 use OCP\EventDispatcher\Event;
 use OCP\IUser;
 use Test\TestCase;
 
 class ProviderEnabledTest extends TestCase {
-
-	/** @var IRegistry|\PHPUnit\Framework\MockObject\MockObject */
-	private $registy;
-
-	/** @var IJobList|\PHPUnit\Framework\MockObject\MockObject */
-	private $jobList;
-
-	/** @var ProviderEnabled */
-	private $listener;
+	private IRegistry $registy;
+	private IJobList $jobList;
+	private ProviderEnabled $listener;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -67,7 +61,7 @@ class ProviderEnabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserRegistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 
@@ -87,7 +81,7 @@ class ProviderEnabledTest extends TestCase {
 		$user = $this->createMock(IUser::class);
 		$user->method('getUID')
 			->willReturn('myUID');
-		$event = $this->createMock(RegistryEvent::class);
+		$event = $this->createMock(TwoFactorProviderForUserRegistered::class);
 		$event->method('getUser')
 			->willReturn($user);
 

apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php

@@ -37,6 +37,7 @@ use OCP\EventDispatcher\IEventListener;
 use OCP\IInitialStateService;
 use OCP\IUserSession;
 
+/** @template-implements IEventListener<BeforeTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 
 	/** @var ProfileManager */

apps/user_status/lib/Listener/UserDeletedListener.php

@@ -34,6 +34,7 @@ use OCP\User\Events\UserDeletedEvent;
  * Class UserDeletedListener
  *
  * @package OCA\UserStatus\Listener
+ * @template-implements IEventListener<UserDeletedEvent>
  */
 class UserDeletedListener implements IEventListener {
 

apps/user_status/lib/Listener/UserLiveStatusListener.php

@@ -43,6 +43,7 @@ use Psr\Log\LoggerInterface;
  * Class UserDeletedListener
  *
  * @package OCA\UserStatus\Listener
+ * @template-implements IEventListener<UserLiveStatusEvent>
  */
 class UserLiveStatusListener implements IEventListener {
 	private UserStatusMapper $mapper;

apps/workflowengine/lib/Listener/LoadAdditionalSettingsScriptsListener.php

@@ -31,9 +31,11 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Template;
 use OCP\Util;
+use OCP\WorkflowEngine\Events\LoadSettingsScriptsEvent;
 use function class_exists;
 use function function_exists;
 
+/** @template-implements IEventListener<LoadSettingsScriptsEvent> */
 class LoadAdditionalSettingsScriptsListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!function_exists('style')) {

core/Listener/BeforeTemplateRenderedListener.php

@@ -33,6 +33,7 @@ use OCP\EventDispatcher\IEventListener;
 use OCP\IConfig;
 use OCP\Util;
 
+/** @template-implements IEventListener<BeforeLoginTemplateRenderedEvent|BeforeTemplateRenderedEvent> */
 class BeforeTemplateRenderedListener implements IEventListener {
 	public function __construct(private IConfig $config) {
 	}

lib/private/Authentication/Listeners/UserDeletedFilesCleanupListener.php

@@ -34,6 +34,7 @@ use OCP\Files\Storage\IStorage;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<BeforeUserDeletedEvent|UserDeletedEvent> */
 class UserDeletedFilesCleanupListener implements IEventListener {
 	/** @var array<string,IStorage> */
 	private $homeStorageCache = [];

lib/private/Authentication/Listeners/UserDeletedWebAuthnCleanupListener.php

@@ -31,6 +31,7 @@ use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\User\Events\UserDeletedEvent;
 
+/** @template-implements IEventListener<UserDeletedEvent> */
 class UserDeletedWebAuthnCleanupListener implements IEventListener {
 	/** @var PublicKeyCredentialMapper */
 	private $credentialMapper;

lib/private/Group/DisplayNameCache.php

@@ -38,6 +38,7 @@ use OCP\IGroupManager;
  * Class that cache the relation Group ID -> Display name
  *
  * This saves fetching the group from the backend for "just" the display name
+ * @template-implements IEventListener<GroupChangedEvent|GroupDeletedEvent>
  */
 class DisplayNameCache implements IEventListener {
 	private CappedMemoryCache $cache;

lib/private/User/DisplayNameCache.php

@@ -37,6 +37,7 @@ use OCP\User\Events\UserDeletedEvent;
  * This saves fetching the user from a user backend and later on fetching
  * their preferences. It's generally not an issue if this data is slightly
  * outdated.
+ * @template-implements IEventListener<UserChangedEvent|UserDeletedEvent>
  */
 class DisplayNameCache implements IEventListener {
 	private array $cache = [];