Type some of the core mappers

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

diff --git a/apps/contactsinteraction/lib/Db/RecentContactMapper.php b/apps/contactsinteraction/lib/Db/RecentContactMapper.php
index 19cd30ea701bb5655d903263557b5e216490376c..40605d130ff61feec7329d1c558327a18dc2c954 100644 (file)
--- 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<RecentContact>
+ */
 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 48c3fd6a84d4cc729eb65da8b327d33161747939..84972a5171a6f19ed635ecf681de9b9d4df90b06 100644 (file)
--- 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<BackupCode>
+ */
 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 e51033ed1df622a9f88d463b386ca5524dbde1df..40d503772b02bf889db8cf7e2310fba09513bc00 100644 (file)
--- 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<DefaultToken>
+ */
 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 e05325fec30aa171105954b4b525fc013d7636bc..11d610bc28370ea816147c3911ed2bff21647ec4 100644 (file)
--- 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<PublicKeyToken>
+ */
 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 a6498ca99232ee4662f5f5e2bc7dbe93dede7570..df50da2f03a46d51fe908fbfacee117aa08876c0 100644 (file)
--- 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 9c436b38b5d40072ee38ef6c87bfa2f1dfd20498..e0f06db565d99bb378b03c12cee52ad04942e48a 100644 (file)
--- 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<PublicKeyCredentialEntity>
+ */
 class PublicKeyCredentialMapper extends QBMapper {
        public function __construct(IDBConnection $db) {
                parent::__construct($db, 'webauthn', PublicKeyCredentialEntity::class);