sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Apply rector Nextcloud 26 set 

Signed-off-by: provokateurin <kate@provokateurin.de>
pull/55360/head
provokateurin 2025-09-27 19:02:16 +07: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
Unescape Escape View File

@ -250,7 +250,7 @@ SPDX-FileCopyrightText = "2023 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later" SPDX-License-Identifier = "AGPL-3.0-or-later"
[[annotations]] [[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" precedence = "aggregate"
SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors" SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later" SPDX-License-Identifier = "AGPL-3.0-or-later"

4
apps/encryption/lib/Controller/RecoveryController.php
Unescape Escape View File

@ -25,13 +25,13 @@ class RecoveryController extends Controller {
* @param Recovery $recovery * @param Recovery $recovery
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
private IConfig $config, private IConfig $config,
private IL10N $l, private IL10N $l,
private Recovery $recovery, private Recovery $recovery,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
} }
/** /**

4
apps/encryption/lib/Controller/SettingsController.php
Unescape Escape View File

@ -37,7 +37,7 @@ class SettingsController extends Controller {
* @param Util $util * @param Util $util
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
private IL10N $l, private IL10N $l,
private IUserManager $userManager, private IUserManager $userManager,
@ -48,7 +48,7 @@ class SettingsController extends Controller {
private ISession $ocSession, private ISession $ocSession,
private Util $util, private Util $util,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
} }

4
apps/encryption/lib/Controller/StatusController.php
Unescape Escape View File

@ -25,13 +25,13 @@ class StatusController extends Controller {
* @param IManager $encryptionManager * @param IManager $encryptionManager
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
private IL10N $l, private IL10N $l,
private Session $session, private Session $session,
private IManager $encryptionManager, private IManager $encryptionManager,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
} }
/** /**

4
apps/federation/lib/Controller/SettingsController.php
Unescape Escape View File

@ -22,13 +22,13 @@ use Psr\Log\LoggerInterface;
class SettingsController extends OCSController { class SettingsController extends OCSController {
public function __construct( public function __construct(
string $AppName, string $appName,
IRequest $request, IRequest $request,
private IL10N $l, private IL10N $l,
private TrustedServers $trustedServers, private TrustedServers $trustedServers,
private LoggerInterface $logger, private LoggerInterface $logger,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
} }

4
apps/files_external/lib/Controller/GlobalStoragesController.php
Unescape Escape View File

@ -36,7 +36,7 @@ class GlobalStoragesController extends StoragesController {
* @param IConfig $config * @param IConfig $config
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
GlobalStoragesService $globalStoragesService, GlobalStoragesService $globalStoragesService,
@ -46,7 +46,7 @@ class GlobalStoragesController extends StoragesController {
IConfig $config, IConfig $config,
) { ) {
parent::__construct( parent::__construct(
$AppName, $appName,
$request, $request,
$l10n, $l10n,
$globalStoragesService, $globalStoragesService,

4
apps/files_external/lib/Controller/StoragesController.php
Unescape Escape View File

@ -40,7 +40,7 @@ abstract class StoragesController extends Controller {
* @param LoggerInterface $logger * @param LoggerInterface $logger
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
protected IL10N $l10n, protected IL10N $l10n,
protected StoragesService $service, protected StoragesService $service,
@ -49,7 +49,7 @@ abstract class StoragesController extends Controller {
protected IGroupManager $groupManager, protected IGroupManager $groupManager,
protected IConfig $config, protected IConfig $config,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
} }
/** /**

4
apps/files_external/lib/Controller/UserGlobalStoragesController.php
Unescape Escape View File

@ -42,7 +42,7 @@ class UserGlobalStoragesController extends StoragesController {
* @param IGroupManager $groupManager * @param IGroupManager $groupManager
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
UserGlobalStoragesService $userGlobalStoragesService, UserGlobalStoragesService $userGlobalStoragesService,
@ -52,7 +52,7 @@ class UserGlobalStoragesController extends StoragesController {
IConfig $config, IConfig $config,
) { ) {
parent::__construct( parent::__construct(
$AppName, $appName,
$request, $request,
$l10n, $l10n,
$userGlobalStoragesService, $userGlobalStoragesService,

4
apps/files_external/lib/Controller/UserStoragesController.php
Unescape Escape View File

@ -39,7 +39,7 @@ class UserStoragesController extends StoragesController {
* @param IGroupManager $groupManager * @param IGroupManager $groupManager
*/ */
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
UserStoragesService $userStoragesService, UserStoragesService $userStoragesService,
@ -49,7 +49,7 @@ class UserStoragesController extends StoragesController {
IConfig $config, IConfig $config,
) { ) {
parent::__construct( parent::__construct(
$AppName, $appName,
$request, $request,
$l10n, $l10n,
$userStoragesService, $userStoragesService,

4
apps/settings/lib/Controller/AuthorizedGroupController.php
Unescape Escape View File

@ -16,11 +16,11 @@ use OCP\IRequest;
class AuthorizedGroupController extends Controller { class AuthorizedGroupController extends Controller {
public function __construct( public function __construct(
string $AppName, string $appName,
IRequest $request, IRequest $request,
private AuthorizedGroupService $authorizedGroupService, private AuthorizedGroupService $authorizedGroupService,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
} }
/** /**

4
apps/settings/lib/Controller/CheckSetupController.php
Unescape Escape View File

@ -31,7 +31,7 @@ class CheckSetupController extends Controller {
private $checker; private $checker;
public function __construct( public function __construct(
$AppName, $appName,
IRequest $request, IRequest $request,
private IConfig $config, private IConfig $config,
private IURLGenerator $urlGenerator, private IURLGenerator $urlGenerator,
@ -40,7 +40,7 @@ class CheckSetupController extends Controller {
private LoggerInterface $logger, private LoggerInterface $logger,
private ISetupCheckManager $setupCheckManager, private ISetupCheckManager $setupCheckManager,
) { ) {
parent::__construct($AppName, $request); parent::__construct($appName, $request);
$this->checker = $checker; $this->checker = $checker;
} }

4
build/rector.php
Unescape Escape View File

@ -77,6 +77,8 @@ $config = RectorConfig::configure()
$nextcloudDir . '/apps/*/build/stubs/*', $nextcloudDir . '/apps/*/build/stubs/*',
$nextcloudDir . '/apps/*/composer/*', $nextcloudDir . '/apps/*/composer/*',
$nextcloudDir . '/apps/*/config/*', $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 // uncomment to reach your current PHP version
// ->withPhpSets() // ->withPhpSets()
@ -92,7 +94,7 @@ $config = RectorConfig::configure()
'rename_property' => true, 'rename_property' => true,
]) ])
->withSets([ ->withSets([
NextcloudSets::NEXTCLOUD_25, NextcloudSets::NEXTCLOUD_26,
]); ]);
$config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class); $config->registerService(NextcloudNamespaceSkipVoter::class, tag:ClassNameImportSkipVoterInterface::class);

19
tests/lib/AppFramework/Middleware/Mock/UseSessionController.php
Unescape Escape 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
Unescape Escape View File

@ -11,11 +11,11 @@ namespace Test\AppFramework\Middleware;
use OC\AppFramework\Middleware\SessionMiddleware; use OC\AppFramework\Middleware\SessionMiddleware;
use OC\AppFramework\Utility\ControllerMethodReflector; use OC\AppFramework\Utility\ControllerMethodReflector;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\UseSession;
use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\Response;
use OCP\IRequest; use OCP\IRequest;
use OCP\ISession; use OCP\ISession;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use Test\AppFramework\Middleware\Mock\UseSessionController;
use Test\TestCase; use Test\TestCase;
class SessionMiddlewareTest extends TestCase { class SessionMiddlewareTest extends TestCase {
@ -29,18 +29,7 @@ class SessionMiddlewareTest extends TestCase {
$this->reflector = $this->createMock(ControllerMethodReflector::class); $this->reflector = $this->createMock(ControllerMethodReflector::class);
$this->session = $this->createMock(ISession::class); $this->session = $this->createMock(ISession::class);
$this->controller = new class('app', $this->createMock(IRequest::class)) extends Controller { $this->controller = new UseSessionController('app', $this->createMock(IRequest::class));
/**
* @UseSession
*/
public function withAnnotation() {
}
#[UseSession]
public function withAttribute() {
}
public function without() {
}
};
$this->middleware = new SessionMiddleware( $this->middleware = new SessionMiddleware(
$this->reflector, $this->reflector,
$this->session, $this->session,