Skip to content

Commit 3b251ea

Browse files
provokateurinprovokateurin
authored
Merge pull request #3570 from nextcloud/refactor/rector
2 parents 6158d31 + 6d5c747 commit 3b251ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+194
-157
lines changed

‎lib/ACL/ACLCacheWrapper.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
class ACLCacheWrapper extends CacheWrapper {
1818
public function __construct(
1919
ICache $cache,
20-
private ACLManager $aclManager,
21-
private bool $inShare,
20+
private readonly ACLManager $aclManager,
21+
private readonly bool $inShare,
2222
) {
2323
parent::__construct($cache);
2424
}

‎lib/ACL/ACLManager.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
use RuntimeException;
1818

1919
class ACLManager {
20-
private CappedMemoryCache $ruleCache;
20+
private readonly CappedMemoryCache $ruleCache;
2121

2222
public function __construct(
23-
private RuleManager $ruleManager,
24-
private TrashManager $trashManager,
25-
private LoggerInterface $logger,
26-
private IUser $user,
27-
private \Closure $rootFolderProvider,
23+
private readonly RuleManager $ruleManager,
24+
private readonly TrashManager $trashManager,
25+
private readonly LoggerInterface $logger,
26+
private readonly IUser $user,
27+
private readonly \Closure $rootFolderProvider,
2828
private ?int $rootStorageId = null,
29-
private bool $inheritMergePerUser = false,
29+
private readonly bool $inheritMergePerUser = false,
3030
) {
3131
$this->ruleCache = new CappedMemoryCache();
3232
}

‎lib/ACL/ACLManagerFactory.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
class ACLManagerFactory {
1717
public function __construct(
18-
private RuleManager $ruleManager,
19-
private TrashManager $trashManager,
20-
private IAppConfig $config,
21-
private LoggerInterface $logger,
22-
private \Closure $rootFolderProvider,
18+
private readonly RuleManager $ruleManager,
19+
private readonly TrashManager $trashManager,
20+
private readonly IAppConfig $config,
21+
private readonly LoggerInterface $logger,
22+
private readonly \Closure $rootFolderProvider,
2323
) {
2424
}
2525

‎lib/ACL/ACLStorageWrapper.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
use OCP\Files\Storage\IStorage;
1818

1919
class ACLStorageWrapper extends Wrapper implements IConstructableStorage {
20-
private ACLManager $aclManager;
21-
private bool $inShare;
20+
private readonly ACLManager $aclManager;
21+
private readonly bool $inShare;
2222

2323
public function __construct($arguments) {
2424
parent::__construct($arguments);

‎lib/ACL/Rule.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class Rule implements XmlSerializable, XmlDeserializable, \JsonSerializable {
4040
* and one that specifies the permissions to set for non inherited values (1-> allow, 0 -> deny)
4141
*/
4242
public function __construct(
43-
private IUserMapping $userMapping,
44-
private int $fileId,
43+
private readonly IUserMapping $userMapping,
44+
private readonly int $fileId,
4545
private int $mask,
4646
int $permissions,
4747
) {
@@ -86,9 +86,6 @@ public function applyPermissions(int $permissions): int {
8686
* Apply the deny permissions this rule to an existing permission set, returning the resulting permissions
8787
*
8888
* Only the deny permissions included in the current mask will overwrite the existing permissions
89-
*
90-
* @param int $permissions
91-
* @return int
9289
*/
9390
public function applyDenyPermissions(int $permissions): int {
9491
$invertedMask = ~$this->mask;
@@ -98,9 +95,6 @@ public function applyDenyPermissions(int $permissions): int {
9895
return $permissions & $denyMask;
9996
}
10097

101-
/**
102-
* @return void
103-
*/
10498
public function xmlSerialize(Writer $writer): void {
10599
$data = [
106100
self::ACL => [

‎lib/ACL/RuleManager.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
class RuleManager {
2121
public function __construct(
22-
private IDBConnection $connection,
23-
private IUserMappingManager $userMappingManager,
24-
private IEventDispatcher $eventDispatcher,
22+
private readonly IDBConnection $connection,
23+
private readonly IUserMappingManager $userMappingManager,
24+
private readonly IEventDispatcher $eventDispatcher,
2525
) {
2626
}
2727

‎lib/ACL/UserMapping/UserMapping.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
namespace OCA\GroupFolders\ACL\UserMapping;
1010

1111
class UserMapping implements IUserMapping {
12-
private string $displayName;
12+
private readonly string $displayName;
1313

1414
/**
1515
* @param 'user'|'group'|'dummy' $type
1616
*/
1717
public function __construct(
18-
private string $type,
19-
private string $id,
18+
private readonly string $type,
19+
private readonly string $id,
2020
?string $displayName = null,
2121
) {
2222
$this->displayName = $displayName ?? $id;

‎lib/ACL/UserMapping/UserMappingManager.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
class UserMappingManager implements IUserMappingManager {
1717
public function __construct(
18-
private IGroupManager $groupManager,
19-
private IUserManager $userManager,
18+
private readonly IGroupManager $groupManager,
19+
private readonly IUserManager $userManager,
2020
) {
2121
}
2222

‎lib/AppInfo/Application.php

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public function register(IRegistrationContext $context): void {
125125
$c->get(FolderManager::class),
126126
$c->get(TrashManager::class),
127127
$c->get('GroupAppFolder'),
128-
$c->get(MountProvider::class),
129128
$c->get(ACLManagerFactory::class),
130129
$c->get(IRootFolder::class),
131130
$c->get(LoggerInterface::class),

‎lib/AppInfo/Capabilities.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
class Capabilities implements ICapability {
1717
public function __construct(
18-
private IUserSession $userSession,
19-
private FolderManager $folderManager,
20-
private IAppManager $appManager,
18+
private readonly IUserSession $userSession,
19+
private readonly FolderManager $folderManager,
20+
private readonly IAppManager $appManager,
2121
) {
2222
}
2323

‎lib/AuthorizedAdminSettingMiddleware.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
class AuthorizedAdminSettingMiddleware extends Middleware {
2323
public function __construct(
24-
private DelegationService $delegatedService,
25-
private IRequest $request,
24+
private readonly DelegationService $delegatedService,
25+
private readonly IRequest $request,
2626
) {
2727
}
2828

‎lib/BackgroundJob/ExpireGroupTrash.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
class ExpireGroupTrash extends TimedJob {
1818
public function __construct(
19-
private TrashBackend $trashBackend,
20-
private Expiration $expiration,
21-
private IAppConfig $config,
19+
private readonly TrashBackend $trashBackend,
20+
private readonly Expiration $expiration,
21+
private readonly IAppConfig $config,
2222
ITimeFactory $timeFactory,
2323
) {
2424
parent::__construct($timeFactory);

‎lib/BackgroundJob/ExpireGroupVersions.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
class ExpireGroupVersions extends TimedJob {
2020
public function __construct(
2121
ITimeFactory $time,
22-
private GroupVersionsExpireManager $expireManager,
23-
private IAppConfig $appConfig,
24-
private FolderManager $folderManager,
25-
private LoggerInterface $logger,
22+
private readonly GroupVersionsExpireManager $expireManager,
23+
private readonly IAppConfig $appConfig,
24+
private readonly FolderManager $folderManager,
25+
private readonly LoggerInterface $logger,
2626
) {
2727
parent::__construct($time);
2828

‎lib/CacheListener.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class CacheListener {
1818
public function __construct(
19-
private IEventDispatcher $eventDispatcher,
19+
private readonly IEventDispatcher $eventDispatcher,
2020
) {
2121
}
2222

‎lib/Command/ACL.php

+19-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ class ACL extends FolderCommand {
2727
public function __construct(
2828
FolderManager $folderManager,
2929
IRootFolder $rootFolder,
30-
private RuleManager $ruleManager,
30+
private readonly RuleManager $ruleManager,
3131
MountProvider $mountProvider,
32-
private ACLManagerFactory $aclManagerFactory,
33-
private IUserManager $userManager,
32+
private readonly ACLManagerFactory $aclManagerFactory,
33+
private readonly IUserManager $userManager,
3434
) {
3535
parent::__construct($folderManager, $rootFolder, $mountProvider);
3636
}
@@ -117,8 +117,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
117117
$mappingType = $input->getOption('user') ? 'user' : 'group';
118118
$mappingId = $input->getOption('user') ?: $input->getOption('group');
119119
$path = $input->getArgument('path');
120+
if (!is_string($path)) {
121+
$output->writeln('<error><path> argument has to be a string</error>');
122+
return -3;
123+
}
120124
$path = trim($path, '/');
121125
$permissionStrings = $input->getArgument('permissions');
126+
if (!is_array($permissionStrings)) {
127+
$output->writeln('<error><permissions> argument has to be an array</error>');
128+
return -3;
129+
}
122130

123131
$mount = $this->mountProvider->getMount(
124132
$folder['id'],
@@ -147,6 +155,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
147155
}
148156

149157
foreach ($permissionStrings as $permission) {
158+
if (!is_string($permission)) {
159+
$output->writeln('<error><permissions> argument has to be an array of strings</error>');
160+
return -3;
161+
}
162+
150163
if ($permission[0] !== '+' && $permission[0] !== '-') {
151164
$output->writeln('<error>incorrect format for permissions "' . $permission . '"</error>');
152165
return -3;
@@ -216,6 +229,9 @@ private function printPermissions(InputInterface $input, OutputInterface $output
216229
}
217230
}
218231

232+
/**
233+
* @param list<string> $permissions
234+
*/
219235
private function parsePermissions(array $permissions): array {
220236
$mask = 0;
221237
$result = 0;

‎lib/Command/Create.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class Create extends Base {
1818
public function __construct(
19-
private FolderManager $folderManager,
19+
private readonly FolderManager $folderManager,
2020
) {
2121
parent::__construct();
2222
}

‎lib/Command/ExpireGroup/ExpireGroupTrash.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
class ExpireGroupTrash extends ExpireGroupBase {
1717
public function __construct(
18-
private TrashBackend $trashBackend,
19-
private Expiration $expiration,
18+
private readonly TrashBackend $trashBackend,
19+
private readonly Expiration $expiration,
2020
) {
2121
parent::__construct();
2222
}

‎lib/Command/ExpireGroup/ExpireGroupVersions.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*/
2222
class ExpireGroupVersions extends ExpireGroupBase {
2323
public function __construct(
24-
private GroupVersionsExpireManager $expireManager,
25-
private IEventDispatcher $eventDispatcher,
24+
private readonly GroupVersionsExpireManager $expireManager,
25+
private readonly IEventDispatcher $eventDispatcher,
2626
) {
2727
parent::__construct();
2828
}

‎lib/Command/ExpireGroup/ExpireGroupVersionsTrash.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class ExpireGroupVersionsTrash extends ExpireGroupVersions {
1919
public function __construct(
2020
GroupVersionsExpireManager $expireManager,
2121
IEventDispatcher $eventDispatcher,
22-
private TrashBackend $trashBackend,
23-
private Expiration $expiration,
22+
private readonly TrashBackend $trashBackend,
23+
private readonly Expiration $expiration,
2424
) {
2525
parent::__construct($expireManager, $eventDispatcher);
2626
}

‎lib/Command/Group.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Group extends FolderCommand {
2929
public function __construct(
3030
FolderManager $folderManager,
3131
IRootFolder $rootFolder,
32-
private IGroupManager $groupManager,
32+
private readonly IGroupManager $groupManager,
3333
MountProvider $mountProvider,
3434
) {
3535
parent::__construct($folderManager, $rootFolder, $mountProvider);

‎lib/Command/ListCommand.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class ListCommand extends Base {
3030

3131

3232
public function __construct(
33-
private FolderManager $folderManager,
34-
private IRootFolder $rootFolder,
35-
private IGroupManager $groupManager,
36-
private IUserManager $userManager,
33+
private readonly FolderManager $folderManager,
34+
private readonly IRootFolder $rootFolder,
35+
private readonly IGroupManager $groupManager,
36+
private readonly IUserManager $userManager,
3737
) {
3838
parent::__construct();
3939
}

‎lib/Command/Quota.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
2929
return -1;
3030
}
3131

32-
$quotaString = strtolower($input->getArgument('quota'));
32+
$quotaString = $input->getArgument('quota');
33+
if (!is_string($quotaString)) {
34+
$output->writeln('<error><quota> argument has to be a string</error>');
35+
return -3;
36+
}
37+
38+
$quotaString = strtolower($quotaString);
3339
$quota = ($quotaString === 'unlimited') ? FileInfo::SPACE_UNLIMITED : \OCP\Util::computerFileSize($quotaString);
3440
if ($quota) {
3541
$this->folderManager->setFolderQuota($folder['id'], (int)$quota);

‎lib/Command/Scan.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7171
}
7272

7373
$inputPath = $input->getOption('path');
74-
if ($inputPath) {
74+
if ($inputPath !== null) {
75+
if (!is_string($inputPath)) {
76+
$output->writeln('<error><path> option has to be a string</error>');
77+
return -3;
78+
}
79+
7580
$inputPath = '/' . trim($inputPath, '/');
7681
} else {
7782
$inputPath = '';

‎lib/Command/Trashbin/Cleanup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Cleanup extends Base {
2424
private ?TrashBackend $trashBackend = null;
2525

2626
public function __construct(
27-
private FolderManager $folderManager,
27+
private readonly FolderManager $folderManager,
2828
) {
2929
parent::__construct();
3030
if (Server::get(IAppManager::class)->isEnabledForUser('files_trashbin')) {

‎lib/Controller/FolderController.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
* @psalm-import-type InternalFolderOut from FolderManager
3636
*/
3737
class FolderController extends OCSController {
38-
private ?IUser $user;
38+
private readonly ?IUser $user;
3939

4040
public function __construct(
4141
string $AppName,
4242
IRequest $request,
43-
private FolderManager $manager,
44-
private MountProvider $mountProvider,
45-
private IRootFolder $rootFolder,
43+
private readonly FolderManager $manager,
44+
private readonly MountProvider $mountProvider,
45+
private readonly IRootFolder $rootFolder,
4646
IUserSession $userSession,
47-
private FoldersFilter $foldersFilter,
48-
private DelegationService $delegationService,
49-
private IGroupManager $groupManager,
47+
private readonly FoldersFilter $foldersFilter,
48+
private readonly DelegationService $delegationService,
49+
private readonly IGroupManager $groupManager,
5050
) {
5151
parent::__construct($AppName, $request);
5252
$this->user = $userSession->getUser();

0 commit comments

Comments
 (0)