Move Group_LDAP and Group_Proxy to PSR-4
This commit is contained in:
parent
4ac283ecd3
commit
cbba55a26c
|
@ -47,12 +47,12 @@ if(count($configPrefixes) === 1) {
|
||||||
$ldapAccess->setUserMapper(new OCA\User_LDAP\Mapping\UserMapping($dbc));
|
$ldapAccess->setUserMapper(new OCA\User_LDAP\Mapping\UserMapping($dbc));
|
||||||
$ldapAccess->setGroupMapper(new OCA\User_LDAP\Mapping\GroupMapping($dbc));
|
$ldapAccess->setGroupMapper(new OCA\User_LDAP\Mapping\GroupMapping($dbc));
|
||||||
$userBackend = new OCA\user_ldap\USER_LDAP($ldapAccess, $ocConfig);
|
$userBackend = new OCA\user_ldap\USER_LDAP($ldapAccess, $ocConfig);
|
||||||
$groupBackend = new OCA\user_ldap\GROUP_LDAP($ldapAccess);
|
$groupBackend = new \OCA\User_LDAP\Group_LDAP($ldapAccess);
|
||||||
} else if(count($configPrefixes) > 1) {
|
} else if(count($configPrefixes) > 1) {
|
||||||
$userBackend = new OCA\user_ldap\User_Proxy(
|
$userBackend = new OCA\user_ldap\User_Proxy(
|
||||||
$configPrefixes, $ldapWrapper, $ocConfig
|
$configPrefixes, $ldapWrapper, $ocConfig
|
||||||
);
|
);
|
||||||
$groupBackend = new OCA\user_ldap\Group_Proxy($configPrefixes, $ldapWrapper);
|
$groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($configPrefixes) > 0) {
|
if(count($configPrefixes) > 0) {
|
||||||
|
|
|
@ -29,7 +29,7 @@ use Symfony\Component\Console\Input\InputOption;
|
||||||
use Symfony\Component\Console\Output\OutputInterface;
|
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\lib\LDAP;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
|
|
|
@ -32,12 +32,12 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\user_ldap;
|
namespace OCA\User_LDAP;
|
||||||
|
|
||||||
use OCA\user_ldap\lib\Access;
|
use OCA\user_ldap\lib\Access;
|
||||||
use OCA\user_ldap\lib\BackendUtility;
|
use OCA\user_ldap\lib\BackendUtility;
|
||||||
|
|
||||||
class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
class Group_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
protected $enabled = false;
|
protected $enabled = false;
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -22,7 +22,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\user_ldap;
|
namespace OCA\User_LDAP;
|
||||||
|
|
||||||
use OCA\user_ldap\lib\ILDAPWrapper;
|
use OCA\user_ldap\lib\ILDAPWrapper;
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
|
||||||
parent::__construct($ldap);
|
parent::__construct($ldap);
|
||||||
foreach($serverConfigPrefixes as $configPrefix) {
|
foreach($serverConfigPrefixes as $configPrefix) {
|
||||||
$this->backends[$configPrefix] =
|
$this->backends[$configPrefix] =
|
||||||
new \OCA\user_ldap\GROUP_LDAP($this->getAccess($configPrefix));
|
new \OCA\User_LDAP\Group_LDAP($this->getAccess($configPrefix));
|
||||||
if(is_null($this->refBackend)) {
|
if(is_null($this->refBackend)) {
|
||||||
$this->refBackend = &$this->backends[$configPrefix];
|
$this->refBackend = &$this->backends[$configPrefix];
|
||||||
}
|
}
|
|
@ -158,7 +158,7 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \OCA\user_ldap\GROUP_LDAP|\OCA\user_ldap\Group_Proxy
|
* @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy
|
||||||
*/
|
*/
|
||||||
static private function getGroupBE() {
|
static private function getGroupBE() {
|
||||||
if(!is_null(self::$groupBE)) {
|
if(!is_null(self::$groupBE)) {
|
||||||
|
@ -184,9 +184,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
|
||||||
$userMapper = new UserMapping($dbc);
|
$userMapper = new UserMapping($dbc);
|
||||||
$ldapAccess->setGroupMapper($groupMapper);
|
$ldapAccess->setGroupMapper($groupMapper);
|
||||||
$ldapAccess->setUserMapper($userMapper);
|
$ldapAccess->setUserMapper($userMapper);
|
||||||
self::$groupBE = new \OCA\user_ldap\GROUP_LDAP($ldapAccess);
|
self::$groupBE = new \OCA\User_LDAP\Group_LDAP($ldapAccess);
|
||||||
} else {
|
} else {
|
||||||
self::$groupBE = new \OCA\user_ldap\Group_Proxy($configPrefixes, $ldapWrapper);
|
self::$groupBE = new \OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::$groupBE;
|
return self::$groupBE;
|
||||||
|
|
|
@ -24,21 +24,21 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\user_ldap\tests;
|
namespace OCA\User_LDAP\Tests;
|
||||||
|
|
||||||
use \OCA\user_ldap\GROUP_LDAP as GroupLDAP;
|
use OCA\User_LDAP\Group_LDAP as GroupLDAP;
|
||||||
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\ILDAPWrapper;
|
use \OCA\user_ldap\lib\ILDAPWrapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Test_Group_Ldap
|
* Class GroupLDAPTest
|
||||||
*
|
*
|
||||||
* @group DB
|
* @group DB
|
||||||
*
|
*
|
||||||
* @package OCA\user_ldap\tests
|
* @package OCA\user_ldap\tests
|
||||||
*/
|
*/
|
||||||
class Test_Group_Ldap extends \Test\TestCase {
|
class GroupLDAPTest extends \Test\TestCase {
|
||||||
private function getAccessMock() {
|
private function getAccessMock() {
|
||||||
static $conMethods;
|
static $conMethods;
|
||||||
static $accMethods;
|
static $accMethods;
|
||||||
|
@ -325,7 +325,7 @@ class Test_Group_Ldap extends \Test\TestCase {
|
||||||
* tests that a user listing is complete, if all it's members have the group
|
* tests that a user listing is complete, if all it's members have the group
|
||||||
* as their primary.
|
* as their primary.
|
||||||
*/
|
*/
|
||||||
public function testUsersInGroupPrimaryMembersOnly() {
|
public function testUsersInGroupPrimaryMembersOnly() {
|
||||||
$access = $this->getAccessMock();
|
$access = $this->getAccessMock();
|
||||||
$this->enableGroups($access);
|
$this->enableGroups($access);
|
||||||
|
|
||||||
|
@ -360,7 +360,7 @@ class Test_Group_Ldap extends \Test\TestCase {
|
||||||
* tests that a user counting is complete, if all it's members have the group
|
* tests that a user counting is complete, if all it's members have the group
|
||||||
* as their primary.
|
* as their primary.
|
||||||
*/
|
*/
|
||||||
public function testCountUsersInGroupPrimaryMembersOnly() {
|
public function testCountUsersInGroupPrimaryMembersOnly() {
|
||||||
$access = $this->getAccessMock();
|
$access = $this->getAccessMock();
|
||||||
$this->enableGroups($access);
|
$this->enableGroups($access);
|
||||||
|
|
|
@ -46,8 +46,8 @@ $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
|
||||||
|
|
||||||
if (\OC_App::isEnabled('user_ldap')) {
|
if (\OC_App::isEnabled('user_ldap')) {
|
||||||
$isLDAPUsed =
|
$isLDAPUsed =
|
||||||
$groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP')
|
$groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP')
|
||||||
|| $groupManager->isBackendUsed('\OCA\user_ldap\Group_Proxy');
|
|| $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
|
||||||
if ($isLDAPUsed) {
|
if ($isLDAPUsed) {
|
||||||
// LDAP user count can be slow, so we sort by group name here
|
// LDAP user count can be slow, so we sort by group name here
|
||||||
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
|
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;
|
||||||
|
|
Loading…
Reference in New Issue