From 01cf85e4e5e610bf667e4a55ff9647542aa926d1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 9 Sep 2016 16:52:10 +0200 Subject: [PATCH] Fix the User_LDAP app --- apps/user_ldap/lib/Command/CreateEmptyConfig.php | 4 ++-- apps/user_ldap/lib/Command/DeleteConfig.php | 3 ++- apps/user_ldap/lib/Jobs/CleanUp.php | 14 +++++++------- apps/user_ldap/lib/LDAPProvider.php | 3 +-- apps/user_ldap/tests/AccessTest.php | 1 - apps/user_ldap/tests/Group_LDAPTest.php | 2 -- apps/user_ldap/tests/User_LDAPTest.php | 2 -- 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/apps/user_ldap/lib/Command/CreateEmptyConfig.php b/apps/user_ldap/lib/Command/CreateEmptyConfig.php index 53cc4cbf46..28d3a1d8bf 100644 --- a/apps/user_ldap/lib/Command/CreateEmptyConfig.php +++ b/apps/user_ldap/lib/Command/CreateEmptyConfig.php @@ -25,11 +25,11 @@ namespace OCA\User_LDAP\Command; +use OCA\User_LDAP\Configuration; +use OCA\User_LDAP\Helper; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use \OCA\User_LDAP\Helper; -use \OCA\User_LDAP\Configuration; class CreateEmptyConfig extends Command { /** @var \OCA\User_LDAP\Helper */ diff --git a/apps/user_ldap/lib/Command/DeleteConfig.php b/apps/user_ldap/lib/Command/DeleteConfig.php index a986dd6be7..e39425f3fa 100644 --- a/apps/user_ldap/lib/Command/DeleteConfig.php +++ b/apps/user_ldap/lib/Command/DeleteConfig.php @@ -25,11 +25,12 @@ namespace OCA\User_LDAP\Command; + +use OCA\User_LDAP\Helper; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use \OCA\User_LDAP\Helper; class DeleteConfig extends Command { /** @var \OCA\User_LDAP\Helper */ diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index 21c3ece866..b91fed14dd 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -24,13 +24,13 @@ namespace OCA\User_LDAP\Jobs; -use \OC\BackgroundJob\TimedJob; -use \OCA\User_LDAP\User_LDAP; -use \OCA\User_LDAP\User_Proxy; -use \OCA\User_LDAP\Helper; -use \OCA\User_LDAP\LDAP; -use \OCA\User_LDAP\User\DeletedUsersIndex; -use \OCA\User_LDAP\Mapping\UserMapping; +use OC\BackgroundJob\TimedJob; +use OCA\User_LDAP\Helper; +use OCA\User_LDAP\LDAP; +use OCA\User_LDAP\Mapping\UserMapping; +use OCA\User_LDAP\User_LDAP; +use OCA\User_LDAP\User_Proxy; +use OCA\User_LDAP\User\DeletedUsersIndex; /** * Class CleanUp diff --git a/apps/user_ldap/lib/LDAPProvider.php b/apps/user_ldap/lib/LDAPProvider.php index 5bd6a0fd08..bf8691006c 100644 --- a/apps/user_ldap/lib/LDAPProvider.php +++ b/apps/user_ldap/lib/LDAPProvider.php @@ -22,12 +22,11 @@ namespace OCA\User_LDAP; -use OCP\IUserBackend; + use OCP\LDAP\ILDAPProvider; use OCP\LDAP\IDeletionFlagSupport; use OCP\IServerContainer; use OCA\User_LDAP\User\DeletedUsersIndex; -use OCA\User_LDAP\Mapping\UserMapping; /** * LDAP provider for pulic access to the LDAP backend. diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index 08e7c9f79f..f89af2423a 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -27,7 +27,6 @@ namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\Access; -use OCA\User_LDAP\Connection; use OCA\User_LDAP\FilesystemHelper; use OCA\User_LDAP\ILDAPWrapper; use OCA\User_LDAP\LogWrapper; diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index 12f7eaa225..17ed5909bf 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -29,8 +29,6 @@ namespace OCA\User_LDAP\Tests; use OCA\User_LDAP\Group_LDAP as GroupLDAP; -use OCA\User_LDAP\Access; -use OCA\User_LDAP\Connection; use OCA\User_LDAP\ILDAPWrapper; /** diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 0e08998d13..f5ffb7f990 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -32,8 +32,6 @@ use OCA\User_LDAP\FilesystemHelper; use OCA\User_LDAP\ILDAPWrapper; use OCA\User_LDAP\LogWrapper; use OCA\User_LDAP\User_LDAP as UserLDAP; -use \OCA\User_LDAP\Access; -use \OCA\User_LDAP\Connection; use OCP\IAvatarManager; use OCP\IConfig; use OCP\IDBConnection;