From 49a4f2fd61b0e9fe0b153b9543f7185fa808da74 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma <roeland@famdouma.nl> Date: Mon, 14 Jan 2019 15:50:04 +0100 Subject: [PATCH] Switch to QBMapper Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> --- .../twofactor_backupcodes/lib/Db/BackupCodeMapper.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php index 03fe7bb5ec8..20a1134cff3 100644 --- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php +++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php @@ -22,11 +22,12 @@ namespace OCA\TwoFactorBackupCodes\Db; use OCP\AppFramework\Db\Mapper; +use OCP\AppFramework\Db\QBMapper; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\IUser; -class BackupCodeMapper extends Mapper { +class BackupCodeMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'twofactor_backupcodes'); @@ -43,14 +44,8 @@ class BackupCodeMapper extends Mapper { $qb->select('id', 'user_id', 'code', 'used') ->from('twofactor_backupcodes') ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID()))); - $result = $qb->execute(); - $rows = $result->fetchAll(); - $result->closeCursor(); - - return array_map(function ($row) { - return BackupCode::fromRow($row); - }, $rows); + return self::findEntities($qb); } /** -- GitLab