Skip to content

Remove Application::registerRoutes() usage #49276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 2 commits into from
Nov 14, 2024
Merged

Remove Application::registerRoutes() usage #49276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
238f518
refactor(files_versions): Remove Application::registerRoutes() usage
provokateurin Nov 14, 2024
c179e78
refactor(user_ldap): Remove Application::registerRoutes() usage
provokateurin Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions apps/files_versions/appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,20 @@

use OCP\Route\IRouter;

/** @var Application $application */
$application = \OC::$server->query(Application::class);
$application->registerRoutes($this, [
'routes' => [
[
'name' => 'Preview#getPreview',
'url' => '/preview',
'verb' => 'GET',
],
],
]);

/** @var IRouter $this */
$this->create('files_versions_download', 'apps/files_versions/download.php')
->actionInclude('files_versions/download.php');
$this->create('files_versions_ajax_getVersions', 'apps/files_versions/ajax/getVersions.php')
->actionInclude('files_versions/ajax/getVersions.php');
$this->create('files_versions_ajax_rollbackVersion', 'apps/files_versions/ajax/rollbackVersion.php')
->actionInclude('files_versions/ajax/rollbackVersion.php');

return [
'routes' => [
[
'name' => 'Preview#getPreview',
'url' => '/preview',
'verb' => 'GET',
],
],
];
17 changes: 4 additions & 13 deletions apps/user_ldap/appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -25,23 +22,17 @@
$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'],
]
]);
],
];
1 change: 0 additions & 1 deletion build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down