Move User_LDAP and User_Proxy to PSR-4

11 files changed, 22 insertions, 22 deletions

diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/User_LDAPTest.php
index 0ae18a2aa96..e9e277ee737 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -25,9 +25,9 @@
  *
  */
 
-namespace OCA\user_ldap\tests;
+namespace OCA\User_LDAP\Tests;
 
-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\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
@@ -37,9 +37,9 @@ use \OCA\user_ldap\lib\ILDAPWrapper;
  *
  * @group DB
  *
- * @package OCA\user_ldap\tests
+ * @package OCA\User_LDAP\Tests
  */
-class Test_User_Ldap_Direct extends \Test\TestCase {
+class User_LDAPTest extends \Test\TestCase {
 	protected $backend;
 	protected $access;
 	protected $configMock;
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php b/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
index 4faf173af11..9eabb5f2e7a 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
 use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\USER_LDAP;
+use OCA\User_LDAP\User_LDAP;
 
 require_once __DIR__  . '/../../../../../lib/base.php';
 
@@ -32,7 +32,7 @@ class IntegrationBackupServer extends AbstractIntegrationTest {
 	/** @var  UserMapping */
 	protected $mapping;
 
-	/** @var USER_LDAP */
+	/** @var User_LDAP */
 	protected $backend;
 
 	/**
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php b/apps/user_ldap/tests/integration/lib/integrationtestconnect.php
index ad4d0a3da7e..b333552955a 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestconnect.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestconnect.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
 use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\USER_LDAP;
+use OCA\User_LDAP\User_LDAP;
 
 require_once __DIR__  . '/../../../../../lib/base.php';
 
@@ -32,7 +32,7 @@ class IntegrationConnect extends AbstractIntegrationTest {
 	/** @var  UserMapping */
 	protected $mapping;
 
-	/** @var USER_LDAP */
+	/** @var User_LDAP */
 	protected $backend;
 
 	/** @var  string */
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php b/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
index 861638e25bd..83ed7e1b176 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
 use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\USER_LDAP;
+use OCA\User_LDAP\User_LDAP;
 
 require_once __DIR__  . '/../../../../../lib/base.php';
 
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php b/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
index fb2cb45e9e7..d7b7363b8a1 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
 use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\USER_LDAP;
+use OCA\User_LDAP\User_LDAP;
 
 require_once __DIR__  . '/../../../../../lib/base.php';
 
@@ -32,7 +32,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 	/** @var  UserMapping */
 	protected $mapping;
 
-	/** @var USER_LDAP */
+	/** @var User_LDAP */
 	protected $backend;
 
 	/**
@@ -46,7 +46,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 		$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 		$this->mapping->clear();
 		$this->access->setUserMapper($this->mapping);
-		$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig());
+		$this->backend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
 	}
 
 	/**
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
index 94f7d7fd0f5..2f7cc6a55a8 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
 use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\USER_LDAP;
+use OCA\User_LDAP\User_LDAP;
 
 require_once __DIR__  . '/../../../../../lib/base.php';
 
@@ -32,7 +32,7 @@ class IntegrationTestPaging extends AbstractIntegrationTest {
 	/** @var  UserMapping */
 	protected $mapping;
 
-	/** @var USER_LDAP */
+	/** @var User_LDAP */
 	protected $backend;
 
 	/**
@@ -43,7 +43,7 @@ class IntegrationTestPaging extends AbstractIntegrationTest {
 		require(__DIR__ . '/../setup-scripts/createExplicitUsers.php');
 		parent::init();
 
-		$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig());
+		$this->backend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
 	}
 
 	/**
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
index 8d36e1f2dfe..3d455608bf1 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
 use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
 use OCA\User_LDAP\Mapping\UserMapping;
-use OCA\user_ldap\USER_LDAP;
+use OCA\User_LDAP\User_LDAP;
 
 require_once __DIR__  . '/../../../../../lib/base.php';
 
@@ -32,7 +32,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 	/** @var  UserMapping */
 	protected $mapping;
 
-	/** @var USER_LDAP */
+	/** @var User_LDAP */
 	protected $backend;
 
 	/**
@@ -46,7 +46,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
 		$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 		$this->mapping->clear();
 		$this->access->setUserMapper($this->mapping);
-		$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig());
+		$this->backend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
 	}
 
 	/**
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
index fd53838df19..4b220ff036e 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
@@ -40,7 +40,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
 		$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 		$this->mapping->clear();
 		$this->access->setUserMapper($this->mapping);
-		$userBackend  = new OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig());
+		$userBackend  = new OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
 		\OC_User::useBackend($userBackend);
 	}
 
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
index f82afe9009d..6f021e61f6e 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
@@ -38,7 +38,7 @@ class IntegrationTestUserDisplayName extends AbstractIntegrationTest {
 		$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 		$this->mapping->clear();
 		$this->access->setUserMapper($this->mapping);
-		$userBackend  = new OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig());
+		$userBackend  = new OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
 		\OC_User::useBackend($userBackend);
 	}
 
diff --git a/apps/user_ldap/tests/jobs/cleanup.php b/apps/user_ldap/tests/jobs/cleanup.php
index 4c6893b19cf..8a577f37233 100644
--- a/apps/user_ldap/tests/jobs/cleanup.php
+++ b/apps/user_ldap/tests/jobs/cleanup.php
@@ -26,7 +26,7 @@ class Test_CleanUp extends \PHPUnit_Framework_TestCase {
 	public function getMocks() {
 		$mocks = array();
 		$mocks['userBackend'] =
-			$this->getMockBuilder('\OCA\user_ldap\User_Proxy')
+			$this->getMockBuilder('\OCA\User_LDAP\User_Proxy')
 				->disableOriginalConstructor()
 				->getMock();
 		$mocks['deletedUsersIndex'] =
diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php
index 33fb2712e23..c247718c2a3 100644
--- a/apps/user_ldap/tests/wizard.php
+++ b/apps/user_ldap/tests/wizard.php
@@ -27,7 +27,7 @@ namespace OCA\user_ldap\tests;
 
 use \OCA\user_ldap\lib\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;