diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-12 16:21:28 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-05-25 16:04:58 +0200 |
| commit | 3690ce1b36cf771f1c36f0dc2576c75c4f513ce3 (patch) | |
| tree | 603af0021cb9ca16b24a588c7966d78da997fef6 /apps/user_ldap/lib | |
| parent | 5b3087d3759d2f0ae09495ab8aa47eb2ad4f7c46 (diff) | |
| download | nextcloud-server-3690ce1b36cf771f1c36f0dc2576c75c4f513ce3.tar.gz nextcloud-server-3690ce1b36cf771f1c36f0dc2576c75c4f513ce3.zip | |
Move LDAP to PSR-4
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/Command/Search.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Command/TestConfig.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Jobs/CleanUp.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/LDAP.php (renamed from apps/user_ldap/lib/ldap.php) | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php index e5df49016df..77c0271a708 100644 --- a/apps/user_ldap/lib/Command/Search.php +++ b/apps/user_ldap/lib/Command/Search.php @@ -31,7 +31,7 @@ use Symfony\Component\Console\Output\OutputInterface; use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\Group_Proxy; use OCA\user_ldap\lib\Helper; -use OCA\user_ldap\lib\LDAP; +use OCA\User_LDAP\LDAP; use OCP\IConfig; class Search extends Command { diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php index 790b9df6637..aa369f1a421 100644 --- a/apps/user_ldap/lib/Command/TestConfig.php +++ b/apps/user_ldap/lib/Command/TestConfig.php @@ -71,7 +71,7 @@ class TestConfig extends Command { * @return int */ protected function testConfig($configID) { - $lw = new \OCA\user_ldap\lib\LDAP(); + $lw = new \OCA\User_LDAP\LDAP(); $connection = new Connection($lw, $configID); //ensure validation is run before we attempt the bind diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php index fb4f37203c1..3bbf897ea19 100644 --- a/apps/user_ldap/lib/Jobs/CleanUp.php +++ b/apps/user_ldap/lib/Jobs/CleanUp.php @@ -26,7 +26,7 @@ use \OC\BackgroundJob\TimedJob; use \OCA\user_ldap\User_LDAP; use \OCA\User_LDAP\User_Proxy; use \OCA\user_ldap\lib\Helper; -use \OCA\user_ldap\lib\LDAP; +use \OCA\User_LDAP\LDAP; use \OCA\User_LDAP\User\DeletedUsersIndex; use \OCA\User_LDAP\Mapping\UserMapping; diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/LDAP.php index 383d71ca6eb..221f3c8883b 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/LDAP.php @@ -24,9 +24,10 @@ * */ -namespace OCA\user_ldap\lib; +namespace OCA\User_LDAP; use OC\ServerNotAvailableException; +use OCA\user_ldap\lib\ILDAPWrapper; class LDAP implements ILDAPWrapper { protected $curFunc = ''; @@ -160,7 +161,7 @@ class LDAP implements ILDAPWrapper { /** * @param LDAP $link * @param resource $result - * @return mixed|an + * @return mixed */ public function nextEntry($link, $result) { return $this->invokeLDAPMethod('next_entry', $link, $result); |