Cleanup user backends related methods

apps/federatedfilesharing/tests/TestCase.php

@@ -29,12 +29,12 @@ public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 
 		// reset backend
-		\OC_User::clearBackends();
+		Server::get(IUserManager::class)->clearBackends();
 		Server::get(IGroupManager::class)->clearBackends();
 
 		// create users
 		$backend = new \Test\Util\User\Dummy();
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);
 	}
@@ -62,8 +62,8 @@ public static function tearDownAfterClass(): void {
 		Filesystem::tearDown();
 
 		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
+		Server::get(IUserManager::class)->clearBackends();
+		Server::get(IUserManager::class)->registerBackend(new \OC\User\Database());
 		Server::get(IGroupManager::class)->clearBackends();
 		Server::get(IGroupManager::class)->addBackend(new Database());
 

apps/files_sharing/tests/TestCase.php

@@ -71,7 +71,7 @@ public static function setUpBeforeClass(): void {
 		);
 
 		// reset backend
-		\OC_User::clearBackends();
+		Server::get(IUserManager::class)->clearBackends();
 		Server::get(IGroupManager::class)->clearBackends();
 
 		// clear share hooks
@@ -80,7 +80,7 @@ public static function setUpBeforeClass(): void {
 
 		// create users
 		$backend = new \Test\Util\User\Dummy();
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER3, self::TEST_FILES_SHARING_API_USER3);
@@ -160,8 +160,8 @@ public static function tearDownAfterClass(): void {
 		Filesystem::tearDown();
 
 		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
+		Server::get(IUserManager::class)->clearBackends();
+		Server::get(IUserManager::class)->registerBackend(new \OC\User\Database());
 		Server::get(IGroupManager::class)->clearBackends();
 		Server::get(IGroupManager::class)->addBackend(new Database());
 

apps/files_trashbin/tests/TrashbinTest.php

@@ -58,8 +58,8 @@ public static function setUpBeforeClass(): void {
 		self::$trashBinStatus = $appManager->isEnabledForUser('files_trashbin');
 
 		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
+		Server::get(IUserManager::class)->clearBackends();
+		Server::get(IUserManager::class)->registerBackend(new \OC\User\Database());
 
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');

apps/user_ldap/lib/AppInfo/Application.php

@@ -105,6 +105,7 @@ public function boot(IBootContext $context): void {
 			INotificationManager $notificationManager,
 			IAppContainer $appContainer,
 			IEventDispatcher $dispatcher,
+			IUserManager $userManager,
 			IGroupManager $groupManager,
 			User_Proxy $userBackend,
 			Group_Proxy $groupBackend,
@@ -115,7 +116,7 @@ public function boot(IBootContext $context): void {
 				$userPluginManager = $appContainer->get(UserPluginManager::class);
 				$groupPluginManager = $appContainer->get(GroupPluginManager::class);
 
-				\OC_User::useBackend($userBackend);
+				$userManager->registerBackend($userBackend);
 				$groupManager->addBackend($groupBackend);
 
 				$userBackendRegisteredEvent = new UserBackendRegistered($userBackend, $userPluginManager);

apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserAvatar.php

@@ -39,7 +39,7 @@ public function init() {
 		$this->mapping->clear();
 		$this->access->setUserMapper($this->mapping);
 		$userBackend = new User_LDAP($this->access, Server::get(\OCP\Notification\IManager::class), Server::get(UserPluginManager::class), Server::get(LoggerInterface::class), Server::get(DeletedUsersIndex::class));
-		\OC_User::useBackend($userBackend);
+		Server::get(IUserManager::class)->registerBackend($userBackend);
 	}
 
 	/**

apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserCleanUp.php

@@ -36,7 +36,7 @@ public function init() {
 		$this->access->setUserMapper($this->mapping);
 
 		$userBackend = new User_LDAP($this->access, Server::get(\OCP\Notification\IManager::class), Server::get(UserPluginManager::class), Server::get(LoggerInterface::class), Server::get(DeletedUsersIndex::class));
-		\OC_User::useBackend($userBackend);
+		Server::get(IUserManager::class)->registerBackend($userBackend);
 	}
 
 	/**

apps/user_ldap/tests/Integration/Lib/User/IntegrationTestUserDisplayName.php

@@ -34,7 +34,7 @@ public function init() {
 		$this->mapping->clear();
 		$this->access->setUserMapper($this->mapping);
 		$userBackend = new User_LDAP($this->access, Server::get(\OCP\Notification\IManager::class), Server::get(UserPluginManager::class), Server::get(LoggerInterface::class), Server::get(DeletedUsersIndex::class));
-		\OC_User::useBackend($userBackend);
+		Server::get(IUserManager::class)->registerBackend($userBackend);
 	}
 
 	/**

apps/user_ldap/tests/User_LDAPTest.php

@@ -60,7 +60,7 @@ class User_LDAPTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		\OC_User::clearBackends();
+		Server::get(IUserManager::class)->clearBackends();
 		Server::get(IGroupManager::class)->clearBackends();
 
 		$this->connection = $this->createMock(Connection::class);
@@ -187,7 +187,7 @@ public function testCheckPasswordUidReturn(): void {
 
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
 
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $backend->checkPassword('roland', 'dt19');
 		$this->assertEquals('gunslinger', $result);
@@ -196,7 +196,7 @@ public function testCheckPasswordUidReturn(): void {
 	public function testCheckPasswordWrongPassword(): void {
 		$this->prepareAccessForCheckPassword();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $backend->checkPassword('roland', 'wrong');
 		$this->assertFalse($result);
@@ -205,7 +205,7 @@ public function testCheckPasswordWrongPassword(): void {
 	public function testCheckPasswordWrongUser(): void {
 		$this->prepareAccessForCheckPassword();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $backend->checkPassword('mallory', 'evil');
 		$this->assertFalse($result);
@@ -220,7 +220,7 @@ public function testCheckPasswordNoDisplayName(): void {
 			->willReturn(null);
 
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $backend->checkPassword('roland', 'dt19');
 		$this->assertFalse($result);
@@ -238,7 +238,7 @@ public function testCheckPasswordPublicAPI(): void {
 			->willReturn($user);
 
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$user = Server::get(IUserManager::class)->checkPassword('roland', 'dt19');
 		$result = false;
@@ -251,7 +251,7 @@ public function testCheckPasswordPublicAPI(): void {
 	public function testCheckPasswordPublicAPIWrongPassword(): void {
 		$this->prepareAccessForCheckPassword();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$user = Server::get(IUserManager::class)->checkPassword('roland', 'wrong');
 		$result = false;
@@ -264,7 +264,7 @@ public function testCheckPasswordPublicAPIWrongPassword(): void {
 	public function testCheckPasswordPublicAPIWrongUser(): void {
 		$this->prepareAccessForCheckPassword();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$user = Server::get(IUserManager::class)->checkPassword('mallory', 'evil');
 		$result = false;
@@ -450,7 +450,7 @@ private function getUsers($search = '', $limit = null, $offset = null) {
 	public function testGetUsersViaAPINoParam(): void {
 		$this->prepareAccessForGetUsers();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $this->getUsers();
 		$this->assertEquals(3, count($result));
@@ -459,7 +459,7 @@ public function testGetUsersViaAPINoParam(): void {
 	public function testGetUsersViaAPILimitOffset(): void {
 		$this->prepareAccessForGetUsers();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $this->getUsers('', 1, 2);
 		$this->assertEquals(1, count($result));
@@ -468,7 +468,7 @@ public function testGetUsersViaAPILimitOffset(): void {
 	public function testGetUsersViaAPILimitOffset2(): void {
 		$this->prepareAccessForGetUsers();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $this->getUsers('', 2, 1);
 		$this->assertEquals(2, count($result));
@@ -477,7 +477,7 @@ public function testGetUsersViaAPILimitOffset2(): void {
 	public function testGetUsersViaAPISearchWithResult(): void {
 		$this->prepareAccessForGetUsers();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $this->getUsers('yo');
 		$this->assertEquals(2, count($result));
@@ -486,7 +486,7 @@ public function testGetUsersViaAPISearchWithResult(): void {
 	public function testGetUsersViaAPISearchEmptyResult(): void {
 		$this->prepareAccessForGetUsers();
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$result = $this->getUsers('nix');
 		$this->assertEquals(0, count($result));
@@ -561,7 +561,7 @@ public function testUserExistsForNeverExisting(): void {
 	public function testUserExistsPublicAPI(): void {
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
 		$this->prepareMockForUserExists();
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$user = $this->createMock(User::class);
 		$user->expects($this->any())
@@ -950,7 +950,7 @@ public function testGetDisplayNamePublicAPI(): void {
 				return true;
 			});
 
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$user1 = $this->createMock(User::class);
 		$user1->expects($this->once())
@@ -1250,7 +1250,7 @@ public function testSetPasswordInvalid(): void {
 			->method('get')
 			->willReturn($this->createMock(User::class));
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$this->assertTrue(\OC_User::setPassword('roland', 'dt'));
 	}
@@ -1267,7 +1267,7 @@ public function testSetPasswordValid(): void {
 			->method('get')
 			->willReturn($this->createMock(User::class));
 
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$this->assertTrue(\OC_User::setPassword('roland', 'dt12234$'));
 	}
@@ -1279,7 +1279,7 @@ public function testSetPasswordValidDisabled(): void {
 
 		$this->prepareAccessForSetPassword(false);
 		$backend = new UserLDAP($this->access, $this->notificationManager, $this->pluginManager, $this->logger, $this->deletedUsersIndex);
-		\OC_User::useBackend($backend);
+		Server::get(IUserManager::class)->registerBackend($backend);
 
 		$this->assertFalse(\OC_User::setPassword('roland', 'dt12234$'));
 	}

lib/base.php

@@ -741,7 +741,7 @@ public static function init(): void {
 			self::$server->getSession()->set('user_id', '');
 		}
 
-		OC_User::useBackend(new \OC\User\Database());
+		Server::get(\OCP\IUserManager::class)->registerBackend(new \OC\User\Database());
 		Server::get(\OCP\IGroupManager::class)->addBackend(new \OC\Group\Database());
 
 		// Subscribe to the hook

lib/private/User/Manager.php

@@ -54,7 +54,7 @@
  */
 class Manager extends PublicEmitter implements IUserManager {
 	/**
-	 * @var \OCP\UserInterface[] $backends
+	 * @var UserInterface[] $backends
 	 */
 	private array $backends = [];
 
@@ -82,37 +82,24 @@ public function __construct(
 
 	/**
 	 * Get the active backends
-	 * @return \OCP\UserInterface[]
+	 * @return UserInterface[]
 	 */
-	public function getBackends() {
+	public function getBackends(): array {
 		return $this->backends;
 	}
 
-	/**
-	 * register a user backend
-	 *
-	 * @param \OCP\UserInterface $backend
-	 */
-	public function registerBackend($backend) {
+	public function registerBackend(UserInterface $backend): void {
 		$this->backends[] = $backend;
 	}
 
-	/**
-	 * remove a user backend
-	 *
-	 * @param \OCP\UserInterface $backend
-	 */
-	public function removeBackend($backend) {
+	public function removeBackend(UserInterface $backend): void {
 		$this->cachedUsers = [];
 		if (($i = array_search($backend, $this->backends)) !== false) {
 			unset($this->backends[$i]);
 		}
 	}
 
-	/**
-	 * remove all user backends
-	 */
-	public function clearBackends() {
+	public function clearBackends(): void {
 		$this->cachedUsers = [];
 		$this->backends = [];
 	}