From c179e78aeb7be19e501a8d406b7124ff8c5efb66 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 14 Nov 2024 11:28:45 +0100
Subject: [PATCH] refactor(user_ldap): Remove Application::registerRoutes()
 usage

Signed-off-by: provokateurin <kate@provokateurin.de>
---
 apps/user_ldap/appinfo/routes.php | 17 ++++-------------
 build/psalm-baseline.xml          |  1 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/apps/user_ldap/appinfo/routes.php b/apps/user_ldap/appinfo/routes.php
index fb49c6f54d5..52138060f58 100644
--- a/apps/user_ldap/appinfo/routes.php
+++ b/apps/user_ldap/appinfo/routes.php
@@ -2,9 +2,6 @@
 
 declare(strict_types=1);
 
-use OCA\User_LDAP\AppInfo\Application;
-use OCP\AppFramework\App;
-
 /**
  * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -25,23 +22,17 @@ $this->create('user_ldap_ajax_testConfiguration', 'apps/user_ldap/ajax/testConfi
 $this->create('user_ldap_ajax_wizard', 'apps/user_ldap/ajax/wizard.php')
 	->actionInclude('user_ldap/ajax/wizard.php');
 
-$application = new App('user_ldap');
-$application->registerRoutes($this, [
+return [
 	'ocs' => [
 		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
 		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
 		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
 		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
-	]
-]);
-
-/** @var Application $application */
-$application = \OC::$server->query(Application::class);
-$application->registerRoutes($this, [
+	],
 	'routes' => [
 		['name' => 'renewPassword#tryRenewPassword', 'url' => '/renewpassword', 'verb' => 'POST'],
 		['name' => 'renewPassword#showRenewPasswordForm', 'url' => '/renewpassword/{user}', 'verb' => 'GET'],
 		['name' => 'renewPassword#cancel', 'url' => '/renewpassword/cancel', 'verb' => 'GET'],
 		['name' => 'renewPassword#showLoginFormInvalidPassword', 'url' => '/renewpassword/invalidlogin/{user}', 'verb' => 'GET'],
-	]
-]);
+	],
+];
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 824431c46a5..73445aadd05 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -978,7 +978,6 @@
   </file>
   <file src="apps/files_versions/appinfo/routes.php">
     <InvalidScope>
-      <code><![CDATA[$this]]></code>
       <code><![CDATA[$this->create('files_versions_download', 'apps/files_versions/download.php')]]></code>
     </InvalidScope>
   </file>
-- 
2.39.5