Do not use deprecated class anymore

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-12-14 11:45:50 +01:00
parent 8be4cb300f
commit a0662caf61
No known key found for this signature in database
GPG key ID: E166FD8976B3BAC8
3 changed files with 8 additions and 8 deletions

View file

@ -41,7 +41,7 @@ $userBackend = new \OCA\User_SAML\UserBackend(
$config,
$urlGenerator,
\OC::$server->getSession(),
\OC::$server->getDb()
\OC::$server->getDatabaseConnection()
);
$userBackend->registerBackends(\OC::$server->getUserManager()->getBackends());
OC_User::useBackend($userBackend);

View file

@ -23,7 +23,7 @@ namespace OCA\User_SAML;
use OCP\Authentication\IApacheBackend;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDb;
use OCP\IDBConnection;
use OCP\UserInterface;
use OCP\IUserBackend;
use OCP\IConfig;
@ -37,7 +37,7 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
private $urlGenerator;
/** @var ISession */
private $session;
/** @var IDb */
/** @var IDBConnection */
private $db;
/** @var \OCP\UserInterface[] */
private $backends;
@ -46,12 +46,12 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
* @param IConfig $config
* @param IURLGenerator $urlGenerator
* @param ISession $session
* @param IDb $db
* @param IDBConnection $db
*/
public function __construct(IConfig $config,
IURLGenerator $urlGenerator,
ISession $session,
IDb $db) {
IDBConnection $db) {
$this->config = $config;
$this->urlGenerator = $urlGenerator;
$this->session = $session;

View file

@ -23,7 +23,7 @@ namespace OCA\User_SAML\Tests\Settings;
use OCA\User_SAML\UserBackend;
use OCP\IConfig;
use OCP\IDb;
use OCP\IDBConnection;
use OCP\ISession;
use OCP\IURLGenerator;
use OCP\IUserBackend;
@ -36,7 +36,7 @@ class UserBackendTest extends TestCase {
private $urlGenerator;
/** @var ISession|\PHPUnit_Framework_MockObject_MockObject */
private $session;
/** @var IDb|\PHPUnit_Framework_MockObject_MockObject */
/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */
private $db;
/** @var IUserBackend|\PHPUnit_Framework_MockObject_MockObject */
private $userBackend;
@ -47,7 +47,7 @@ class UserBackendTest extends TestCase {
$this->config = $this->createMock(IConfig::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->session = $this->createMock(ISession::class);
$this->db = $this->createMock(IDb::class);
$this->db = $this->createMock(IDBConnection::class);
$this->userBackend = new UserBackend(
$this->config,