chore: Run rector

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

composer.json

@@ -18,7 +18,8 @@
         "psalm": "psalm",
         "psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
         "psalm:update-baseline": "psalm --threads=1 --update-baseline",
-        "test:integration": "cd tests/integration && ./run.sh"
+        "test:integration": "cd tests/integration && ./run.sh",
+		"rector": "rector && composer cs:fix"
     },
     "license": "AGPLv3",
     "authors": [

lib/Command/GroupAdminsToLdap.php

@@ -31,10 +31,10 @@ class GroupAdminsToLdap extends Command {
 	 * GroupAdminsToLdap constructor.
 	 */
 	public function __construct(
-		private SubAdmin $subAdmin,
-		private IConfig $ocConfig,
-		private Helper $helper,
-		private Group_Proxy $groupProxy,
+		private readonly SubAdmin $subAdmin,
+		private readonly IConfig $ocConfig,
+		private readonly Helper $helper,
+		private readonly Group_Proxy $groupProxy,
 	) {
 		parent::__construct();
 	}
@@ -136,7 +136,7 @@ function diff_user_arrays($array1, $array2) {
 			foreach ($onlyInNC as $gid => $users) {
 				$groupDN = $access->getGroupMapper()->getDNByName($gid);
 				if ($groupDN === false) {
-					throw new Exception('Failed to find group '.$gid);
+					throw new Exception('Failed to find group ' . $gid);
 				}
 				foreach ($users as $uid) {
 					$userDN = $access->getUserMapper()->getDNByName($uid);
@@ -155,7 +155,7 @@ function diff_user_arrays($array1, $array2) {
 			foreach ($onlyInLDAP as $gid => $users) {
 				$groupDN = $access->getGroupMapper()->getDNByName($gid);
 				if ($groupDN === false) {
-					throw new Exception('Failed to find group '.$gid);
+					throw new Exception('Failed to find group ' . $gid);
 				}
 				foreach ($users as $uid) {
 					$userDN = $access->getUserMapper()->getDNByName($uid);

lib/LDAPConnect.php

@@ -11,19 +11,20 @@
 namespace OCA\LdapWriteSupport;
 
 use LDAP\Connection;
+use LDAP\Result;
 use OC\ServerNotAvailableException;
 use OCA\LdapWriteSupport\AppInfo\Application;
 use OCA\User_LDAP\Configuration;
 use OCA\User_LDAP\Helper;
 use Psr\Log\LoggerInterface;
 
 class LDAPConnect {
-	private Configuration $ldapConfig;
+	private readonly Configuration $ldapConfig;
 	private ?bool $passwdSupport;
 
 	public function __construct(
 		Helper $ldapBackendHelper,
-		private LoggerInterface $logger,
+		private readonly LoggerInterface $logger,
 	) {
 		$this->passwdSupport = null;
 		$ldapConfigPrefixes = $ldapBackendHelper->getServerConfigurationPrefixes(true);
@@ -144,7 +145,7 @@ public function hasPasswordPolicy(): bool {
 	public function hasPasswdExopSupport(Connection $connection): bool {
 		// TODO: We should cache this by ldap prefix, but currently we have no access to it.
 		if (is_null($this->passwdSupport)) {
-			/** @var \LDAP\Result|false */
+			/** @var Result|false */
 			$ret = ldap_read($connection, '', '(objectclass=*)', ['supportedExtension']);
 			if ($ret === false) {
 				$this->passwdSupport = false;

lib/LDAPGroupManager.php

@@ -20,10 +20,10 @@
 
 class LDAPGroupManager implements ILDAPGroupPlugin {
 	public function __construct(
-		private IGroupManager $groupManager,
-		private LDAPConnect $ldapConnect,
-		private LoggerInterface $logger,
-		private ILDAPProvider $ldapProvider,
+		private readonly IGroupManager $groupManager,
+		private readonly LDAPConnect $ldapConnect,
+		private readonly LoggerInterface $logger,
+		private readonly ILDAPProvider $ldapProvider,
 	) {
 		if ($this->ldapConnect->groupsEnabled()) {
 			$this->makeLdapBackendFirst();

lib/LDAPUserManager.php

@@ -31,15 +31,15 @@
 
 class LDAPUserManager implements ILDAPUserPlugin {
 	public function __construct(
-		private IUserManager $userManager,
-		private IUserSession $userSession,
-		private LDAPConnect $ldapConnect,
-		private ILDAPProvider $ldapProvider,
-		private Configuration $configuration,
-		private IL10N $l10n,
-		private LoggerInterface $logger,
+		private readonly IUserManager $userManager,
+		private readonly IUserSession $userSession,
+		private readonly LDAPConnect $ldapConnect,
+		private readonly ILDAPProvider $ldapProvider,
+		private readonly Configuration $configuration,
+		private readonly IL10N $l10n,
+		private readonly LoggerInterface $logger,
 	) {
-		$this->userManager->listen('\OC\User', 'changeUser', [$this, 'changeUserHook']);
+		$this->userManager->listen('\OC\User', 'changeUser', $this->changeUserHook(...));
 		$this->makeLdapBackendFirst();
 	}
 

lib/Listener/GroupBackendRegisteredListener.php

@@ -20,8 +20,8 @@
  */
 class GroupBackendRegisteredListener implements IEventListener {
 	public function __construct(
-		private IAppManager $appManager,
-		private LDAPGroupManager $ldapGroupManager,
+		private readonly IAppManager $appManager,
+		private readonly LDAPGroupManager $ldapGroupManager,
 	) {
 	}
 

lib/Listener/UserBackendRegisteredListener.php

@@ -20,8 +20,8 @@
  */
 class UserBackendRegisteredListener implements IEventListener {
 	public function __construct(
-		private IAppManager $appManager,
-		private LDAPUserManager $ldapUserManager,
+		private readonly IAppManager $appManager,
+		private readonly LDAPUserManager $ldapUserManager,
 	) {
 	}
 

lib/Service/Configuration.php

@@ -14,7 +14,7 @@
 
 class Configuration {
 	public function __construct(
-		private IConfig $config,
+		private readonly IConfig $config,
 	) {
 	}
 

lib/Settings/Admin.php

@@ -18,8 +18,8 @@
 
 class Admin implements ISettings {
 	public function __construct(
-		private IInitialState $initialStateService,
-		private Configuration $config,
+		private readonly IInitialState $initialStateService,
+		private readonly Configuration $config,
 	) {
 	}