From a6902c17d9c4b903287e65623ebf07a044d6d8a3 Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Thu, 9 Nov 2023 17:39:59 +0100
Subject: [PATCH] Fix psalm

Signed-off-by: Louis Chemineau <louis@chmn.me>
---
 lib/AppInfo/Application.php                    | 2 ++
 lib/Listener/AlbumsManagementEventListener.php | 3 ---
 lib/Listener/CSPListener.php                   | 2 +-
 lib/Listener/ExifMetadataProvider.php          | 2 +-
 lib/Listener/LoadSidebarScripts.php            | 2 +-
 lib/Listener/PlaceMetadataProvider.php         | 2 +-
 tests/stub.phpstub                             | 7 +++++++
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index aaf2f4679..be924c4e1 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -29,7 +29,9 @@
 use OCA\DAV\Events\SabrePluginAuthInitEvent;
 use OCA\Files\Event\LoadSidebar;
 use OCA\Photos\Listener\AlbumsManagementEventListener;
+use OCA\Photos\Listener\CSPListener;
 use OCA\Photos\Listener\ExifMetadataProvider;
+use OCA\Photos\Listener\LoadSidebarScripts;
 use OCA\Photos\Listener\OriginalDateTimeMetadataProvider;
 use OCA\Photos\Listener\PlaceMetadataProvider;
 use OCA\Photos\Listener\SabrePluginAuthInitListener;
diff --git a/lib/Listener/AlbumsManagementEventListener.php b/lib/Listener/AlbumsManagementEventListener.php
index 63b6ce4dc..25c1f87af 100644
--- a/lib/Listener/AlbumsManagementEventListener.php
+++ b/lib/Listener/AlbumsManagementEventListener.php
@@ -15,9 +15,6 @@
 use OCP\User\Events\UserDeletedEvent;
 use Psr\Log\LoggerInterface;
 
-/**
- * @template-implements IEventListener<NodeDeletedEvent|NodeDeletedEvent|UserRemovedEvent|GroupDeletedEvent|UserDeletedEvent|ShareDeletedEvent>
- */
 class AlbumsManagementEventListener implements IEventListener {
 	private AlbumMapper $albumMapper;
 	private LoggerInterface $logger;
diff --git a/lib/Listener/CSPListener.php b/lib/Listener/CSPListener.php
index 67ee6bf2b..d6a3eaea1 100644
--- a/lib/Listener/CSPListener.php
+++ b/lib/Listener/CSPListener.php
@@ -31,7 +31,7 @@
 use OCP\Security\CSP\AddContentSecurityPolicyEvent;
 
 /**
- * @template-implements IEventListener<Event>
+ * @template-implements IEventListener<AddContentSecurityPolicyEvent>
  */
 class CSPListener implements IEventListener {
 
diff --git a/lib/Listener/ExifMetadataProvider.php b/lib/Listener/ExifMetadataProvider.php
index c312d3402..1d82861c1 100644
--- a/lib/Listener/ExifMetadataProvider.php
+++ b/lib/Listener/ExifMetadataProvider.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use OCA\Photos\AppInfo\Application;
 use OCP\EventDispatcher\Event;
diff --git a/lib/Listener/LoadSidebarScripts.php b/lib/Listener/LoadSidebarScripts.php
index be099bf87..853e974a8 100644
--- a/lib/Listener/LoadSidebarScripts.php
+++ b/lib/Listener/LoadSidebarScripts.php
@@ -33,7 +33,7 @@
 use OCP\Util;
 
 /**
- * @template-implements IEventListener<Event>
+ * @template-implements IEventListener<LoadSidebar>
  */
 class LoadSidebarScripts implements IEventListener {
 
diff --git a/lib/Listener/PlaceMetadataProvider.php b/lib/Listener/PlaceMetadataProvider.php
index 8bb3c4a6b..5c6da5802 100644
--- a/lib/Listener/PlaceMetadataProvider.php
+++ b/lib/Listener/PlaceMetadataProvider.php
@@ -31,7 +31,7 @@
 use OCP\FilesMetadata\Event\MetadataLiveEvent;
 
 /**
- * @template-implements IEventListener<MetadataLiveEvent>
+ * @template-implements IEventListener<Event>
  */
 class PlaceMetadataProvider implements IEventListener {
 	public function __construct(
diff --git a/tests/stub.phpstub b/tests/stub.phpstub
index a3b0bab0e..777f1a2f3 100644
--- a/tests/stub.phpstub
+++ b/tests/stub.phpstub
@@ -626,3 +626,10 @@ interface MoveableMount {
 	 */
 	public function removeMount();
 }
+
+namespace OCA\Files\Event;
+
+use OCP\EventDispatcher\Event;
+
+class LoadSidebar extends Event {
+}