Move Access to PSR-4

6 files changed, 4 insertions, 12 deletions

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/Access.php
index 025f5710862..8137deb023d 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -35,11 +35,8 @@
  *
  */
 
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
 
-use OCA\User_LDAP\Connection;
-use OCA\User_LDAP\ILDAPWrapper;
-use OCA\User_LDAP\LDAPUtility;
 use OCA\User_LDAP\User\IUserTools;
 use OCA\User_LDAP\User\Manager;
 use OCA\User_LDAP\User\OfflineUser;
@@ -47,7 +44,7 @@ use OCA\User_LDAP\Mapping\AbstractMapping;
 
 /**
  * Class Access
- * @package OCA\user_ldap\lib
+ * @package OCA\User_LDAP
  */
 class Access extends LDAPUtility implements IUserTools {
 	/**
diff --git a/apps/user_ldap/lib/BackendUtility.php b/apps/user_ldap/lib/BackendUtility.php
index e00a0e8888a..fc4efe28924 100644
--- a/apps/user_ldap/lib/BackendUtility.php
+++ b/apps/user_ldap/lib/BackendUtility.php
@@ -24,8 +24,6 @@
 namespace OCA\User_LDAP;
 
 
-use OCA\user_ldap\lib\Access;
-
 abstract class BackendUtility {
 	protected $access;
 
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
index d389610b641..39b2e9ff446 100644
--- a/apps/user_ldap/lib/Group_LDAP.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -34,7 +34,6 @@
 
 namespace OCA\User_LDAP;
 
-use OCA\user_ldap\lib\Access;
 
 class Group_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	protected $enabled = false;
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index d263e9a4383..ce1a67b29de 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -28,7 +28,6 @@
 
 namespace OCA\User_LDAP;
 
-use OCA\user_ldap\lib\Access;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\User_LDAP\Mapping\GroupMapping;
 
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
index 185e522b529..1000f3ba530 100644
--- a/apps/user_ldap/lib/User_LDAP.php
+++ b/apps/user_ldap/lib/User_LDAP.php
@@ -32,7 +32,6 @@
 namespace OCA\User_LDAP;
 
 use OC\User\NoUserException;
-use OCA\user_ldap\lib\Access;
 use OCA\User_LDAP\User\OfflineUser;
 use OCA\User_LDAP\User\User;
 use OCP\IConfig;
@@ -45,7 +44,7 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	protected $ocConfig;
 
 	/**
-	 * @param \OCA\user_ldap\lib\Access $access
+	 * @param Access $access
 	 * @param \OCP\IConfig $ocConfig
 	 */
 	public function __construct(Access $access, IConfig $ocConfig) {
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index c63bf903d82..f8c82a29701 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -32,7 +32,6 @@
 namespace OCA\User_LDAP;
 
 use OC\ServerNotAvailableException;
-use OCA\user_ldap\lib\Access;
 
 class Wizard extends LDAPUtility {
 	static protected $l;
@@ -59,6 +58,7 @@ class Wizard extends LDAPUtility {
 	 * Constructor
 	 * @param Configuration $configuration an instance of Configuration
 	 * @param ILDAPWrapper $ldap an instance of ILDAPWrapper
+	 * @param Access $access
 	 */
 	public function __construct(Configuration $configuration, ILDAPWrapper $ldap, Access $access) {
 		parent::__construct($ldap);