chore: Fix some psalm issues

Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud · Jun 27, 2024 · 46297d5 · 46297d5
1 parent 3504b8e
commit 46297d5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 4 deletions.
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<Event|NodeDeletedEvent|GroupDeletedEvent|ShareDeletedEvent|UserDeletedEvent>
+ */
 class AlbumsManagementEventListener implements IEventListener {
 	private AlbumMapper $albumMapper;
 	private LoggerInterface $logger;

diff --git a/lib/Listener/PlaceManagerEventListener.php b/lib/Listener/PlaceManagerEventListener.php
@@ -35,6 +35,8 @@
 
 /**
  * Listener to add place info from the database.
+ *
+ * @template-implements IEventListener<Event|NodeWrittenEvent>
  */
 class PlaceManagerEventListener 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<Event>
+ */
 class SabrePluginAuthInitListener implements IEventListener {
 	private PublicAlbumAuthBackend $publicAlbumAuthBackend;
 

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<Event>
+ */
+class TagListener implements IEventListener {
 	private \OCP\ICache $tagCountsCache;
 	private IRootFolder $rootFolder;
 	private IUserMountCache $userMountCache;

diff --git a/lib/Sabre/PublicRootCollection.php b/lib/Sabre/PublicRootCollection.php
@@ -80,7 +80,7 @@ public function getChildForPrincipal(array $principalInfo): PublicAlbumRoot {
 	 *
 	 * @return DAV\INode
 	 */
-	public function getChild($token) {
+	public function getChild($name) {
 		$this->throttler->sleepDelayOrThrowOnMax($this->request->getRemoteAddress(), self::BRUTEFORCE_ACTION);
 
 		if (is_null($token)) {

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -16,7 +16,8 @@
   </file>
   <file src="lib/Controller/PageController.php">
     <InvalidArgument occurrences="1">
-      <code>new SearchQuery(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag', $tag-&gt;getName()), 0, 0, [], $user)</code>
+      <code>new SearchQuery(new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'systemtag',
+        $tag-&gt;getName()), 0, 0, [], $user)</code>
     </InvalidArgument>
 
     <UndefinedClass occurrences="12">
@@ -34,10 +35,15 @@
       <code>SearchQuery</code>
     </UndefinedClass>
   </file>
+  <file src="lib/AppInfo/Application.php">
+    <InvalidArgument occurrences="9">
+      <code>registerEventListener</code>
+    </InvalidArgument>
+  </file>
   <file src="lib/Controller/PublicAlbumController.php">
     <UndefinedClass occurrences="2">
       <code>LoadViewer</code>
       <code>LoadViewer</code>
     </UndefinedClass>
   </file>
-</files>
+</files>