chore: Cleanup application deprecations

Signed-off-by: Julius Knorr <[email protected]>

Author: juliusknorr

lib/AppInfo/Application.php

@@ -14,11 +14,9 @@
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\EventDispatcher\GenericEvent;
-use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Share\Events\BeforeShareCreatedEvent;
+
 /** @phan-suppress-next-line PhanUnreferencedUseNormal */
-use OCP\Share\IShare;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'notes';
@@ -36,29 +34,15 @@ public function register(IRegistrationContext $context): void {
 			BeforeTemplateRenderedEvent::class,
 			BeforeTemplateRenderedListener::class
 		);
-		if (\class_exists(BeforeShareCreatedEvent::class)) {
-			$context->registerEventListener(
-				BeforeShareCreatedEvent::class,
-				BeforeShareCreatedListener::class
-			);
-		} else {
-			// FIXME: Remove once Nextcloud 28 is the minimum supported version
-			\OCP\Server::get(IEventDispatcher::class)->addListener('OCP\Share::preShare', function ($event) {
-				if (!$event instanceof GenericEvent) {
-					return;
-				}
-
-				/** @var IShare $share */
-				/** @phan-suppress-next-line PhanDeprecatedFunction */
-				$share = $event->getSubject();
-
-				$modernListener = \OCP\Server::get(BeforeShareCreatedListener::class);
-				$modernListener->overwriteShareTarget($share);
-			}, 1000);
-		}
+		$context->registerEventListener(
+			BeforeShareCreatedEvent::class,
+			BeforeShareCreatedListener::class
+		);
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->getAppContainer()->get(NotesHooks::class)->register();
+		$context->injectFn(function (NotesHooks $notesHooks) {
+			$notesHooks->register();
+		});
 	}
 }

lib/AppInfo/BeforeShareCreatedListener.php

@@ -18,6 +18,7 @@
 use OCP\Share\IShare;
 use Psr\Log\LoggerInterface;
 
+/** @template-implements IEventListener<BeforeShareCreatedEvent|Event> */
 class BeforeShareCreatedListener implements IEventListener {
 	private SettingsService $settings;
 	private NoteUtil $noteUtil;

lib/AppInfo/BeforeTemplateRenderedListener.php

@@ -13,6 +13,7 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 
+/** @template-implements IEventListener<BeforeTemplateRenderedEvent|Event> */
 class BeforeTemplateRenderedListener implements IEventListener {
 	public function handle(Event $event): void {
 		if (!($event instanceof BeforeTemplateRenderedEvent)) {

tests/psalm-baseline.xml

@@ -1,26 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
-  <file src="lib/AppInfo/Application.php">
-    <DeprecatedInterface>
-      <code><![CDATA[$context->getAppContainer()]]></code>
-    </DeprecatedInterface>
-    <DeprecatedMethod>
-      <code><![CDATA[getSubject]]></code>
-    </DeprecatedMethod>
-  </file>
   <file src="lib/AppInfo/BeforeShareCreatedListener.php">
     <MissingDependency>
       <code><![CDATA[$this->noteUtil->getRoot()]]></code>
       <code><![CDATA[$this->noteUtil->getRoot()]]></code>
     </MissingDependency>
-    <MissingTemplateParam>
-      <code><![CDATA[IEventListener]]></code>
-    </MissingTemplateParam>
-  </file>
-  <file src="lib/AppInfo/BeforeTemplateRenderedListener.php">
-    <MissingTemplateParam>
-      <code><![CDATA[IEventListener]]></code>
-    </MissingTemplateParam>
   </file>
   <file src="lib/AppInfo/NotesHooks.php">
     <MissingDependency>