Move interface to PSR-4

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;

apps/user_ldap/lib/ildapwrapper.php → apps/user_ldap/lib/ILDAPWrapper.php

@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
 
 interface ILDAPWrapper {
 

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 = '';

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;
 

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;
 

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;
 

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;

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;

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;
 
 /**

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));

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
 		);

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');

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));

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));

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));

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(