From 2664c7f75fb0008356c6ab03aba991db4c445860 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 9 Oct 2020 14:33:17 +0200 Subject: [PATCH] Type some of the core mappers Signed-off-by: Christoph Wurst --- apps/contactsinteraction/lib/Db/RecentContactMapper.php | 3 +++ apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php | 3 +++ lib/private/Authentication/Token/DefaultTokenMapper.php | 3 +++ lib/private/Authentication/Token/PublicKeyTokenMapper.php | 3 +++ lib/private/Authentication/Token/PublicKeyTokenProvider.php | 2 +- .../Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php | 3 +++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/contactsinteraction/lib/Db/RecentContactMapper.php b/apps/contactsinteraction/lib/Db/RecentContactMapper.php index 19cd30ea70..40605d130f 100644 --- a/apps/contactsinteraction/lib/Db/RecentContactMapper.php +++ b/apps/contactsinteraction/lib/Db/RecentContactMapper.php @@ -30,6 +30,9 @@ use OCP\AppFramework\Db\QBMapper; use OCP\IDBConnection; use OCP\IUser; +/** + * @template-extends QBMapper + */ class RecentContactMapper extends QBMapper { public const TABLE_NAME = 'recent_contact'; diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php index 48c3fd6a84..84972a5171 100644 --- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php +++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php @@ -30,6 +30,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; use OCP\IUser; +/** + * @template-extends QBMapper + */ class BackupCodeMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'twofactor_backupcodes'); diff --git a/lib/private/Authentication/Token/DefaultTokenMapper.php b/lib/private/Authentication/Token/DefaultTokenMapper.php index e51033ed1d..40d503772b 100644 --- a/lib/private/Authentication/Token/DefaultTokenMapper.php +++ b/lib/private/Authentication/Token/DefaultTokenMapper.php @@ -35,6 +35,9 @@ use OCP\AppFramework\Db\QBMapper; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class DefaultTokenMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'authtoken'); diff --git a/lib/private/Authentication/Token/PublicKeyTokenMapper.php b/lib/private/Authentication/Token/PublicKeyTokenMapper.php index e05325fec3..11d610bc28 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenMapper.php +++ b/lib/private/Authentication/Token/PublicKeyTokenMapper.php @@ -32,6 +32,9 @@ use OCP\AppFramework\Db\QBMapper; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class PublicKeyTokenMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'authtoken'); diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php index a6498ca992..df50da2f03 100644 --- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php +++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php @@ -219,7 +219,7 @@ class PublicKeyTokenProvider implements IProvider { $activityInterval = $this->config->getSystemValueInt('token_auth_activity_update', 60); $activityInterval = min(max($activityInterval, 0), 300); - /** @var DefaultToken $token */ + /** @var PublicKeyToken $token */ $now = $this->time->getTime(); if ($token->getLastActivity() < ($now - $activityInterval)) { // Update token only once per minute diff --git a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php index 9c436b38b5..e0f06db565 100644 --- a/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php +++ b/lib/private/Authentication/WebAuthn/Db/PublicKeyCredentialMapper.php @@ -30,6 +30,9 @@ use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\QBMapper; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class PublicKeyCredentialMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class);