Move LDAP Utility to PSR-4

diff --git a/apps/user_ldap/lib/LDAPUtility.php b/apps/user_ldap/lib/LDAPUtility.php
new file mode 100644 (file)
index 0000000..6328fee
--- /dev/null
+++ b/apps/user_ldap/lib/LDAPUtility.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\User_LDAP;
+
+use OCA\user_ldap\lib\ILDAPWrapper;
+
+abstract class LDAPUtility {
+       protected $ldap;
+
+       /**
+        * constructor, make sure the subclasses call this one!
+        * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
+        */
+       public function __construct(ILDAPWrapper $ldapWrapper) {
+               $this->ldap = $ldapWrapper;
+       }
+}

diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index d9bb0c41727c7040dd1d49032644ef9dad1a62cb..981d6ecc2ecd710d3f9bdcea2a0b995249666a9c 100644 (file)
--- 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 092d22a428e363de468afc801df86e1696706d5b..2d7a7db356d61fc8473af6d9eed9f50743acb077 100644 (file)
--- 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 93e7e4bf9741d0f2ca4f50a2e534892bf516486c..d3a4a9763d0b51d1bfa21142bf5e93889c800fe5 100644 (file)
--- 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)

diff --git a/apps/user_ldap/lib/ldaputility.php b/apps/user_ldap/lib/ldaputility.php
deleted file mode 100644 (file)
index e80fc12..0000000
--- a/apps/user_ldap/lib/ldaputility.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\user_ldap\lib;
-
-abstract class LDAPUtility {
-       protected $ldap;
-
-       /**
-        * constructor, make sure the subclasses call this one!
-        * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper
-        */
-       public function __construct(ILDAPWrapper $ldapWrapper) {
-               $this->ldap = $ldapWrapper;
-       }
-}