diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-07-13 17:22:19 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-07-13 17:22:19 +0200 |
| commit | 3203286f52fcca102e8458c9ca0df4b500d1d348 (patch) | |
| tree | f2317f72d0e47f4fc48c8bd7b7c3c61c54a460c4 /apps/user_ldap/appinfo | |
| parent | 2c87ce60a04eb98533d430ef7abe386ef0d04c2a (diff) | |
| download | nextcloud-server-3203286f52fcca102e8458c9ca0df4b500d1d348.tar.gz nextcloud-server-3203286f52fcca102e8458c9ca0df4b500d1d348.zip | |
Do not use custom DI object names for user_ldap
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps/user_ldap/appinfo')
| -rw-r--r-- | apps/user_ldap/appinfo/app.php | 11 | ||||
| -rw-r--r-- | apps/user_ldap/appinfo/register_command.php | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index c2d61ba61a2..93a4253bd4f 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -27,13 +27,6 @@ * */ -\OC::$server->registerService('LDAPUserPluginManager', function () { - return new OCA\User_LDAP\UserPluginManager(); -}); -\OC::$server->registerService('LDAPGroupPluginManager', function () { - return new OCA\User_LDAP\GroupPluginManager(); -}); - $app = \OC::$server->query(\OCA\User_LDAP\AppInfo\Application::class); $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); @@ -45,8 +38,8 @@ if (count($configPrefixes) > 0) { $notificationManager->registerNotifierService(\OCA\User_LDAP\Notification\Notifier::class); $userSession = \OC::$server->getUserSession(); - $userPluginManager = \OC::$server->query('LDAPUserPluginManager'); - $groupPluginManager = \OC::$server->query('LDAPGroupPluginManager'); + $userPluginManager = \OC::$server->query(\OCA\User_LDAP\UserPluginManager::class); + $groupPluginManager = \OC::$server->query(\OCA\User_LDAP\GroupPluginManager::class); $userBackend = new OCA\User_LDAP\User_Proxy( $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php index 3f2fc4e78e8..cdfc6fd9b16 100644 --- a/apps/user_ldap/appinfo/register_command.php +++ b/apps/user_ldap/appinfo/register_command.php @@ -41,7 +41,7 @@ $uBackend = new User_Proxy( $ocConfig, \OC::$server->getNotificationManager(), \OC::$server->getUserSession(), - \OC::$server->query('LDAPUserPluginManager') + \OC::$server->query(\OCA\User_LDAP\UserPluginManager::class) ); $deletedUsersIndex = new DeletedUsersIndex( $ocConfig, $dbConnection, $userMapping |