From d59338b377ba461dd0e04e31b65a519dbb2a51f6 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Sat, 27 Sep 2025 19:02:16 +0200 Subject: [PATCH] refactor: Apply rector Nextcloud 26 set Signed-off-by: provokateurin --- REUSE.toml | 2 +- .../lib/Controller/RecoveryController.php | 4 ++-- .../lib/Controller/SettingsController.php | 4 ++-- .../lib/Controller/StatusController.php | 4 ++-- .../lib/Controller/SettingsController.php | 4 ++-- .../Controller/GlobalStoragesController.php | 4 ++-- .../lib/Controller/StoragesController.php | 4 ++-- .../UserGlobalStoragesController.php | 4 ++-- .../lib/Controller/UserStoragesController.php | 4 ++-- .../Controller/AuthorizedGroupController.php | 4 ++-- .../lib/Controller/CheckSetupController.php | 4 ++-- build/rector.php | 4 +++- .../Middleware/Mock/UseSessionController.php | 19 +++++++++++++++++++ .../Middleware/SessionMiddlewareTest.php | 15 ++------------- 14 files changed, 45 insertions(+), 35 deletions(-) create mode 100644 tests/lib/AppFramework/Middleware/Mock/UseSessionController.php diff --git a/REUSE.toml b/REUSE.toml index 05a49bd80e4..7b2d9acc537 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -250,7 +250,7 @@ SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors" SPDX-License-Identifier = "AGPL-3.0-or-later" [[annotations]] -path = ["apps/dav/lib/ExampleContentFiles/exampleContact.vcf", "tests/data/testvideo-remote-file.mp4"] +path = ["apps/dav/lib/ExampleContentFiles/exampleContact.vcf", "tests/data/testvideo-remote-file.mp4", "tests/lib/AppFramework/Middleware/Mock/UseSessionController.php"] precedence = "aggregate" SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors" SPDX-License-Identifier = "AGPL-3.0-or-later" diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php index d75406e6319..e7fb6bafb67 100644 --- a/apps/encryption/lib/Controller/RecoveryController.php +++ b/apps/encryption/lib/Controller/RecoveryController.php @@ -25,13 +25,13 @@ class RecoveryController extends Controller { * @param Recovery $recovery */ public function __construct( - $AppName, + $appName, IRequest $request, private IConfig $config, private IL10N $l, private Recovery $recovery, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); } /** diff --git a/apps/encryption/lib/Controller/SettingsController.php b/apps/encryption/lib/Controller/SettingsController.php index 8548ea51c04..fd3637e0d79 100644 --- a/apps/encryption/lib/Controller/SettingsController.php +++ b/apps/encryption/lib/Controller/SettingsController.php @@ -37,7 +37,7 @@ class SettingsController extends Controller { * @param Util $util */ public function __construct( - $AppName, + $appName, IRequest $request, private IL10N $l, private IUserManager $userManager, @@ -48,7 +48,7 @@ class SettingsController extends Controller { private ISession $ocSession, private Util $util, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); } diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php index 341ad6bc49f..914432f78a3 100644 --- a/apps/encryption/lib/Controller/StatusController.php +++ b/apps/encryption/lib/Controller/StatusController.php @@ -25,13 +25,13 @@ class StatusController extends Controller { * @param IManager $encryptionManager */ public function __construct( - $AppName, + $appName, IRequest $request, private IL10N $l, private Session $session, private IManager $encryptionManager, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); } /** diff --git a/apps/federation/lib/Controller/SettingsController.php b/apps/federation/lib/Controller/SettingsController.php index 27341eba815..541c821d569 100644 --- a/apps/federation/lib/Controller/SettingsController.php +++ b/apps/federation/lib/Controller/SettingsController.php @@ -22,13 +22,13 @@ use Psr\Log\LoggerInterface; class SettingsController extends OCSController { public function __construct( - string $AppName, + string $appName, IRequest $request, private IL10N $l, private TrustedServers $trustedServers, private LoggerInterface $logger, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); } diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index e7274c9cfb6..0f9326ef464 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -36,7 +36,7 @@ class GlobalStoragesController extends StoragesController { * @param IConfig $config */ public function __construct( - $AppName, + $appName, IRequest $request, IL10N $l10n, GlobalStoragesService $globalStoragesService, @@ -46,7 +46,7 @@ class GlobalStoragesController extends StoragesController { IConfig $config, ) { parent::__construct( - $AppName, + $appName, $request, $l10n, $globalStoragesService, diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php index df3a4528054..cf3fbc2d24f 100644 --- a/apps/files_external/lib/Controller/StoragesController.php +++ b/apps/files_external/lib/Controller/StoragesController.php @@ -40,7 +40,7 @@ abstract class StoragesController extends Controller { * @param LoggerInterface $logger */ public function __construct( - $AppName, + $appName, IRequest $request, protected IL10N $l10n, protected StoragesService $service, @@ -49,7 +49,7 @@ abstract class StoragesController extends Controller { protected IGroupManager $groupManager, protected IConfig $config, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); } /** diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php index 88a9f936401..d1f231a870f 100644 --- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php +++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php @@ -42,7 +42,7 @@ class UserGlobalStoragesController extends StoragesController { * @param IGroupManager $groupManager */ public function __construct( - $AppName, + $appName, IRequest $request, IL10N $l10n, UserGlobalStoragesService $userGlobalStoragesService, @@ -52,7 +52,7 @@ class UserGlobalStoragesController extends StoragesController { IConfig $config, ) { parent::__construct( - $AppName, + $appName, $request, $l10n, $userGlobalStoragesService, diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php index 7b564d57f7e..f724718aaa5 100644 --- a/apps/files_external/lib/Controller/UserStoragesController.php +++ b/apps/files_external/lib/Controller/UserStoragesController.php @@ -39,7 +39,7 @@ class UserStoragesController extends StoragesController { * @param IGroupManager $groupManager */ public function __construct( - $AppName, + $appName, IRequest $request, IL10N $l10n, UserStoragesService $userStoragesService, @@ -49,7 +49,7 @@ class UserStoragesController extends StoragesController { IConfig $config, ) { parent::__construct( - $AppName, + $appName, $request, $l10n, $userStoragesService, diff --git a/apps/settings/lib/Controller/AuthorizedGroupController.php b/apps/settings/lib/Controller/AuthorizedGroupController.php index 82a1ca4703e..9ff0f2cb215 100644 --- a/apps/settings/lib/Controller/AuthorizedGroupController.php +++ b/apps/settings/lib/Controller/AuthorizedGroupController.php @@ -16,11 +16,11 @@ use OCP\IRequest; class AuthorizedGroupController extends Controller { public function __construct( - string $AppName, + string $appName, IRequest $request, private AuthorizedGroupService $authorizedGroupService, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); } /** diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 82a46bea4fb..3335dede58b 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -31,7 +31,7 @@ class CheckSetupController extends Controller { private $checker; public function __construct( - $AppName, + $appName, IRequest $request, private IConfig $config, private IURLGenerator $urlGenerator, @@ -40,7 +40,7 @@ class CheckSetupController extends Controller { private LoggerInterface $logger, private ISetupCheckManager $setupCheckManager, ) { - parent::__construct($AppName, $request); + parent::__construct($appName, $request); $this->checker = $checker; } diff --git a/build/rector.php b/build/rector.php index 246741bb34f..f68810bd1bf 100644 --- a/build/rector.php +++ b/build/rector.php @@ -77,6 +77,8 @@ $config = RectorConfig::configure() $nextcloudDir . '/apps/*/build/stubs/*', $nextcloudDir . '/apps/*/composer/*', $nextcloudDir . '/apps/*/config/*', + // The mock classes are excluded, as the tests explicitly test the annotations which should not be migrated to attributes + $nextcloudDir . '/tests/lib/AppFramework/Middleware/Mock/*', ]) // uncomment to reach your current PHP version // ->withPhpSets() @@ -92,7 +94,7 @@ $config = RectorConfig::configure() 'rename_property' => true, ]) ->withSets([ - NextcloudSets::NEXTCLOUD_25, + NextcloudSets::NEXTCLOUD_26, ]); $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class); diff --git a/tests/lib/AppFramework/Middleware/Mock/UseSessionController.php b/tests/lib/AppFramework/Middleware/Mock/UseSessionController.php new file mode 100644 index 00000000000..d5ee95dfe4c --- /dev/null +++ b/tests/lib/AppFramework/Middleware/Mock/UseSessionController.php @@ -0,0 +1,19 @@ +reflector = $this->createMock(ControllerMethodReflector::class); $this->session = $this->createMock(ISession::class); - $this->controller = new class('app', $this->createMock(IRequest::class)) extends Controller { - /** - * @UseSession - */ - public function withAnnotation() { - } - #[UseSession] - public function withAttribute() { - } - public function without() { - } - }; + $this->controller = new UseSessionController('app', $this->createMock(IRequest::class)); $this->middleware = new SessionMiddleware( $this->reflector, $this->session,