diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php
index b038c487a075a55d104504125819455f80512d4f..333a74bab221320d89e4264562b95e0497ceb228 100644
--- a/apps/user_ldap/lib/Group_Proxy.php
+++ b/apps/user_ldap/lib/Group_Proxy.php
@@ -24,8 +24,6 @@
namespace OCA\User_LDAP;
-use OCA\user_ldap\lib\ILDAPWrapper;
-
class Group_Proxy extends Proxy implements \OCP\GroupInterface {
private $backends = array();
private $refBackend = null;
diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ILDAPWrapper.php
similarity index 99%
rename from apps/user_ldap/lib/ildapwrapper.php
rename to apps/user_ldap/lib/ILDAPWrapper.php
index d607a3fdb66a4f8f0a396d610282e31bb960771a..a95f3a615f21e42aeef5250629ea39433cc08364 100644
--- a/apps/user_ldap/lib/ildapwrapper.php
+++ b/apps/user_ldap/lib/ILDAPWrapper.php
@@ -23,7 +23,7 @@
*
*/
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
interface ILDAPWrapper {
diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php
index 221f3c8883ba4d2cb5f5c7a5270c5ba70af78ad8..a7033d82254bcd57b40187fa980b5488fdbe7e77 100644
--- a/apps/user_ldap/lib/LDAP.php
+++ b/apps/user_ldap/lib/LDAP.php
@@ -27,7 +27,6 @@
namespace OCA\User_LDAP;
use OC\ServerNotAvailableException;
-use OCA\user_ldap\lib\ILDAPWrapper;
class LDAP implements ILDAPWrapper {
protected $curFunc = '';
diff --git a/apps/user_ldap/lib/LDAPUtility.php b/apps/user_ldap/lib/LDAPUtility.php
index 6328feee24068f61c9f30bd4b514bcee233a15de..33b2685593f016b6db40697291ec3397225e27d0 100644
--- a/apps/user_ldap/lib/LDAPUtility.php
+++ b/apps/user_ldap/lib/LDAPUtility.php
@@ -23,8 +23,6 @@
namespace OCA\User_LDAP;
-use OCA\user_ldap\lib\ILDAPWrapper;
-
abstract class LDAPUtility {
protected $ldap;
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index 783d8f9373ca84322cfe81492e718d15a424402f..bf4083fdb18eefd01a8670e4c506e3948fad8d10 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -31,7 +31,6 @@ namespace OCA\User_LDAP;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\Connection;
use OCA\user_ldap\lib\FilesystemHelper;
-use OCA\user_ldap\lib\ILDAPWrapper;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Mapping\GroupMapping;
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
index c4337d80d0b9e6b3c2ac0731f7277742a43a653f..800d1d36c1690611253cd5fbe077e51ef6bd3ec8 100644
--- a/apps/user_ldap/lib/User_Proxy.php
+++ b/apps/user_ldap/lib/User_Proxy.php
@@ -26,7 +26,6 @@
namespace OCA\User_LDAP;
-use OCA\user_ldap\lib\ILDAPWrapper;
use OCA\User_LDAP\User\User;
use OCP\IConfig;
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index 981d6ecc2ecd710d3f9bdcea2a0b995249666a9c..a94d3174c4e98ecc5215887b506e61fb4a85da84 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -35,7 +35,6 @@ use OC\ServerNotAvailableException;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\Configuration;
use OCA\user_ldap\lib\Helper;
-use OCA\user_ldap\lib\ILDAPWrapper;
class Wizard extends LDAPUtility {
static protected $l;
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 2d7a7db356d61fc8473af6d9eed9f50743acb077..355ce7c681eeba7c7139d58e2da9954129e3fa01 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -37,6 +37,7 @@
namespace OCA\user_ldap\lib;
+use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\LDAPUtility;
use OCA\User_LDAP\User\IUserTools;
use OCA\User_LDAP\User\Manager;
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index d3a4a9763d0b51d1bfa21142bf5e93889c800fe5..f3e39d4fb0b083a140af64e3505cde312506fb49 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -29,6 +29,7 @@
namespace OCA\user_ldap\lib;
use OC\ServerNotAvailableException;
+use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\LDAPUtility;
/**
diff --git a/apps/user_ldap/tests/GroupLDAPTest.php b/apps/user_ldap/tests/GroupLDAPTest.php
index 02392e6e610e69ceb12366e94d35f230bcde1cd2..f4185b2ae3ae44ea68a5ee949395bc60f1b02310 100644
--- a/apps/user_ldap/tests/GroupLDAPTest.php
+++ b/apps/user_ldap/tests/GroupLDAPTest.php
@@ -29,7 +29,6 @@ namespace OCA\User_LDAP\Tests;
use OCA\User_LDAP\Group_LDAP as GroupLDAP;
use \OCA\user_ldap\lib\Access;
use \OCA\user_ldap\lib\Connection;
-use \OCA\user_ldap\lib\ILDAPWrapper;
/**
* Class GroupLDAPTest
@@ -47,7 +46,7 @@ class GroupLDAPTest extends \Test\TestCase {
$conMethods = get_class_methods('\OCA\user_ldap\lib\Connection');
$accMethods = get_class_methods('\OCA\user_ldap\lib\Access');
}
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
$conMethods,
array($lw, null, null));
diff --git a/apps/user_ldap/tests/User/ManagerTest.php b/apps/user_ldap/tests/User/ManagerTest.php
index 6dee5bd5c91a805d0c8c27cfa7200e7a0a781b3f..633cd0c876a63df6db892267ee5e63728574a321 100644
--- a/apps/user_ldap/tests/User/ManagerTest.php
+++ b/apps/user_ldap/tests/User/ManagerTest.php
@@ -47,7 +47,7 @@ class ManagerTest extends \Test\TestCase {
$userMgr = $this->getMock('\OCP\IUserManager');
$connection = new \OCA\user_ldap\lib\Connection(
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'),
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper'),
'',
null
);
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php
index 2a5a7cc6a770cd9a8ab78002e78eda2ac786a29a..9afdb7c864594133998a3b3a8295f2de5da2a9b6 100644
--- a/apps/user_ldap/tests/User/UserTest.php
+++ b/apps/user_ldap/tests/User/UserTest.php
@@ -61,7 +61,7 @@ class UserTest extends \Test\TestCase {
unset($accMethods[array_search('getConnection', $accMethods)]);
$umMethods = get_class_methods('\OCA\User_LDAP\User\Manager');
}
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
$im = $this->getMock('\OCP\Image');
if (is_null($userMgr)) {
$userMgr = $this->getMock('\OCP\IUserManager');
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index d67dafb90eb7bab82b3e18d1757b384fa294317b..f13240aa2488392fc6a55de1c4fcce4d06fc744e 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -30,7 +30,6 @@ namespace OCA\User_LDAP\Tests;
use OCA\User_LDAP\User_LDAP as UserLDAP;
use \OCA\user_ldap\lib\Access;
use \OCA\user_ldap\lib\Connection;
-use \OCA\user_ldap\lib\ILDAPWrapper;
/**
* Class Test_User_Ldap_Direct
@@ -65,7 +64,7 @@ class User_LDAPTest extends \Test\TestCase {
unset($uMethods[array_search('getDN', $uMethods)]);
unset($uMethods[array_search('__construct', $uMethods)]);
}
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
$conMethods,
array($lw, null, null));
diff --git a/apps/user_ldap/tests/WizardTest.php b/apps/user_ldap/tests/WizardTest.php
index 83cd58d22314109493c65d3d3088608f400f786d..f74defa8ae204e65bceaa2d77b822996d020b0b1 100644
--- a/apps/user_ldap/tests/WizardTest.php
+++ b/apps/user_ldap/tests/WizardTest.php
@@ -27,10 +27,10 @@ namespace OCA\User_LDAP\tests;
use \OCA\User_LDAP\Wizard;
-// use \OCA\user_ldap\User_LDAP as UserLDAP;
+// use \OCA\User_LDAP\User_LDAP as UserLDAP;
// use \OCA\user_ldap\lib\Access;
// use \OCA\user_ldap\lib\Configuration;
-// use \OCA\user_ldap\lib\ILDAPWrapper;
+// use \OCA\User_LDAP\ILDAPWrapper;
/**
* Class Test_Wizard
@@ -63,7 +63,7 @@ class WizardTest extends \Test\TestCase {
$connMethods = get_class_methods('\OCA\user_ldap\lib\Connection');
$accMethods = get_class_methods('\OCA\user_ldap\lib\Access');
}
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
$conf = $this->getMock('\OCA\user_ldap\lib\Configuration',
$confMethods,
array($lw, null, null));
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index ef5c09393b8ebd2e8a65de639bae3893566b346d..75bf4b7524da14df6cb4277c6e60508b92d3e17d 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -27,7 +27,6 @@ namespace OCA\user_ldap\tests;
use \OCA\user_ldap\lib\Access;
use \OCA\user_ldap\lib\Connection;
-use \OCA\user_ldap\lib\ILDAPWrapper;
/**
* Class Test_Access
@@ -47,7 +46,7 @@ class Test_Access extends \Test\TestCase {
$accMethods = get_class_methods('\OCA\user_ldap\lib\Access');
$umMethods = get_class_methods('\OCA\User_LDAP\User\Manager');
}
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
$connector = $this->getMock('\OCA\user_ldap\lib\Connection',
$conMethods,
array($lw, null, null));
diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php
index a6ccf4b340b470af6bf06e2b1db8dc2ca8765cd0..e93009ee8ffe2af5dfc12ad6449beec01ebc51c0 100644
--- a/apps/user_ldap/tests/connection.php
+++ b/apps/user_ldap/tests/connection.php
@@ -33,7 +33,7 @@ use OCA\user_ldap\lib\Connection;
* @package OCA\user_ldap\tests
*/
class Test_Connection extends \Test\TestCase {
- /** @var \OCA\user_ldap\lib\ILDAPWrapper */
+ /** @var \OCA\User_LDAP\ILDAPWrapper */
protected $ldap;
/** @var Connection */
@@ -42,7 +42,7 @@ class Test_Connection extends \Test\TestCase {
public function setUp() {
parent::setUp();
- $this->ldap = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $this->ldap = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
// we use a mock here to replace the cache mechanism, due to missing DI in LDAP backend.
$this->connection = $this->getMockBuilder('OCA\user_ldap\lib\Connection')
->setMethods(['getFromCache', 'writeToCache'])
@@ -58,7 +58,7 @@ class Test_Connection extends \Test\TestCase {
//background: upon login a bind is done with the user credentials
//which is valid for the whole LDAP resource. It needs to be reset
//to the agent's credentials
- $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+ $lw = $this->getMock('\OCA\User_LDAP\ILDAPWrapper');
$connection = new Connection($lw, '', null);
$agent = array(