summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@owncloud.com>2016-05-12 16:35:33 +0200
committerJoas Schilling <nickvergessen@owncloud.com>2016-05-25 16:04:59 +0200
commitaf0a6961b1ae867e354ecf71d61708af9618c44f (patch)
tree6f5805dc9d1055d9be985f69d0b223a8daa15944 /apps/user_ldap/lib
parent387019a212224ffbd4300576b9c28e61d5e021a6 (diff)
downloadnextcloud-server-af0a6961b1ae867e354ecf71d61708af9618c44f.tar.gz
nextcloud-server-af0a6961b1ae867e354ecf71d61708af9618c44f.zip
Move Connection to PSR-4
Diffstat (limited to 'apps/user_ldap/lib')
-rw-r--r--apps/user_ldap/lib/Command/TestConfig.php2
-rw-r--r--apps/user_ldap/lib/Connection.php (renamed from apps/user_ldap/lib/connection.php)4
-rw-r--r--apps/user_ldap/lib/Proxy.php1
-rw-r--r--apps/user_ldap/lib/User/User.php2
-rw-r--r--apps/user_ldap/lib/access.php5
5 files changed, 6 insertions, 8 deletions
diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php
index 656752095cf..93a9f644714 100644
--- a/apps/user_ldap/lib/Command/TestConfig.php
+++ b/apps/user_ldap/lib/Command/TestConfig.php
@@ -28,7 +28,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use \OCA\User_LDAP\Helper;
-use \OCA\user_ldap\lib\Connection;
+use \OCA\User_LDAP\Connection;
class TestConfig extends Command {
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/Connection.php
index f3e39d4fb0b..1cf02a0a898 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/Connection.php
@@ -26,11 +26,9 @@
*
*/
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
use OC\ServerNotAvailableException;
-use OCA\User_LDAP\ILDAPWrapper;
-use OCA\User_LDAP\LDAPUtility;
/**
* magic properties (incomplete)
diff --git a/apps/user_ldap/lib/Proxy.php b/apps/user_ldap/lib/Proxy.php
index c51d6473482..d263e9a4383 100644
--- a/apps/user_ldap/lib/Proxy.php
+++ b/apps/user_ldap/lib/Proxy.php
@@ -29,7 +29,6 @@
namespace OCA\User_LDAP;
use OCA\user_ldap\lib\Access;
-use OCA\user_ldap\lib\Connection;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\Mapping\GroupMapping;
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
index aee644a2b6c..828648906fb 100644
--- a/apps/user_ldap/lib/User/User.php
+++ b/apps/user_ldap/lib/User/User.php
@@ -24,7 +24,7 @@
namespace OCA\User_LDAP\User;
-use OCA\user_ldap\lib\Connection;
+use OCA\User_LDAP\Connection;
use OCA\User_LDAP\FilesystemHelper;
use OCA\User_LDAP\LogWrapper;
use OCP\IAvatarManager;
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 355ce7c681e..025f5710862 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\Connection;
use OCA\User_LDAP\ILDAPWrapper;
use OCA\User_LDAP\LDAPUtility;
use OCA\User_LDAP\User\IUserTools;
@@ -50,7 +51,7 @@ use OCA\User_LDAP\Mapping\AbstractMapping;
*/
class Access extends LDAPUtility implements IUserTools {
/**
- * @var \OCA\user_ldap\lib\Connection
+ * @var \OCA\User_LDAP\Connection
*/
public $connection;
public $userManager;
@@ -135,7 +136,7 @@ class Access extends LDAPUtility implements IUserTools {
/**
* returns the Connection instance
- * @return \OCA\user_ldap\lib\Connection
+ * @return \OCA\User_LDAP\Connection
*/
public function getConnection() {
return $this->connection;