chore(user_ldap): Adapt code to LDAP constructor change, remove dead code

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

Author: come-nc

apps/user_ldap/lib/Command/Search.php

@@ -8,11 +8,8 @@
 namespace OCA\User_LDAP\Command;
 
 use OCA\User_LDAP\Group_Proxy;
-use OCA\User_LDAP\Helper;
-use OCA\User_LDAP\LDAP;
 use OCA\User_LDAP\User_Proxy;
 use OCP\IConfig;
-use OCP\Server;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -82,10 +79,6 @@ protected function validateOffsetAndLimit(int $offset, int $limit): void {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$helper = Server::get(Helper::class);
-		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-		$ldapWrapper = new LDAP();
-
 		$offset = (int)$input->getOption('offset');
 		$limit = (int)$input->getOption('limit');
 		$this->validateOffsetAndLimit($offset, $limit);

apps/user_ldap/lib/Command/SetConfig.php

@@ -10,14 +10,19 @@
 use OCA\User_LDAP\Configuration;
 use OCA\User_LDAP\ConnectionFactory;
 use OCA\User_LDAP\Helper;
-use OCA\User_LDAP\LDAP;
-use OCP\Server;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Command {
+	public function __construct(
+		private readonly Helper $helper,
+		private readonly ConnectionFactory $connectionFactory,
+	) {
+		parent::__construct();
+	}
+
 	protected function configure(): void {
 		$this
 			->setName('ldap:set-config')
@@ -41,8 +46,7 @@ protected function configure(): void {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$helper = Server::get(Helper::class);
-		$availableConfigs = $helper->getServerConfigurationPrefixes();
+		$availableConfigs = $this->helper->getServerConfigurationPrefixes();
 		$configID = $input->getArgument('configID');
 		if (!in_array($configID, $availableConfigs)) {
 			$output->writeln('Invalid configID');
@@ -65,7 +69,6 @@ protected function setValue(string $configID, string $key, string $value): void
 		$configHolder->$key = $value;
 		$configHolder->saveConfiguration();
 
-		$connectionFactory = new ConnectionFactory(new LDAP());
-		$connectionFactory->get($configID)->clearCache();
+		$this->connectionFactory->get($configID)->clearCache();
 	}
 }

apps/user_ldap/lib/Jobs/Sync.php

@@ -23,8 +23,6 @@ class Sync extends TimedJob {
 	public const MAX_INTERVAL = 12 * 60 * 60; // 12h
 	public const MIN_INTERVAL = 30 * 60; // 30min
 
-	protected LDAP $ldap;
-
 	public function __construct(
 		ITimeFactory $timeFactory,
 		private IConfig $config,
@@ -42,7 +40,6 @@ public function __construct(
 				self::MIN_INTERVAL
 			)
 		);
-		$this->ldap = new LDAP($this->config->getSystemValueString('ldap_log_file'));
 	}
 
 	/**
@@ -253,11 +250,4 @@ protected function getNextPrefix(?string $lastPrefix): ?string {
 		}
 		return $prefixes[$i];
 	}
-
-	/**
-	 * Only used in tests
-	 */
-	public function overwritePropertiesForTest(LDAP $ldapWrapper): void {
-		$this->ldap = $ldapWrapper;
-	}
 }

apps/user_ldap/tests/AccessTest.php

@@ -29,6 +29,7 @@
 use OCP\Image;
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;
+use OCP\Profiler\IProfiler;
 use OCP\Server;
 use OCP\Share\IManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -242,7 +243,11 @@ public function testStringResemblesDN(string $input, array|bool $interResult, bo
 	#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'dnInputDataProvider')]
 	public function testStringResemblesDNLDAPmod(string $input, array|bool $interResult, bool $expectedResult): void {
 		[, $con, $um, $helper] = $this->getConnectorAndLdapMock();
-		$lw = new LDAP();
+		$lw = new LDAP(
+			$this->createMock(IProfiler::class),
+			$this->createMock(IConfig::class),
+			$this->createMock(LoggerInterface::class),
+		);
 		$access = new Access($lw, $con, $um, $helper, $this->ncUserManager, $this->logger, $this->appConfig, $this->dispatcher);
 
 		if (!function_exists('ldap_explode_dn')) {

apps/user_ldap/tests/Jobs/SyncTest.php

@@ -76,8 +76,6 @@ protected function setUp(): void {
 			$this->connectionFactory,
 			$this->accessFactory,
 		);
-
-		$this->sync->overwritePropertiesForTest($this->ldapWrapper);
 	}
 
 	public static function intervalDataProvider(): array {