mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move LDAP to PSR-4

This commit is contained in:
Joas Schilling 2016-05-12 16:21:28 +02:00
parent 5b3087d375
commit 3690ce1b36
No known key found for this signature in database
GPG Key ID: 70A0B324C41C0946
13 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/ajax/getConfiguration.php
View File

@ -28,6 +28,6 @@ OCP\JSON::checkAppEnabled('user_ldap');
OCP\JSON::callCheck(); OCP\JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser']; $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); $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix);
OCP\JSON::success(array('configuration' => $connection->getConfiguration())); OCP\JSON::success(array('configuration' => $connection->getConfiguration()));

2
apps/user_ldap/ajax/setConfiguration.php
View File

@ -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 = new \OCA\user_ldap\lib\Connection($ldapWrapper, $prefix);
$connection->setConfiguration($_POST); $connection->setConfiguration($_POST);
$connection->saveConfiguration(); $connection->saveConfiguration();

2
apps/user_ldap/ajax/testConfiguration.php
View File

@ -30,7 +30,7 @@ OCP\JSON::callCheck();
$l = \OC::$server->getL10N('user_ldap'); $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); $connection = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null);
//needs to be true, otherwise it will also fail with an irritating message //needs to be true, otherwise it will also fail with an irritating message
$_POST['ldap_configuration_active'] = 1; $_POST['ldap_configuration_active'] = 1;

2
apps/user_ldap/ajax/wizard.php
View File

@ -41,7 +41,7 @@ if(!isset($_POST['ldap_serverconfig_chooser'])) {
} }
$prefix = (string)$_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); $configuration = new \OCA\user_ldap\lib\Configuration($prefix);
$con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null); $con = new \OCA\user_ldap\lib\Connection($ldapWrapper, '', null);

2
apps/user_ldap/appinfo/app.php
View File

@ -29,7 +29,7 @@ OCP\App::registerAdmin('user_ldap', 'settings');
$helper = new \OCA\user_ldap\lib\Helper(); $helper = new \OCA\user_ldap\lib\Helper();
$configPrefixes = $helper->getServerConfigurationPrefixes(true); $configPrefixes = $helper->getServerConfigurationPrefixes(true);
$ldapWrapper = new OCA\user_ldap\lib\LDAP(); $ldapWrapper = new OCA\User_LDAP\LDAP();
$ocConfig = \OC::$server->getConfig(); $ocConfig = \OC::$server->getConfig();
if(count($configPrefixes) === 1) { if(count($configPrefixes) === 1) {
$dbc = \OC::$server->getDatabaseConnection(); $dbc = \OC::$server->getDatabaseConnection();

2
apps/user_ldap/appinfo/register_command.php
View File

@ -22,7 +22,7 @@
*/ */
use OCA\user_ldap\lib\Helper; 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\User_Proxy;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\User_LDAP\User\DeletedUsersIndex; use OCA\User_LDAP\User\DeletedUsersIndex;

2
apps/user_ldap/lib/Command/Search.php
View File

@ -31,7 +31,7 @@ use Symfony\Component\Console\Output\OutputInterface;
use OCA\User_LDAP\User_Proxy; use OCA\User_LDAP\User_Proxy;
use OCA\User_LDAP\Group_Proxy; use OCA\User_LDAP\Group_Proxy;
use OCA\user_ldap\lib\Helper; use OCA\user_ldap\lib\Helper;
use OCA\user_ldap\lib\LDAP; use OCA\User_LDAP\LDAP;
use OCP\IConfig; use OCP\IConfig;
class Search extends Command { class Search extends Command {

2
apps/user_ldap/lib/Command/TestConfig.php
View File

@ -71,7 +71,7 @@ class TestConfig extends Command {
* @return int * @return int
*/ */
protected function testConfig($configID) { protected function testConfig($configID) {
$lw = new \OCA\user_ldap\lib\LDAP(); $lw = new \OCA\User_LDAP\LDAP();
$connection = new Connection($lw, $configID); $connection = new Connection($lw, $configID);
//ensure validation is run before we attempt the bind //ensure validation is run before we attempt the bind

2
apps/user_ldap/lib/Jobs/CleanUp.php
View File

@ -26,7 +26,7 @@ use \OC\BackgroundJob\TimedJob;
use \OCA\user_ldap\User_LDAP; use \OCA\user_ldap\User_LDAP;
use \OCA\User_LDAP\User_Proxy; use \OCA\User_LDAP\User_Proxy;
use \OCA\user_ldap\lib\Helper; 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\User\DeletedUsersIndex;
use \OCA\User_LDAP\Mapping\UserMapping; use \OCA\User_LDAP\Mapping\UserMapping;

5
apps/user_ldap/lib/ldap.php → apps/user_ldap/lib/LDAP.php
View File

@ -24,9 +24,10 @@
* *
*/ */
namespace OCA\user_ldap\lib; namespace OCA\User_LDAP;
use OC\ServerNotAvailableException; use OC\ServerNotAvailableException;
use OCA\user_ldap\lib\ILDAPWrapper;
class LDAP implements ILDAPWrapper { class LDAP implements ILDAPWrapper {
protected $curFunc = ''; protected $curFunc = '';
@ -160,7 +161,7 @@ class LDAP implements ILDAPWrapper {
/** /**
* @param LDAP $link * @param LDAP $link
* @param resource $result * @param resource $result
* @return mixed|an * @return mixed
*/ */
public function nextEntry($link, $result) { public function nextEntry($link, $result) {
return $this->invokeLDAPMethod('next_entry', $link, $result); return $this->invokeLDAPMethod('next_entry', $link, $result);

2
apps/user_ldap/tests/access.php
View File

@ -209,7 +209,7 @@ class Test_Access extends \Test\TestCase {
public function testStringResemblesDNLDAPmod() { public function testStringResemblesDNLDAPmod() {
list($lw, $con, $um) = $this->getConnectorAndLdapMock(); 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); $access = new Access($con, $lw, $um);
if(!function_exists('ldap_explode_dn')) { if(!function_exists('ldap_explode_dn')) {

2
apps/user_ldap/tests/integration/abstractintegrationtest.php
View File

@ -23,7 +23,7 @@ namespace OCA\user_ldap\tests\integration;
use OCA\user_ldap\lib\Access; use OCA\user_ldap\lib\Access;
use OCA\user_ldap\lib\Connection; use OCA\user_ldap\lib\Connection;
use OCA\user_ldap\lib\LDAP; use OCA\User_LDAP\LDAP;
use OCA\User_LDAP\User\Manager; use OCA\User_LDAP\User\Manager;
abstract class AbstractIntegrationTest { abstract class AbstractIntegrationTest {

4
apps/user_ldap/tests/integration/exceptionOnLostConnection.php
View File

@ -20,7 +20,7 @@
*/ */
use OC\ServerNotAvailableException; use OC\ServerNotAvailableException;
use OCA\user_ldap\lib\LDAP; use OCA\User_LDAP\LDAP;
/** /**
* Class ExceptionOnLostConnection * Class ExceptionOnLostConnection
@ -51,7 +51,7 @@ class ExceptionOnLostConnection {
/** @var string */ /** @var string */
private $ldapHost; private $ldapHost;
/** @var OCA\user_ldap\lib\LDAP */ /** @var \OCA\User_LDAP\LDAP */
private $ldap; private $ldap;
/** @var bool */ /** @var bool */