refactor(Application): Use modern SabrePluginAddEvent

Signed-off-by: Carl Schwan <[email protected]>

Author: Carl Schwan

lib/AppInfo/Application.php

@@ -8,6 +8,7 @@
 namespace OCA\Recognize\AppInfo;
 
 use OCA\DAV\Connector\Sabre\Principal;
+use OCA\DAV\Events\SabrePluginAddEvent;
 use OCA\Recognize\Dav\Faces\PropFindPlugin;
 use OCA\Recognize\Hooks\FileListener;
 use OCP\AppFramework\App;
@@ -22,7 +23,6 @@
 use OCP\Files\Events\Node\NodeDeletedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\Events\NodeRemovedFromCache;
-use OCP\SabrePluginEvent;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\Events\ShareDeletedEvent;
 
@@ -68,15 +68,13 @@ public function register(IRegistrationContext $context): void {
 	 */
 	public function boot(IBootContext $context): void {
 		$eventDispatcher = \OCP\Server::get(IEventDispatcher::class);
-		$eventDispatcher->addListener('OCA\DAV\Connector\Sabre::addPlugin', function (SabrePluginEvent $event): void {
+		$eventDispatcher->addListener(SabrePluginAddEvent::class, function (SabrePluginAddEvent $event): void {
 			$server = $event->getServer();
 
-			if ($server !== null) {
-				// We have to register the PropFindPlugin here and not info.xml,
-				// because info.xml plugins are loaded, after the
-				// beforeMethod:* hook has already been emitted.
-				$server->addPlugin($this->getContainer()->get(PropFindPlugin::class));
-			}
+			// We have to register the PropFindPlugin here and not info.xml,
+			// because info.xml plugins are loaded, after the
+			// beforeMethod:* hook has already been emitted.
+			$server->addPlugin($this->getContainer()->get(PropFindPlugin::class));
 		});
 	}
 }

psalm.xml

@@ -12,6 +12,7 @@
 >
     <stubs>
         <file name="tests/stub.phpstub" preloadClasses="true"/>
+		<file name="tests/stubs/oca_dav_events_sabrepluginaddevent.php"/>
     </stubs>
     <projectFiles>
         <directory name="lib" />

tests/stubs/oca_dav_events_sabrepluginaddevent.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\DAV\Events;
+
+use OCP\EventDispatcher\Event;
+use Sabre\DAV\Server;
+
+/**
+ * This event is triggered during the setup of the SabreDAV server to allow the
+ * registration of additional plugins.
+ *
+ * @since 28.0.0
+ */
+class SabrePluginAddEvent extends Event {
+
+	/**
+	 * @since 28.0.0
+	 */
+	public function __construct(
+		private Server $server,
+	) {
+	}
+
+	/**
+	 * @since 28.0.0
+	 */
+	public function getServer(): Server {
+	}
+}