From 3690ce1b36cf771f1c36f0dc2576c75c4f513ce3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 12 May 2016 16:21:28 +0200
Subject: [PATCH] Move LDAP to PSR-4
---
apps/user_ldap/ajax/getConfiguration.php | 2 +-
apps/user_ldap/ajax/setConfiguration.php | 2 +-
apps/user_ldap/ajax/testConfiguration.php | 2 +-
apps/user_ldap/ajax/wizard.php | 2 +-
apps/user_ldap/appinfo/app.php | 2 +-
apps/user_ldap/appinfo/register_command.php | 2 +-
apps/user_ldap/lib/Command/Search.php | 2 +-
apps/user_ldap/lib/Command/TestConfig.php | 2 +-
apps/user_ldap/lib/Jobs/CleanUp.php | 2 +-
apps/user_ldap/lib/{ldap.php => LDAP.php} | 5 +++--
apps/user_ldap/tests/access.php | 2 +-
apps/user_ldap/tests/integration/abstractintegrationtest.php | 2 +-
.../tests/integration/exceptionOnLostConnection.php | 4 ++--
13 files changed, 16 insertions(+), 15 deletions(-)
rename apps/user_ldap/lib/{ldap.php => LDAP.php} (98%)
diff --git a/apps/user_ldap/ajax/getConfiguration.php b/apps/user_ldap/ajax/getConfiguration.php
index 795261bc91d..37f780f0eb5 100644
--- a/apps/user_ldap/ajax/getConfiguration.php
+++ b/apps/user_ldap/ajax/getConfiguration.php
@@ -28,6 +28,6 @@ OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
-$ldapWrapper = new OCA\user_ldap\lib\LDAP();
+$ldapWrapper = new OCA\User_LDAP\LDAP();
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix);
OCP\JSON::success(array('configuration' => $connection->getConfiguration()));
diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php
index a2e73783e00..34d8e4e24ce 100644
--- a/apps/user_ldap/ajax/setConfiguration.php
+++ b/apps/user_ldap/ajax/setConfiguration.php
@@ -41,7 +41,7 @@ foreach($chkboxes as $boxid) {
}
}
-$ldapWrapper = new OCA\user_ldap\lib\LDAP();
+$ldapWrapper = new OCA\User_LDAP\LDAP();
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix);
$connection->setConfiguration($_POST);
$connection->saveConfiguration();
diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php
index e9f5167bfe7..840ee2bfe09 100644
--- a/apps/user_ldap/ajax/testConfiguration.php
+++ b/apps/user_ldap/ajax/testConfiguration.php
@@ -30,7 +30,7 @@ OCP\JSON::callCheck();
$l = \OC::$server->getL10N('user_ldap');
-$ldapWrapper = new OCA\user_ldap\lib\LDAP();
+$ldapWrapper = new OCA\User_LDAP\LDAP();
$connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null);
//needs to be true, otherwise it will also fail with an irritating message
$_POST['ldap_configuration_active'] = 1;
diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index 1d77ff4009d..55a681a007b 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -41,7 +41,7 @@ if(!isset($_POST['ldap_serverconfig_chooser'])) {
}
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
-$ldapWrapper = new \OCA\user_ldap\lib\LDAP();
+$ldapWrapper = new \OCA\User_LDAP\LDAP();
$configuration = new \OCA\user_ldap\lib\Configuration($prefix);
$con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null);
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 537bbd48bb2..a6c766f2612 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -29,7 +29,7 @@ OCP\App::registerAdmin('user_ldap', 'settings');
$helper = new \OCA\user_ldap\lib\Helper();
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-$ldapWrapper = new OCA\user_ldap\lib\LDAP();
+$ldapWrapper = new OCA\User_LDAP\LDAP();
$ocConfig = \OC::$server->getConfig();
if(count($configPrefixes) === 1) {
$dbc = \OC::$server->getDatabaseConnection();
diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php
index 57e1f5e9af5..daddad7dda4 100644
--- a/apps/user_ldap/appinfo/register_command.php
+++ b/apps/user_ldap/appinfo/register_command.php
@@ -22,7 +22,7 @@
*/
use OCA\user_ldap\lib\Helper;
-use OCA\user_ldap\lib\LDAP;
+use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User\DeletedUsersIndex;
diff --git a/apps/user_ldap/lib/Command/Search.php b/apps/user_ldap/lib/Command/Search.php
index e5df49016df..77c0271a708 100644
--- a/apps/user_ldap/lib/Command/Search.php
+++ b/apps/user_ldap/lib/Command/Search.php
@@ -31,7 +31,7 @@ use Symfony\Component\Console\Output\OutputInterface;
use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\Group_Proxy;
use OCA\user_ldap\lib\Helper;
-use OCA\user_ldap\lib\LDAP;
+use OCA\User_LDAP\LDAP;
use OCP\IConfig;
class Search extends Command {
diff --git a/apps/user_ldap/lib/Command/TestConfig.php b/apps/user_ldap/lib/Command/TestConfig.php
index 790b9df6637..aa369f1a421 100644
--- a/apps/user_ldap/lib/Command/TestConfig.php
+++ b/apps/user_ldap/lib/Command/TestConfig.php
@@ -71,7 +71,7 @@ class TestConfig extends Command {
* @return int
*/
protected function testConfig($configID) {
- $lw = new \OCA\user_ldap\lib\LDAP();
+ $lw = new \OCA\User_LDAP\LDAP();
$connection = new Connection($lw, $configID);
//ensure validation is run before we attempt the bind
diff --git a/apps/user_ldap/lib/Jobs/CleanUp.php b/apps/user_ldap/lib/Jobs/CleanUp.php
index fb4f37203c1..3bbf897ea19 100644
--- a/apps/user_ldap/lib/Jobs/CleanUp.php
+++ b/apps/user_ldap/lib/Jobs/CleanUp.php
@@ -26,7 +26,7 @@ use \OC\BackgroundJob\TimedJob;
use \OCA\user_ldap\User_LDAP;
use \OCA\User_LDAP\User_Proxy;
use \OCA\user_ldap\lib\Helper;
-use \OCA\user_ldap\lib\LDAP;
+use \OCA\User_LDAP\LDAP;
use \OCA\User_LDAP\User\DeletedUsersIndex;
use \OCA\User_LDAP\Mapping\UserMapping;
diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/LDAP.php
similarity index 98%
rename from apps/user_ldap/lib/ldap.php
rename to apps/user_ldap/lib/LDAP.php
index 383d71ca6eb..221f3c8883b 100644
--- a/apps/user_ldap/lib/ldap.php
+++ b/apps/user_ldap/lib/LDAP.php
@@ -24,9 +24,10 @@
*
*/
-namespace OCA\user_ldap\lib;
+namespace OCA\User_LDAP;
use OC\ServerNotAvailableException;
+use OCA\user_ldap\lib\ILDAPWrapper;
class LDAP implements ILDAPWrapper {
protected $curFunc = '';
@@ -160,7 +161,7 @@ class LDAP implements ILDAPWrapper {
/**
* @param LDAP $link
* @param resource $result
- * @return mixed|an
+ * @return mixed
*/
public function nextEntry($link, $result) {
return $this->invokeLDAPMethod('next_entry', $link, $result);
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index 3f74551eaec..ef5c09393b8 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -209,7 +209,7 @@ class Test_Access extends \Test\TestCase {
public function testStringResemblesDNLDAPmod() {
list($lw, $con, $um) = $this->getConnectorAndLdapMock();
- $lw = new \OCA\user_ldap\lib\LDAP();
+ $lw = new \OCA\User_LDAP\LDAP();
$access = new Access($con, $lw, $um);
if(!function_exists('ldap_explode_dn')) {
diff --git a/apps/user_ldap/tests/integration/abstractintegrationtest.php b/apps/user_ldap/tests/integration/abstractintegrationtest.php
index ff9bc9b46e7..73b4d6667d7 100644
--- a/apps/user_ldap/tests/integration/abstractintegrationtest.php
+++ b/apps/user_ldap/tests/integration/abstractintegrationtest.php
@@ -23,7 +23,7 @@ namespace OCA\user_ldap\tests\integration;
use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\Connection;
-use OCA\user_ldap\lib\LDAP;
+use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\User\Manager;
abstract class AbstractIntegrationTest {
diff --git a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php b/apps/user_ldap/tests/integration/exceptionOnLostConnection.php
index 4813bd9ff5e..007c1116d05 100644
--- a/apps/user_ldap/tests/integration/exceptionOnLostConnection.php
+++ b/apps/user_ldap/tests/integration/exceptionOnLostConnection.php
@@ -20,7 +20,7 @@
*/
use OC\ServerNotAvailableException;
-use OCA\user_ldap\lib\LDAP;
+use OCA\User_LDAP\LDAP;
/**
* Class ExceptionOnLostConnection
@@ -51,7 +51,7 @@ class ExceptionOnLostConnection {
/** @var string */
private $ldapHost;
- /** @var OCA\user_ldap\lib\LDAP */
+ /** @var \OCA\User_LDAP\LDAP */
private $ldap;
/** @var bool */
--
GitLab