upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

refactor: Apply rector Nextcloud 26 set

Browse source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin 2025-09-27 19:02:16 +02:00
parent 6a12fbc4f3
commit d59338b377
No known key found for this signature in database
14 changed files with 45 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
REUSE.toml
View file

@ -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"

4
apps/encryption/lib/Controller/RecoveryController.php
View file

@ -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);
}
/**

4
apps/encryption/lib/Controller/SettingsController.php
View file

@ -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);
}

4
apps/encryption/lib/Controller/StatusController.php
View file

@ -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);
}
/**

4
apps/federation/lib/Controller/SettingsController.php
View file

@ -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);
}

4
apps/files_external/lib/Controller/GlobalStoragesController.php
View file

@ -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,

4
apps/files_external/lib/Controller/StoragesController.php
View file

@ -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);
}
/**

4
apps/files_external/lib/Controller/UserGlobalStoragesController.php
View file

@ -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,

4
apps/files_external/lib/Controller/UserStoragesController.php
View file

@ -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,

4
apps/settings/lib/Controller/AuthorizedGroupController.php
View file

@ -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);
}
/**

4
apps/settings/lib/Controller/CheckSetupController.php
View file

@ -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;
}

4
build/rector.php
View file

@ -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);

19
tests/lib/AppFramework/Middleware/Mock/UseSessionController.php Normal file
View file

@ -0,0 +1,19 @@
<?php
namespace Test\AppFramework\Middleware\Mock;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\UseSession;
class UseSessionController extends Controller {
/**
* @UseSession
*/
public function withAnnotation() {
}
#[UseSession]
public function withAttribute() {
}
public function without() {
}
}

15
tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
View file

@ -11,11 +11,11 @@ namespace Test\AppFramework\Middleware;
use OC\AppFramework\Middleware\SessionMiddleware;
use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\UseSession;
use OCP\AppFramework\Http\Response;
use OCP\IRequest;
use OCP\ISession;
use PHPUnit\Framework\MockObject\MockObject;
use Test\AppFramework\Middleware\Mock\UseSessionController;
use Test\TestCase;
class SessionMiddlewareTest extends TestCase {
@ -29,18 +29,7 @@ class SessionMiddlewareTest extends TestCase {
$this->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,