From e73d811425d35977d5c6c1fcf1be8ab3f512ad89 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 12 May 2016 16:11:59 +0200 Subject: [PATCH] Move Proxy to PSR-4 --- apps/user_ldap/lib/Group_Proxy.php | 2 +- apps/user_ldap/lib/{proxy.php => Proxy.php} | 6 +++++- apps/user_ldap/lib/User_Proxy.php | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) rename apps/user_ldap/lib/{proxy.php => Proxy.php} (96%) diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php index 00225b5428..b038c487a0 100644 --- a/apps/user_ldap/lib/Group_Proxy.php +++ b/apps/user_ldap/lib/Group_Proxy.php @@ -26,7 +26,7 @@ namespace OCA\User_LDAP; use OCA\user_ldap\lib\ILDAPWrapper; -class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface { +class Group_Proxy extends Proxy implements \OCP\GroupInterface { private $backends = array(); private $refBackend = null; diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/Proxy.php similarity index 96% rename from apps/user_ldap/lib/proxy.php rename to apps/user_ldap/lib/Proxy.php index 7002aaadaa..dd7cd97b6f 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/Proxy.php @@ -26,9 +26,13 @@ * */ -namespace OCA\user_ldap\lib; +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\lib\LogWrapper; 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 aba8398fa2..c4337d80d0 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -28,10 +28,9 @@ namespace OCA\User_LDAP; use OCA\user_ldap\lib\ILDAPWrapper; use OCA\User_LDAP\User\User; -use \OCA\user_ldap\User_LDAP; use OCP\IConfig; -class User_Proxy extends lib\Proxy implements \OCP\IUserBackend, \OCP\UserInterface { +class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface { private $backends = array(); private $refBackend = null;