refactor: Apply rector refactorings

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Jan 27, 2025 · 299e374 · 299e374
1 parent 6158d31
commit 299e374
Show file tree

Hide file tree

Showing 52 changed files with 149 additions and 161 deletions.
diff --git a/lib/ACL/ACLCacheWrapper.php b/lib/ACL/ACLCacheWrapper.php
@@ -17,8 +17,8 @@
 class ACLCacheWrapper extends CacheWrapper {
 	public function __construct(
 		ICache $cache,
-		private ACLManager $aclManager,
-		private bool $inShare,
+		private readonly ACLManager $aclManager,
+		private readonly bool $inShare,
 	) {
 		parent::__construct($cache);
 	}

diff --git a/lib/ACL/ACLManager.php b/lib/ACL/ACLManager.php
@@ -17,16 +17,16 @@
 use RuntimeException;
 
 class ACLManager {
-	private CappedMemoryCache $ruleCache;
+	private readonly CappedMemoryCache $ruleCache;
 
 	public function __construct(
-		private RuleManager $ruleManager,
-		private TrashManager $trashManager,
-		private LoggerInterface $logger,
-		private IUser $user,
-		private \Closure $rootFolderProvider,
+		private readonly RuleManager $ruleManager,
+		private readonly TrashManager $trashManager,
+		private readonly LoggerInterface $logger,
+		private readonly IUser $user,
+		private readonly \Closure $rootFolderProvider,
 		private ?int $rootStorageId = null,
-		private bool $inheritMergePerUser = false,
+		private readonly bool $inheritMergePerUser = false,
 	) {
 		$this->ruleCache = new CappedMemoryCache();
 	}

diff --git a/lib/ACL/ACLManagerFactory.php b/lib/ACL/ACLManagerFactory.php
@@ -15,11 +15,11 @@
 
 class ACLManagerFactory {
 	public function __construct(
-		private RuleManager $ruleManager,
-		private TrashManager $trashManager,
-		private IAppConfig $config,
-		private LoggerInterface $logger,
-		private \Closure $rootFolderProvider,
+		private readonly RuleManager $ruleManager,
+		private readonly TrashManager $trashManager,
+		private readonly IAppConfig $config,
+		private readonly LoggerInterface $logger,
+		private readonly \Closure $rootFolderProvider,
 	) {
 	}
 

diff --git a/lib/ACL/ACLStorageWrapper.php b/lib/ACL/ACLStorageWrapper.php
@@ -17,8 +17,8 @@
 use OCP\Files\Storage\IStorage;
 
 class ACLStorageWrapper extends Wrapper implements IConstructableStorage {
-	private ACLManager $aclManager;
-	private bool $inShare;
+	private readonly ACLManager $aclManager;
+	private readonly bool $inShare;
 
 	public function __construct($arguments) {
 		parent::__construct($arguments);

diff --git a/lib/ACL/Rule.php b/lib/ACL/Rule.php
@@ -40,8 +40,8 @@ class Rule implements XmlSerializable, XmlDeserializable, \JsonSerializable {
 	 *                  and one that specifies the permissions to set for non inherited values (1-> allow, 0 -> deny)
 	 */
 	public function __construct(
-		private IUserMapping $userMapping,
-		private int $fileId,
+		private readonly IUserMapping $userMapping,
+		private readonly int $fileId,
 		private int $mask,
 		int $permissions,
 	) {
@@ -86,9 +86,6 @@ public function applyPermissions(int $permissions): int {
 	 * Apply the deny permissions this rule to an existing permission set, returning the resulting permissions
 	 *
 	 * Only the deny permissions included in the current mask will overwrite the existing permissions
-	 *
-	 * @param int $permissions
-	 * @return int
 	 */
 	public function applyDenyPermissions(int $permissions): int {
 		$invertedMask = ~$this->mask;
@@ -98,9 +95,6 @@ public function applyDenyPermissions(int $permissions): int {
 		return $permissions & $denyMask;
 	}
 
-	/**
-	 * @return void
-	 */
 	public function xmlSerialize(Writer $writer): void {
 		$data = [
 			self::ACL => [

diff --git a/lib/ACL/RuleManager.php b/lib/ACL/RuleManager.php
@@ -19,9 +19,9 @@
 
 class RuleManager {
 	public function __construct(
-		private IDBConnection $connection,
-		private IUserMappingManager $userMappingManager,
-		private IEventDispatcher $eventDispatcher,
+		private readonly IDBConnection $connection,
+		private readonly IUserMappingManager $userMappingManager,
+		private readonly IEventDispatcher $eventDispatcher,
 	) {
 	}
 

diff --git a/lib/ACL/UserMapping/UserMapping.php b/lib/ACL/UserMapping/UserMapping.php
@@ -9,14 +9,14 @@
 namespace OCA\GroupFolders\ACL\UserMapping;
 
 class UserMapping implements IUserMapping {
-	private string $displayName;
+	private readonly string $displayName;
 
 	/**
 	 * @param 'user'|'group'|'dummy' $type
 	 */
 	public function __construct(
-		private string $type,
-		private string $id,
+		private readonly string $type,
+		private readonly string $id,
 		?string $displayName = null,
 	) {
 		$this->displayName = $displayName ?? $id;

diff --git a/lib/ACL/UserMapping/UserMappingManager.php b/lib/ACL/UserMapping/UserMappingManager.php
@@ -15,8 +15,8 @@
 
 class UserMappingManager implements IUserMappingManager {
 	public function __construct(
-		private IGroupManager $groupManager,
-		private IUserManager $userManager,
+		private readonly IGroupManager $groupManager,
+		private readonly IUserManager $userManager,
 	) {
 	}
 

diff --git a/lib/AppInfo/Capabilities.php b/lib/AppInfo/Capabilities.php
@@ -15,9 +15,9 @@
 
 class Capabilities implements ICapability {
 	public function __construct(
-		private IUserSession $userSession,
-		private FolderManager $folderManager,
-		private IAppManager $appManager,
+		private readonly IUserSession $userSession,
+		private readonly FolderManager $folderManager,
+		private readonly IAppManager $appManager,
 	) {
 	}
 

diff --git a/lib/AuthorizedAdminSettingMiddleware.php b/lib/AuthorizedAdminSettingMiddleware.php
@@ -21,8 +21,8 @@
 
 class AuthorizedAdminSettingMiddleware extends Middleware {
 	public function __construct(
-		private DelegationService $delegatedService,
-		private IRequest $request,
+		private readonly DelegationService $delegatedService,
+		private readonly IRequest $request,
 	) {
 	}
 

diff --git a/lib/BackgroundJob/ExpireGroupTrash.php b/lib/BackgroundJob/ExpireGroupTrash.php
@@ -16,9 +16,9 @@
 
 class ExpireGroupTrash extends TimedJob {
 	public function __construct(
-		private TrashBackend $trashBackend,
-		private Expiration $expiration,
-		private IAppConfig $config,
+		private readonly TrashBackend $trashBackend,
+		private readonly Expiration $expiration,
+		private readonly IAppConfig $config,
 		ITimeFactory $timeFactory,
 	) {
 		parent::__construct($timeFactory);

diff --git a/lib/BackgroundJob/ExpireGroupVersions.php b/lib/BackgroundJob/ExpireGroupVersions.php
@@ -19,10 +19,10 @@
 class ExpireGroupVersions extends TimedJob {
 	public function __construct(
 		ITimeFactory $time,
-		private GroupVersionsExpireManager $expireManager,
-		private IAppConfig $appConfig,
-		private FolderManager $folderManager,
-		private LoggerInterface $logger,
+		private readonly GroupVersionsExpireManager $expireManager,
+		private readonly IAppConfig $appConfig,
+		private readonly FolderManager $folderManager,
+		private readonly LoggerInterface $logger,
 	) {
 		parent::__construct($time);
 

diff --git a/lib/CacheListener.php b/lib/CacheListener.php
@@ -16,7 +16,7 @@
 
 class CacheListener {
 	public function __construct(
-		private IEventDispatcher $eventDispatcher,
+		private readonly IEventDispatcher $eventDispatcher,
 	) {
 	}
 

diff --git a/lib/Command/ACL.php b/lib/Command/ACL.php
@@ -27,10 +27,10 @@ class ACL extends FolderCommand {
 	public function __construct(
 		FolderManager $folderManager,
 		IRootFolder $rootFolder,
-		private RuleManager $ruleManager,
+		private readonly RuleManager $ruleManager,
 		MountProvider $mountProvider,
-		private ACLManagerFactory $aclManagerFactory,
-		private IUserManager $userManager,
+		private readonly ACLManagerFactory $aclManagerFactory,
+		private readonly IUserManager $userManager,
 	) {
 		parent::__construct($folderManager, $rootFolder, $mountProvider);
 	}
@@ -117,7 +117,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$mappingType = $input->getOption('user') ? 'user' : 'group';
 			$mappingId = $input->getOption('user') ?: $input->getOption('group');
 			$path = $input->getArgument('path');
-			$path = trim($path, '/');
+			$path = trim((string)$path, '/');
 			$permissionStrings = $input->getArgument('permissions');
 
 			$mount = $this->mountProvider->getMount(
@@ -152,7 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					return -3;
 				}
 
-				$name = substr($permission, 1);
+				$name = substr((string)$permission, 1);
 				if (!isset(Rule::PERMISSIONS_MAP[$name])) {
 					$output->writeln('<error>incorrect format for permissions2 "' . $permission . '"</error>');
 					return -3;
@@ -221,7 +221,7 @@ private function parsePermissions(array $permissions): array {
 		$result = 0;
 
 		foreach ($permissions as $permission) {
-			$permissionValue = Rule::PERMISSIONS_MAP[substr($permission, 1)];
+			$permissionValue = Rule::PERMISSIONS_MAP[substr((string)$permission, 1)];
 			$mask |= $permissionValue;
 			if ($permission[0] === '+') {
 				$result |= $permissionValue;

diff --git a/lib/Command/Create.php b/lib/Command/Create.php
@@ -16,7 +16,7 @@
 
 class Create extends Base {
 	public function __construct(
-		private FolderManager $folderManager,
+		private readonly FolderManager $folderManager,
 	) {
 		parent::__construct();
 	}

diff --git a/lib/Command/ExpireGroup/ExpireGroupTrash.php b/lib/Command/ExpireGroup/ExpireGroupTrash.php
@@ -15,8 +15,8 @@
 
 class ExpireGroupTrash extends ExpireGroupBase {
 	public function __construct(
-		private TrashBackend $trashBackend,
-		private Expiration $expiration,
+		private readonly TrashBackend $trashBackend,
+		private readonly Expiration $expiration,
 	) {
 		parent::__construct();
 	}

diff --git a/lib/Command/ExpireGroup/ExpireGroupVersions.php b/lib/Command/ExpireGroup/ExpireGroupVersions.php
@@ -21,8 +21,8 @@
  */
 class ExpireGroupVersions extends ExpireGroupBase {
 	public function __construct(
-		private GroupVersionsExpireManager $expireManager,
-		private IEventDispatcher $eventDispatcher,
+		private readonly GroupVersionsExpireManager $expireManager,
+		private readonly IEventDispatcher $eventDispatcher,
 	) {
 		parent::__construct();
 	}

diff --git a/lib/Command/ExpireGroup/ExpireGroupVersionsTrash.php b/lib/Command/ExpireGroup/ExpireGroupVersionsTrash.php
@@ -19,8 +19,8 @@ class ExpireGroupVersionsTrash extends ExpireGroupVersions {
 	public function __construct(
 		GroupVersionsExpireManager $expireManager,
 		IEventDispatcher $eventDispatcher,
-		private TrashBackend $trashBackend,
-		private Expiration $expiration,
+		private readonly TrashBackend $trashBackend,
+		private readonly Expiration $expiration,
 	) {
 		parent::__construct($expireManager, $eventDispatcher);
 	}

diff --git a/lib/Command/Group.php b/lib/Command/Group.php
@@ -29,7 +29,7 @@ class Group extends FolderCommand {
 	public function __construct(
 		FolderManager $folderManager,
 		IRootFolder $rootFolder,
-		private IGroupManager $groupManager,
+		private readonly IGroupManager $groupManager,
 		MountProvider $mountProvider,
 	) {
 		parent::__construct($folderManager, $rootFolder, $mountProvider);

diff --git a/lib/Command/ListCommand.php b/lib/Command/ListCommand.php
@@ -30,10 +30,10 @@ class ListCommand extends Base {
 
 
 	public function __construct(
-		private FolderManager $folderManager,
-		private IRootFolder $rootFolder,
-		private IGroupManager $groupManager,
-		private IUserManager $userManager,
+		private readonly FolderManager $folderManager,
+		private readonly IRootFolder $rootFolder,
+		private readonly IGroupManager $groupManager,
+		private readonly IUserManager $userManager,
 	) {
 		parent::__construct();
 	}

diff --git a/lib/Command/Quota.php b/lib/Command/Quota.php
@@ -29,7 +29,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return -1;
 		}
 
-		$quotaString = strtolower($input->getArgument('quota'));
+		$quotaString = strtolower((string)$input->getArgument('quota'));
 		$quota = ($quotaString === 'unlimited') ? FileInfo::SPACE_UNLIMITED : \OCP\Util::computerFileSize($quotaString);
 		if ($quota) {
 			$this->folderManager->setFolderQuota($folder['id'], (int)$quota);

diff --git a/lib/Command/Scan.php b/lib/Command/Scan.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$inputPath = $input->getOption('path');
 		if ($inputPath) {
-			$inputPath = '/' . trim($inputPath, '/');
+			$inputPath = '/' . trim((string)$inputPath, '/');
 		} else {
 			$inputPath = '';
 		}

diff --git a/lib/Command/Trashbin/Cleanup.php b/lib/Command/Trashbin/Cleanup.php
@@ -24,7 +24,7 @@ class Cleanup extends Base {
 	private ?TrashBackend $trashBackend = null;
 
 	public function __construct(
-		private FolderManager $folderManager,
+		private readonly FolderManager $folderManager,
 	) {
 		parent::__construct();
 		if (Server::get(IAppManager::class)->isEnabledForUser('files_trashbin')) {

diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php
@@ -35,18 +35,18 @@
  * @psalm-import-type InternalFolderOut from FolderManager
  */
 class FolderController extends OCSController {
-	private ?IUser $user;
+	private readonly ?IUser $user;
 
 	public function __construct(
 		string $AppName,
 		IRequest $request,
-		private FolderManager $manager,
-		private MountProvider $mountProvider,
-		private IRootFolder $rootFolder,
+		private readonly FolderManager $manager,
+		private readonly MountProvider $mountProvider,
+		private readonly IRootFolder $rootFolder,
 		IUserSession $userSession,
-		private FoldersFilter $foldersFilter,
-		private DelegationService $delegationService,
-		private IGroupManager $groupManager,
+		private readonly FoldersFilter $foldersFilter,
+		private readonly DelegationService $delegationService,
+		private readonly IGroupManager $groupManager,
 	) {
 		parent::__construct($AppName, $request);
 		$this->user = $userSession->getUser();

diff --git a/lib/DAV/ACLPlugin.php b/lib/DAV/ACLPlugin.php
@@ -37,10 +37,10 @@ class ACLPlugin extends ServerPlugin {
 	private ?IUser $user = null;
 
 	public function __construct(
-		private RuleManager $ruleManager,
-		private IUserSession $userSession,
-		private FolderManager $folderManager,
-		private IEventDispatcher $eventDispatcher,
+		private readonly RuleManager $ruleManager,
+		private readonly IUserSession $userSession,
+		private readonly FolderManager $folderManager,
+		private readonly IEventDispatcher $eventDispatcher,
 	) {
 	}
 

diff --git a/lib/DAV/GroupFolderNode.php b/lib/DAV/GroupFolderNode.php
@@ -16,7 +16,7 @@ class GroupFolderNode extends Directory {
 	public function __construct(
 		View $view,
 		FileInfo $info,
-		private int $folderId,
+		private readonly int $folderId,
 	) {
 		parent::__construct($view, $info);
 	}

diff --git a/lib/DAV/GroupFoldersHome.php b/lib/DAV/GroupFoldersHome.php
@@ -23,9 +23,9 @@
 class GroupFoldersHome implements ICollection {
 	public function __construct(
 		private array $principalInfo,
-		private FolderManager $folderManager,
-		private IRootFolder $rootFolder,
-		private IUser $user,
+		private readonly FolderManager $folderManager,
+		private readonly IRootFolder $rootFolder,
+		private readonly IUser $user,
 	) {
 	}