From 5b3087d3759d2f0ae09495ab8aa47eb2ad4f7c46 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 12 May 2016 16:17:39 +0200
Subject: [PATCH] Move LDAP Utility to PSR-4
---
apps/user_ldap/lib/{ldaputility.php => LDAPUtility.php} | 4 +++-
apps/user_ldap/lib/Wizard.php | 1 -
apps/user_ldap/lib/access.php | 1 +
apps/user_ldap/lib/connection.php | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
rename apps/user_ldap/lib/{ldaputility.php => LDAPUtility.php} (94%)
diff --git a/apps/user_ldap/lib/ldaputility.php b/apps/user_ldap/lib/LDAPUtility.php
similarity index 94%
rename from apps/user_ldap/lib/ldaputility.php
rename to apps/user_ldap/lib/LDAPUtility.php
index e80fc12e087..6328feee240 100644
--- a/apps/user_ldap/lib/ldaputility.php
+++ b/apps/user_ldap/lib/LDAPUtility.php
@@ -21,7 +21,9 @@
*
*/
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
+
+use OCA\user_ldap\lib\ILDAPWrapper;
abstract class LDAPUtility {
protected $ldap;
diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index d9bb0c41727..981d6ecc2ec 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -36,7 +36,6 @@ use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\Configuration;
use OCA\user_ldap\lib\Helper;
use OCA\user_ldap\lib\ILDAPWrapper;
-use OCA\user_ldap\lib\LDAPUtility;
class Wizard extends LDAPUtility {
static protected $l;
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 092d22a428e..2d7a7db356d 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\LDAPUtility;
use OCA\User_LDAP\User\IUserTools;
use OCA\User_LDAP\User\Manager;
use OCA\User_LDAP\User\OfflineUser;
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 93e7e4bf974..d3a4a9763d0 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -29,6 +29,7 @@
namespace OCA\user_ldap\lib;
use OC\ServerNotAvailableException;
+use OCA\User_LDAP\LDAPUtility;
/**
* magic properties (incomplete)
--
GitLab