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

Move User_LDAP and User_Proxy to PSR-4

This commit is contained in:
Joas Schilling 2016-05-12 11:01:29 +02:00
parent cbba55a26c
commit b7fa527791
No known key found for this signature in database
GPG Key ID: 70A0B324C41C0946
19 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,10 @@ 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);

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

@ -23,7 +23,7 @@
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 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\lib\User\DeletedUsersIndex; use OCA\User_LDAP\lib\User\DeletedUsersIndex;

4
apps/user_ldap/lib/Command/CheckUser.php
View File

@ -31,10 +31,10 @@ use Symfony\Component\Console\Output\OutputInterface;
use OCA\User_LDAP\lib\User\DeletedUsersIndex; use OCA\User_LDAP\lib\User\DeletedUsersIndex;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\lib\Helper as LDAPHelper; use OCA\user_ldap\lib\Helper as LDAPHelper;
use OCA\user_ldap\User_Proxy; use OCA\User_LDAP\User_Proxy;
class CheckUser extends Command { class CheckUser extends Command {
/** @var \OCA\user_ldap\User_Proxy */ /** @var \OCA\User_LDAP\User_Proxy */
protected $backend; protected $backend;
/** @var \OCA\User_LDAP\lib\Helper */ /** @var \OCA\User_LDAP\lib\Helper */

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

@ -28,7 +28,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; 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;

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

@ -24,7 +24,7 @@ namespace OCA\User_LDAP\Jobs;
use \OC\BackgroundJob\TimedJob; 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\lib\LDAP;
use \OCA\user_ldap\lib\user\DeletedUsersIndex; use \OCA\user_ldap\lib\user\DeletedUsersIndex;

4
apps/user_ldap/user_ldap.php → apps/user_ldap/lib/User_LDAP.php
View File

@ -29,7 +29,7 @@
* *
*/ */
namespace OCA\user_ldap; namespace OCA\User_LDAP;
use OC\User\NoUserException; use OC\User\NoUserException;
use OCA\user_ldap\lib\BackendUtility; use OCA\user_ldap\lib\BackendUtility;
@ -38,7 +38,7 @@ use OCA\user_ldap\lib\user\OfflineUser;
use OCA\User_LDAP\lib\User\User; use OCA\User_LDAP\lib\User\User;
use OCP\IConfig; use OCP\IConfig;
class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserInterface { class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserInterface {
/** @var string[] $homesToKill */ /** @var string[] $homesToKill */
protected $homesToKill = array(); protected $homesToKill = array();

2
apps/user_ldap/user_proxy.php → apps/user_ldap/lib/User_Proxy.php
View File

@ -24,7 +24,7 @@
* *
*/ */
namespace OCA\user_ldap; namespace OCA\User_LDAP;
use OCA\user_ldap\lib\ILDAPWrapper; use OCA\user_ldap\lib\ILDAPWrapper;
use OCA\User_LDAP\lib\User\User; use OCA\User_LDAP\lib\User\User;

2
apps/user_ldap/lib/helper.php
View File

@ -27,7 +27,7 @@
namespace OCA\user_ldap\lib; namespace OCA\user_ldap\lib;
use OCA\user_ldap\User_Proxy; use OCA\User_LDAP\User_Proxy;
class Helper { class Helper {

8
apps/user_ldap/tests/user_ldap.php → apps/user_ldap/tests/User_LDAPTest.php
View File

@ -25,9 +25,9 @@
* *
*/ */
namespace OCA\user_ldap\tests; namespace OCA\User_LDAP\Tests;
use \OCA\user_ldap\USER_LDAP as UserLDAP; use OCA\User_LDAP\User_LDAP as UserLDAP;
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;
@ -37,9 +37,9 @@ use \OCA\user_ldap\lib\ILDAPWrapper;
* *
* @group DB * @group DB
* *
* @package OCA\user_ldap\tests * @package OCA\User_LDAP\Tests
*/ */
class Test_User_Ldap_Direct extends \Test\TestCase { class User_LDAPTest extends \Test\TestCase {
protected $backend; protected $backend;
protected $access; protected $access;
protected $configMock; protected $configMock;

4
apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php
View File

@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
use OCA\user_ldap\lib\user\Manager as LDAPUserManager; use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
use OCA\user_ldap\tests\integration\AbstractIntegrationTest; use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\USER_LDAP; use OCA\User_LDAP\User_LDAP;
require_once __DIR__ . '/../../../../../lib/base.php'; require_once __DIR__ . '/../../../../../lib/base.php';
@ -32,7 +32,7 @@ class IntegrationBackupServer extends AbstractIntegrationTest {
/** @var UserMapping */ /** @var UserMapping */
protected $mapping; protected $mapping;
/** @var USER_LDAP */ /** @var User_LDAP */
protected $backend; protected $backend;
/** /**

4
apps/user_ldap/tests/integration/lib/integrationtestconnect.php
View File

@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
use OCA\user_ldap\lib\user\Manager as LDAPUserManager; use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
use OCA\user_ldap\tests\integration\AbstractIntegrationTest; use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\USER_LDAP; use OCA\User_LDAP\User_LDAP;
require_once __DIR__ . '/../../../../../lib/base.php'; require_once __DIR__ . '/../../../../../lib/base.php';
@ -32,7 +32,7 @@ class IntegrationConnect extends AbstractIntegrationTest {
/** @var UserMapping */ /** @var UserMapping */
protected $mapping; protected $mapping;
/** @var USER_LDAP */ /** @var User_LDAP */
protected $backend; protected $backend;
/** @var string */ /** @var string */

2
apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php
View File

@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
use OCA\user_ldap\lib\user\Manager as LDAPUserManager; use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
use OCA\user_ldap\tests\integration\AbstractIntegrationTest; use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\USER_LDAP; use OCA\User_LDAP\User_LDAP;
require_once __DIR__ . '/../../../../../lib/base.php'; require_once __DIR__ . '/../../../../../lib/base.php';

6
apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php
View File

@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
use OCA\user_ldap\lib\user\Manager as LDAPUserManager; use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
use OCA\user_ldap\tests\integration\AbstractIntegrationTest; use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\USER_LDAP; use OCA\User_LDAP\User_LDAP;
require_once __DIR__ . '/../../../../../lib/base.php'; require_once __DIR__ . '/../../../../../lib/base.php';
@ -32,7 +32,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
/** @var UserMapping */ /** @var UserMapping */
protected $mapping; protected $mapping;
/** @var USER_LDAP */ /** @var User_LDAP */
protected $backend; protected $backend;
/** /**
@ -46,7 +46,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
$this->mapping->clear(); $this->mapping->clear();
$this->access->setUserMapper($this->mapping); $this->access->setUserMapper($this->mapping);
$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig()); $this->backend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
} }
/** /**

6
apps/user_ldap/tests/integration/lib/integrationtestpaging.php
View File

@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
use OCA\user_ldap\lib\user\Manager as LDAPUserManager; use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
use OCA\user_ldap\tests\integration\AbstractIntegrationTest; use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\USER_LDAP; use OCA\User_LDAP\User_LDAP;
require_once __DIR__ . '/../../../../../lib/base.php'; require_once __DIR__ . '/../../../../../lib/base.php';
@ -32,7 +32,7 @@ class IntegrationTestPaging extends AbstractIntegrationTest {
/** @var UserMapping */ /** @var UserMapping */
protected $mapping; protected $mapping;
/** @var USER_LDAP */ /** @var User_LDAP */
protected $backend; protected $backend;
/** /**
@ -43,7 +43,7 @@ class IntegrationTestPaging extends AbstractIntegrationTest {
require(__DIR__ . '/../setup-scripts/createExplicitUsers.php'); require(__DIR__ . '/../setup-scripts/createExplicitUsers.php');
parent::init(); parent::init();
$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig()); $this->backend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
} }
/** /**

6
apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
View File

@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests\integration\lib;
use OCA\user_ldap\lib\user\Manager as LDAPUserManager; use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
use OCA\user_ldap\tests\integration\AbstractIntegrationTest; use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
use OCA\User_LDAP\Mapping\UserMapping; use OCA\User_LDAP\Mapping\UserMapping;
use OCA\user_ldap\USER_LDAP; use OCA\User_LDAP\User_LDAP;
require_once __DIR__ . '/../../../../../lib/base.php'; require_once __DIR__ . '/../../../../../lib/base.php';
@ -32,7 +32,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
/** @var UserMapping */ /** @var UserMapping */
protected $mapping; protected $mapping;
/** @var USER_LDAP */ /** @var User_LDAP */
protected $backend; protected $backend;
/** /**
@ -46,7 +46,7 @@ class IntegrationTestUserHome extends AbstractIntegrationTest {
$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
$this->mapping->clear(); $this->mapping->clear();
$this->access->setUserMapper($this->mapping); $this->access->setUserMapper($this->mapping);
$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig()); $this->backend = new \OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
} }
/** /**

2
apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
View File

@ -40,7 +40,7 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest {
$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
$this->mapping->clear(); $this->mapping->clear();
$this->access->setUserMapper($this->mapping); $this->access->setUserMapper($this->mapping);
$userBackend = new OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig()); $userBackend = new OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
\OC_User::useBackend($userBackend); \OC_User::useBackend($userBackend);
} }

2
apps/user_ldap/tests/integration/lib/user/IntegrationTestUserDisplayName.php
View File

@ -38,7 +38,7 @@ class IntegrationTestUserDisplayName extends AbstractIntegrationTest {
$this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection());
$this->mapping->clear(); $this->mapping->clear();
$this->access->setUserMapper($this->mapping); $this->access->setUserMapper($this->mapping);
$userBackend = new OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig()); $userBackend = new OCA\User_LDAP\User_LDAP($this->access, \OC::$server->getConfig());
\OC_User::useBackend($userBackend); \OC_User::useBackend($userBackend);
} }

2
apps/user_ldap/tests/jobs/cleanup.php
View File

@ -26,7 +26,7 @@ class Test_CleanUp extends \PHPUnit_Framework_TestCase {
public function getMocks() { public function getMocks() {
$mocks = array(); $mocks = array();
$mocks['userBackend'] = $mocks['userBackend'] =
$this->getMockBuilder('\OCA\user_ldap\User_Proxy') $this->getMockBuilder('\OCA\User_LDAP\User_Proxy')
->disableOriginalConstructor() ->disableOriginalConstructor()
->getMock(); ->getMock();
$mocks['deletedUsersIndex'] = $mocks['deletedUsersIndex'] =

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

@ -27,7 +27,7 @@ namespace OCA\user_ldap\tests;
use \OCA\user_ldap\lib\Wizard; use \OCA\user_ldap\lib\Wizard;
// use \OCA\user_ldap\USER_LDAP as UserLDAP; // use \OCA\user_ldap\User_LDAP as UserLDAP;
// use \OCA\user_ldap\lib\Access; // use \OCA\user_ldap\lib\Access;
// use \OCA\user_ldap\lib\Configuration; // use \OCA\user_ldap\lib\Configuration;
// use \OCA\user_ldap\lib\ILDAPWrapper; // use \OCA\user_ldap\lib\ILDAPWrapper;