Merge pull request #3570 from nextcloud/refactor/rector

Author: provokateurin

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

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

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,
 	) {
 	}
 

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

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 => [

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,
 	) {
 	}
 

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;

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,
 	) {
 	}
 

lib/AppInfo/Application.php

@@ -125,7 +125,6 @@ public function register(IRegistrationContext $context): void {
 				$c->get(FolderManager::class),
 				$c->get(TrashManager::class),
 				$c->get('GroupAppFolder'),
-				$c->get(MountProvider::class),
 				$c->get(ACLManagerFactory::class),
 				$c->get(IRootFolder::class),
 				$c->get(LoggerInterface::class),

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,
 	) {
 	}