Fix psalm

Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud · Nov 9, 2023 · 52d0983 · 52d0983
1 parent 084d748
commit 52d0983
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -28,12 +28,12 @@
 use OCA\DAV\Connector\Sabre\Principal;
 use OCA\DAV\Events\SabrePluginAuthInitEvent;
 use OCA\Photos\Listener\AlbumsManagementEventListener;
+use OCA\Photos\Listener\ExifMetadataProvider;
+use OCA\Photos\Listener\OriginalDateTimeMetadataProvider;
+use OCA\Photos\Listener\PlaceMetadataProvider;
 use OCA\Photos\Listener\SabrePluginAuthInitListener;
+use OCA\Photos\Listener\SizeMetadataProvider;
 use OCA\Photos\Listener\TagListener;
-use OCA\Photos\MetadataProvider\ExifMetadataProvider;
-use OCA\Photos\MetadataProvider\OriginalDateTimeMetadataProvider;
-use OCA\Photos\MetadataProvider\PlaceMetadataProvider;
-use OCA\Photos\MetadataProvider\SizeMetadataProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;

diff --git a/lib/Listener/AlbumsManagementEventListener.php b/lib/Listener/AlbumsManagementEventListener.php
@@ -15,6 +15,9 @@
 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/...MetadataProvider/ExifMetadataProvider.php → lib/Listener/ExifMetadataProvider.php b/...MetadataProvider/ExifMetadataProvider.php → 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;
@@ -33,7 +33,7 @@
  * Extract EXIF, IFD0, and GPS data from a picture file.
  * EXIF data reference: https://web.archive.org/web/20220428165430/exif.org/Exif2-2.PDF
  *
- * @template-implements IEventListener
+ * @template-implements IEventListener<MetadataLiveEvent>
  */
 class ExifMetadataProvider implements IEventListener {
 	public function __construct(

diff --git a/...ider/OriginalDateTimeMetadataProvider.php → ...ener/OriginalDateTimeMetadataProvider.php b/...ider/OriginalDateTimeMetadataProvider.php → ...ener/OriginalDateTimeMetadataProvider.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use DateTime;
 use OCA\Photos\AppInfo\Application;
@@ -30,7 +30,7 @@
 use OCP\FilesMetadata\Event\MetadataLiveEvent;
 
 /**
- * @template-implements IEventListener
+ * @template-implements IEventListener<MetadataLiveEvent>
  */
 class OriginalDateTimeMetadataProvider implements IEventListener {
 	public function __construct() {

diff --git a/...etadataProvider/PlaceMetadataProvider.php → lib/Listener/PlaceMetadataProvider.php b/...etadataProvider/PlaceMetadataProvider.php → lib/Listener/PlaceMetadataProvider.php
@@ -20,7 +20,7 @@
  */
 
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use OCA\Photos\AppInfo\Application;
 use OCA\Photos\Service\MediaPlaceManager;
@@ -31,7 +31,7 @@
 use OCP\FilesMetadata\Event\MetadataLiveEvent;
 
 /**
- * @template-implements IEventListener
+ * @template-implements IEventListener<MetadataLiveEvent>
  */
 class PlaceMetadataProvider implements IEventListener {
 	public function __construct(

diff --git a/lib/Listener/SabrePluginAuthInitListener.php b/lib/Listener/SabrePluginAuthInitListener.php
@@ -30,6 +30,9 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/**
+ * @template-implements IEventListener<SabrePluginAuthInitEvent>
+ */
 class SabrePluginAuthInitListener implements IEventListener {
 	private PublicAlbumAuthBackend $publicAlbumAuthBackend;
 

diff --git a/...MetadataProvider/SizeMetadataProvider.php → lib/Listener/SizeMetadataProvider.php b/...MetadataProvider/SizeMetadataProvider.php → lib/Listener/SizeMetadataProvider.php
@@ -20,7 +20,7 @@
  *
  */
 
-namespace OCA\Photos\MetadataProvider;
+namespace OCA\Photos\Listener;
 
 use OCA\Photos\AppInfo\Application;
 use OCP\EventDispatcher\Event;
@@ -30,7 +30,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * @template-implements IEventListener
+ * @template-implements IEventListener<MetadataLiveEvent>
  */
 class SizeMetadataProvider implements IEventListener {
 	public function __construct(

diff --git a/lib/Listener/TagListener.php b/lib/Listener/TagListener.php
@@ -3,13 +3,17 @@
 namespace OCA\Photos\Listener;
 
 use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Config\ICachedMountInfo;
 use OCP\Files\Config\IUserMountCache;
 use OCP\Files\IRootFolder;
 use OCP\ICacheFactory;
 use OCP\SystemTag\MapperEvent;
 
-class TagListener implements \OCP\EventDispatcher\IEventListener {
+/**
+ * @template-implements IEventListener<MapperEvent>
+ */
+class TagListener implements IEventListener {
 	private \OCP\ICache $tagCountsCache;
 	private IRootFolder $rootFolder;
 	private IUserMountCache $userMountCache;