1 files changed, 27 insertions, 50 deletions

diff --git a/apps/user_ldap/tests/User_ProxyTest.php b/apps/user_ldap/tests/User_ProxyTest.php
index ed95344f115..38f94af33a7 100644
--- a/apps/user_ldap/tests/User_ProxyTest.php
+++ b/apps/user_ldap/tests/User_ProxyTest.php
@@ -1,81 +1,58 @@
 <?php
+
+declare(strict_types=1);
 /**
- * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
- *
- * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Lukas Reschke <lukas@statuscode.ch>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- * @author Roger Szabo <roger.szabo@web.de>
- * @author Vinicius Cubas Brand <vinicius@eita.org.br>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OCA\User_LDAP\Tests;
 
+use OCA\User_LDAP\AccessFactory;
 use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\ILDAPWrapper;
+use OCA\User_LDAP\User\DeletedUsersIndex;
 use OCA\User_LDAP\User_Proxy;
 use OCA\User_LDAP\UserPluginManager;
-use OCP\IConfig;
-use OCP\IUserSession;
 use OCP\Notification\IManager as INotificationManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class User_ProxyTest extends TestCase {
-	/** @var Helper|\PHPUnit\Framework\MockObject\MockObject */
-	protected $helper;
-	/** @var ILDAPWrapper|\PHPUnit\Framework\MockObject\MockObject */
-	private $ldapWrapper;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-	/** @var INotificationManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $notificationManager;
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	private $userSession;
-	/** @var User_Proxy|\PHPUnit\Framework\MockObject\MockObject */
-	private $proxy;
-	/** @var UserPluginManager|\PHPUnit\Framework\MockObject\MockObject */
-	private $userPluginManager;
+	protected Helper&MockObject $helper;
+	private ILDAPWrapper&MockObject $ldapWrapper;
+	private AccessFactory&MockObject $accessFactory;
+	private INotificationManager&MockObject $notificationManager;
+	private User_Proxy&MockObject $proxy;
+	private UserPluginManager&MockObject $userPluginManager;
+	protected LoggerInterface&MockObject $logger;
+	protected DeletedUsersIndex&MockObject $deletedUsersIndex;
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->helper = $this->createMock(Helper::class);
 		$this->ldapWrapper = $this->createMock(ILDAPWrapper::class);
-		$this->config = $this->createMock(IConfig::class);
+		$this->accessFactory = $this->createMock(AccessFactory::class);
 		$this->notificationManager = $this->createMock(INotificationManager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
 		$this->userPluginManager = $this->createMock(UserPluginManager::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
+		$this->deletedUsersIndex = $this->createMock(DeletedUsersIndex::class);
 		$this->proxy = $this->getMockBuilder(User_Proxy::class)
 			->setConstructorArgs([
 				$this->helper,
 				$this->ldapWrapper,
-				$this->config,
+				$this->accessFactory,
 				$this->notificationManager,
-				$this->userSession,
-				$this->userPluginManager
+				$this->userPluginManager,
+				$this->logger,
+				$this->deletedUsersIndex,
 			])
-			->setMethods(['handleRequest'])
+			->onlyMethods(['handleRequest'])
 			->getMock();
 	}
 
-	public function testSetPassword() {
+	public function testSetPassword(): void {
 		$this->proxy
 			->expects($this->once())
 			->method('handleRequest')
@@ -85,7 +62,7 @@ class User_ProxyTest extends TestCase {
 		$this->assertTrue($this->proxy->setPassword('MyUid', 'MyPassword'));
 	}
 
-	public function testSetDisplayName() {
+	public function testSetDisplayName(): void {
 		$this->proxy
 			->expects($this->once())
 			->method('handleRequest')
@@ -95,7 +72,7 @@ class User_ProxyTest extends TestCase {
 		$this->assertTrue($this->proxy->setDisplayName('MyUid', 'MyPassword'));
 	}
 
-	public function testCreateUser() {
+	public function testCreateUser(): void {
 		$this->proxy
 			->expects($this->once())
 			->method('handleRequest')