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

Move Group_LDAP and Group_Proxy to PSR-4

This commit is contained in:
Joas Schilling 2016-05-12 10:43:34 +02:00
parent 4ac283ecd3
commit cbba55a26c
No known key found for this signature in database
GPG Key ID: 70A0B324C41C0946
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,12 +47,12 @@ if(count($configPrefixes) === 1) {
$ldapAccess->setUserMapper(new OCA\User_LDAP\Mapping\UserMapping($dbc));
$ldapAccess->setGroupMapper(new OCA\User_LDAP\Mapping\GroupMapping($dbc));
$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) {
$userBackend = new OCA\user_ldap\User_Proxy(
$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) {

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

@ -29,7 +29,7 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
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\LDAP;
use OCP\IConfig;

4
apps/user_ldap/group_ldap.php → apps/user_ldap/lib/Group_LDAP.php
View File

@ -32,12 +32,12 @@
*
*/
namespace OCA\user_ldap;
namespace OCA\User_LDAP;
use OCA\user_ldap\lib\Access;
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;
/**

4
apps/user_ldap/group_proxy.php → apps/user_ldap/lib/Group_Proxy.php
View File

@ -22,7 +22,7 @@
*
*/
namespace OCA\user_ldap;
namespace OCA\User_LDAP;
use OCA\user_ldap\lib\ILDAPWrapper;
@ -38,7 +38,7 @@ class Group_Proxy extends lib\Proxy implements \OCP\GroupInterface {
parent::__construct($ldap);
foreach($serverConfigPrefixes as $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)) {
$this->refBackend = &$this->backends[$configPrefix];
}

6
apps/user_ldap/lib/jobs.php
View File

@ -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() {
if(!is_null(self::$groupBE)) {
@ -184,9 +184,9 @@ class Jobs extends \OC\BackgroundJob\TimedJob {
$userMapper = new UserMapping($dbc);
$ldapAccess->setGroupMapper($groupMapper);
$ldapAccess->setUserMapper($userMapper);
self::$groupBE = new \OCA\user_ldap\GROUP_LDAP($ldapAccess);
self::$groupBE = new \OCA\User_LDAP\Group_LDAP($ldapAccess);
} else {
self::$groupBE = new \OCA\user_ldap\Group_Proxy($configPrefixes, $ldapWrapper);
self::$groupBE = new \OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper);
}
return self::$groupBE;

12
apps/user_ldap/tests/group_ldap.php → apps/user_ldap/tests/GroupLDAPTest.php
View File

@ -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\Connection;
use \OCA\user_ldap\lib\ILDAPWrapper;
/**
* Class Test_Group_Ldap
* Class GroupLDAPTest
*
* @group DB
*
* @package OCA\user_ldap\tests
*/
class Test_Group_Ldap extends \Test\TestCase {
class GroupLDAPTest extends \Test\TestCase {
private function getAccessMock() {
static $conMethods;
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
* as their primary.
*/
public function testUsersInGroupPrimaryMembersOnly() {
public function testUsersInGroupPrimaryMembersOnly() {
$access = $this->getAccessMock();
$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
* as their primary.
*/
public function testCountUsersInGroupPrimaryMembersOnly() {
public function testCountUsersInGroupPrimaryMembersOnly() {
$access = $this->getAccessMock();
$this->enableGroups($access);

4
settings/users.php
View File

@ -46,8 +46,8 @@ $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
if (\OC_App::isEnabled('user_ldap')) {
$isLDAPUsed =
$groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP')
|| $groupManager->isBackendUsed('\OCA\user_ldap\Group_Proxy');
$groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP')
|| $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
if ($isLDAPUsed) {
// LDAP user count can be slow, so we sort by group name here
$sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME;