From 6ac2b8d83f95974d2ed4c0abf926cefbe8944cec Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 12 Sep 2016 14:06:02 +0200
Subject: [PATCH] Fix twofactor_backupcodes
---
apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php | 4 ++--
.../tests/Integration/Db/BackupCodeMapperTest.php | 5 ++---
.../tests/Integration/Service/BackupCodeStorageTest.php | 3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
index 3d7240fd6ac..8acdfa45aae 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
@@ -38,7 +38,7 @@ class BackupCodeMapper extends Mapper {
* @return BackupCode[]
*/
public function getBackupCodes(IUser $user) {
- /* @var $qb IQueryBuilder */
+ /* @var IQueryBuilder $qb */
$qb = $this->db->getQueryBuilder();
$qb->select('id', 'user_id', 'code', 'used')
@@ -55,7 +55,7 @@ class BackupCodeMapper extends Mapper {
}
public function deleteCodes(IUser $user) {
- /* @var $qb IQueryBuilder */
+ /* @var IQueryBuilder $qb */
$qb = $this->db->getQueryBuilder();
$qb->delete('twofactor_backup_codes')
diff --git a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
index 5d7d71dd17a..bb97f929d7a 100644
--- a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
+++ b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
@@ -22,7 +22,6 @@
namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Db;
-use OC;
use OCA\TwoFactor_BackupCodes\Db\BackupCode;
use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
use OCP\IDBConnection;
@@ -53,8 +52,8 @@ class BackupCodeMapperTest extends TestCase {
protected function setUp() {
parent::setUp();
- $this->db = OC::$server->getDatabaseConnection();
- $this->mapper = OC::$server->query(BackupCodeMapper::class);
+ $this->db = \OC::$server->getDatabaseConnection();
+ $this->mapper = \OC::$server->query(BackupCodeMapper::class);
$this->resetDB();
}
diff --git a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
index 5517af5ce0d..934c44fb0db 100644
--- a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
+++ b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
@@ -22,7 +22,6 @@
namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Service;
-use OC;
use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
use Test\TestCase;
@@ -40,7 +39,7 @@ class BackupCodeStorageTest extends TestCase {
protected function setUp() {
parent::setUp();
- $this->storage = OC::$server->query(BackupCodeStorage::class);
+ $this->storage = \OC::$server->query(BackupCodeStorage::class);
}
public function testSimpleWorkFlow() {
--
GitLab