1 files changed, 27 insertions, 20 deletions

diff --git a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
index ef84beb8f56..00f8be18586 100644
--- a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
+++ b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
@@ -9,21 +9,24 @@ namespace OCA\User_LDAP\Tests\Integration;
 
 use OCA\User_LDAP\Access;
 use OCA\User_LDAP\Connection;
-use OCA\User_LDAP\FilesystemHelper;
 use OCA\User_LDAP\GroupPluginManager;
 use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\LDAP;
 use OCA\User_LDAP\User\Manager;
 use OCA\User_LDAP\UserPluginManager;
 use OCP\IAvatarManager;
+use OCP\IConfig;
+use OCP\Image;
+use OCP\IUserManager;
+use OCP\Server;
 use OCP\Share\IManager;
 use Psr\Log\LoggerInterface;
 
 abstract class AbstractIntegrationTest {
-	/** @var  LDAP */
+	/** @var LDAP */
 	protected $ldap;
 
-	/** @var  Connection */
+	/** @var Connection */
 	protected $connection;
 
 	/** @var Access */
@@ -35,14 +38,19 @@ abstract class AbstractIntegrationTest {
 	/** @var Helper */
 	protected $helper;
 
-	/** @var  string */
-	protected $base;
-
 	/** @var string[] */
 	protected $server;
 
-	public function __construct($host, $port, $bind, $pwd, $base) {
-		$this->base = $base;
+	/**
+	 * @param string $base
+	 */
+	public function __construct(
+		$host,
+		$port,
+		$bind,
+		$pwd,
+		protected $base,
+	) {
 		$this->server = [
 			'host' => $host,
 			'port' => $port,
@@ -57,10 +65,10 @@ abstract class AbstractIntegrationTest {
 	 */
 	public function init() {
 		\OC::$server->registerService(UserPluginManager::class, function () {
-			return new \OCA\User_LDAP\UserPluginManager();
+			return new UserPluginManager();
 		});
 		\OC::$server->registerService(GroupPluginManager::class, function () {
-			return new \OCA\User_LDAP\GroupPluginManager();
+			return new GroupPluginManager();
 		});
 
 		$this->initLDAPWrapper();
@@ -102,14 +110,13 @@ abstract class AbstractIntegrationTest {
 	 */
 	protected function initUserManager() {
 		$this->userManager = new Manager(
-			\OC::$server->getConfig(),
-			new FilesystemHelper(),
-			\OC::$server->get(LoggerInterface::class),
-			\OC::$server->get(IAvatarManager::class),
-			new \OCP\Image(),
-			\OC::$server->getUserManager(),
-			\OC::$server->getNotificationManager(),
-			\OC::$server->get(IManager::class)
+			Server::get(IConfig::class),
+			Server::get(LoggerInterface::class),
+			Server::get(IAvatarManager::class),
+			new Image(),
+			Server::get(IUserManager::class),
+			Server::get(\OCP\Notification\IManager::class),
+			Server::get(IManager::class)
 		);
 	}
 
@@ -117,14 +124,14 @@ abstract class AbstractIntegrationTest {
 	 * initializes the test Helper
 	 */
 	protected function initHelper() {
-		$this->helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
+		$this->helper = Server::get(Helper::class);
 	}
 
 	/**
 	 * initializes the Access test instance
 	 */
 	protected function initAccess() {
-		$this->access = new Access($this->connection, $this->ldap, $this->userManager, $this->helper, \OC::$server->getConfig(), \OCP\Server::get(LoggerInterface::class));
+		$this->access = new Access($this->connection, $this->ldap, $this->userManager, $this->helper, Server::get(IConfig::class), Server::get(LoggerInterface::class));
 	}
 
 	/**