fix(user_ldap): Remove usages of deprecated IServerContainer

Signed-off-by: Côme Chilliet <[email protected]>

Author: come-nc

apps/user_ldap/lib/AppInfo/Application.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
@@ -8,7 +10,6 @@
 
 use Closure;
 use OCA\Files_External\Service\BackendService;
-use OCA\User_LDAP\Controller\RenewPasswordController;
 use OCA\User_LDAP\Events\GroupBackendRegistered;
 use OCA\User_LDAP\Events\UserBackendRegistered;
 use OCA\User_LDAP\Group_Proxy;
@@ -35,10 +36,7 @@
 use OCP\IAvatarManager;
 use OCP\IConfig;
 use OCP\IGroupManager;
-use OCP\IL10N;
 use OCP\Image;
-use OCP\IRequest;
-use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Share\IManager as IShareManager;
@@ -52,32 +50,15 @@ class Application extends App implements IBootstrap {
 
 	public function __construct() {
 		parent::__construct(self::APP_ID);
-		$container = $this->getContainer();
-
-		/**
-		 * Controller
-		 */
-		$container->registerService('RenewPasswordController', function (ContainerInterface $appContainer) {
-			return new RenewPasswordController(
-				$appContainer->get('AppName'),
-				$appContainer->get(IRequest::class),
-				$appContainer->get(IUserManager::class),
-				$appContainer->get(IConfig::class),
-				$appContainer->get(IUserConfig::class),
-				$appContainer->get(IL10N::class),
-				$appContainer->get('Session'),
-				$appContainer->get(IURLGenerator::class),
-			);
-		});
+	}
 
-		$container->registerService(ILDAPWrapper::class, function (ContainerInterface $appContainer) {
+	public function register(IRegistrationContext $context): void {
+		$context->registerService(ILDAPWrapper::class, function (ContainerInterface $c) {
 			return new LDAP(
-				$appContainer->get(IConfig::class)->getSystemValueString('ldap_log_file')
+				$c->get(IConfig::class)->getSystemValueString('ldap_log_file')
 			);
 		});
-	}
 
-	public function register(IRegistrationContext $context): void {
 		$context->registerNotifierService(Notifier::class);
 
 		$context->registerService(

apps/user_ldap/lib/LDAPProvider.php

@@ -5,46 +5,46 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\User_LDAP;
 
 use OCA\User_LDAP\User\DeletedUsersIndex;
-use OCP\IServerContainer;
+use OCP\GroupInterface;
+use OCP\IGroupManager;
+use OCP\IUserManager;
 use OCP\LDAP\IDeletionFlagSupport;
 use OCP\LDAP\ILDAPProvider;
+use OCP\UserInterface;
 use Psr\Log\LoggerInterface;
 
 /**
  * LDAP provider for public access to the LDAP backend.
  */
 class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
-	private $userBackend;
-	private $groupBackend;
-	private $logger;
+	private IUserLDAP&UserInterface $userBackend;
+	private IGroupLDAP&GroupInterface $groupBackend;
 
 	/**
-	 * Create new LDAPProvider
-	 * @param IServerContainer $serverContainer
-	 * @param Helper $helper
-	 * @param DeletedUsersIndex $deletedUsersIndex
 	 * @throws \Exception if user_ldap app was not enabled
 	 */
 	public function __construct(
-		IServerContainer $serverContainer,
+		IUserManager $userManager,
+		IGroupManager $groupManager,
 		private Helper $helper,
 		private DeletedUsersIndex $deletedUsersIndex,
+		private LoggerInterface $logger,
 	) {
-		$this->logger = $serverContainer->get(LoggerInterface::class);
 		$userBackendFound = false;
 		$groupBackendFound = false;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
+		foreach ($userManager->getBackends() as $backend) {
 			$this->logger->debug('instance ' . get_class($backend) . ' user backend.', ['app' => 'user_ldap']);
 			if ($backend instanceof IUserLDAP) {
 				$this->userBackend = $backend;
 				$userBackendFound = true;
 				break;
 			}
 		}
-		foreach ($serverContainer->getGroupManager()->getBackends() as $backend) {
+		foreach ($groupManager->getBackends() as $backend) {
 			$this->logger->debug('instance ' . get_class($backend) . ' group backend.', ['app' => 'user_ldap']);
 			if ($backend instanceof IGroupLDAP) {
 				$this->groupBackend = $backend;

apps/user_ldap/lib/LDAPProviderFactory.php

@@ -1,20 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\User_LDAP;
 
-use OCP\IServerContainer;
 use OCP\LDAP\ILDAPProvider;
 use OCP\LDAP\ILDAPProviderFactory;
+use Psr\Container\ContainerInterface;
 
 class LDAPProviderFactory implements ILDAPProviderFactory {
 	public function __construct(
-		/** * @var IServerContainer */
-		private IServerContainer $serverContainer,
+		private ContainerInterface $serverContainer,
 	) {
 	}