From 81c2122ff8214332e2aeca5724b79c565b0979b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Thu, 26 Jan 2023 22:49:48 +0100
Subject: [PATCH] style: Fix php-cs and psalm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 build/psalm-baseline.xml                                     | 5 +++++
 .../Reference/File/FileReferenceEventListener.php            | 5 +++--
 .../Collaboration/Reference/RenderReferenceEventListener.php | 1 +
 .../Reference/ADiscoverableReferenceProvider.php             | 3 +--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index ed7b19eaa7f..c1c39c135f8 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -2015,6 +2015,11 @@
       <code>addServiceListener</code>
     </InvalidArgument>
   </file>
+  <file src="lib/private/Collaboration/Reference/RenderReferenceEventListener.php">
+    <InvalidArgument occurrences="1">
+      <code>addServiceListener</code>
+    </InvalidArgument>
+  </file>
   <file src="lib/private/Command/CallableJob.php">
     <ParamNameMismatch occurrences="1">
       <code>$serializedCallable</code>
diff --git a/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php b/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
index ae50f769665..cb53b496406 100644
--- a/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
+++ b/lib/private/Collaboration/Reference/File/FileReferenceEventListener.php
@@ -27,12 +27,13 @@ namespace OC\Collaboration\Reference\File;
 use OCP\Collaboration\Reference\IReferenceManager;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\EventDispatcher\IEventListener;
 use OCP\Files\Events\Node\NodeDeletedEvent;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\Events\ShareDeletedEvent;
 
-/** @psalm-implements IEventDispatcher<Event|NodeDeletedEvent|ShareDeletedEvent|ShareCreatedEvent> */
-class FileReferenceEventListener implements \OCP\EventDispatcher\IEventListener {
+/** @template-implements IEventListener<Event|NodeDeletedEvent|ShareDeletedEvent|ShareCreatedEvent> */
+class FileReferenceEventListener implements IEventListener {
 	private IReferenceManager $manager;
 
 	public function __construct(IReferenceManager $manager) {
diff --git a/lib/private/Collaboration/Reference/RenderReferenceEventListener.php b/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
index f23aae92afa..dc2c5612666 100644
--- a/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
+++ b/lib/private/Collaboration/Reference/RenderReferenceEventListener.php
@@ -32,6 +32,7 @@ use OCP\EventDispatcher\IEventDispatcher;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IInitialStateService;
 
+/** @template-implements IEventListener<Event|RenderReferenceEvent> */
 class RenderReferenceEventListener implements IEventListener {
 	private IReferenceManager $manager;
 	private IInitialStateService $initialStateService;
diff --git a/lib/public/Collaboration/Reference/ADiscoverableReferenceProvider.php b/lib/public/Collaboration/Reference/ADiscoverableReferenceProvider.php
index 35f72111a4e..9fa6fe691c9 100644
--- a/lib/public/Collaboration/Reference/ADiscoverableReferenceProvider.php
+++ b/lib/public/Collaboration/Reference/ADiscoverableReferenceProvider.php
@@ -30,9 +30,8 @@ use JsonSerializable;
  * @since 26.0.0
  */
 abstract class ADiscoverableReferenceProvider implements IDiscoverableReferenceProvider, JsonSerializable {
-
 	/**
-	 * @inheritDoc
+	 * @since 26.0.0
 	 */
 	public function jsonSerialize(): array {
 		$json = [