From f2278226276d41ac8f44b4e85d1e9f426383a1a1 Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Fri, 9 Oct 2020 14:35:16 +0200 Subject: [PATCH] Type the QB mappers with the entity template Signed-off-by: Christoph Wurst --- .github/workflows/static-analysis.yml | 2 +- composer.json | 2 +- composer.lock | 12 ++++++------ lib/Db/AliasMapper.php | 3 +++ lib/Db/ClassifierMapper.php | 3 +++ lib/Db/CollectedAddressMapper.php | 3 +++ lib/Db/LocalAttachmentMapper.php | 3 +++ lib/Db/MailAccountMapper.php | 3 +++ lib/Db/MailboxMapper.php | 3 +++ lib/Db/MessageMapper.php | 3 +++ 10 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index a9b50176d0..7cafcfa545 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ 'dev-master', 'v20.0.0' ] + ocp-version: [ 'dev-master', 'v20.0.1' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout diff --git a/composer.json b/composer.json index 5ae9dc7be5..4c5ffc5d19 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ }, "require-dev": { "roave/security-advisories": "dev-master", - "christophwurst/nextcloud": "v20.0.0", + "christophwurst/nextcloud": "v20.0.1", "christophwurst/nextcloud_testing": "0.11.0", "nextcloud/coding-standard": "^0.3.0", "phan/phan": "^3.0", diff --git a/composer.lock b/composer.lock index 8ea00e48bb..8c25a9a2e7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e90ec6bdc9b16ad25fcb48ce40ad2915", + "content-hash": "e6bfbff1b3683e9bb91809d93dc8e35b", "packages": [ { "name": "amphp/amp", @@ -2790,16 +2790,16 @@ "packages-dev": [ { "name": "christophwurst/nextcloud", - "version": "v20.0.0", + "version": "v20.0.1", "source": { "type": "git", "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "898b3b7feda1d8a761dffeaeda6fccace44eb649" + "reference": "1bcaddc55baef2e21ee1fecad8c189fe32b72bdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/898b3b7feda1d8a761dffeaeda6fccace44eb649", - "reference": "898b3b7feda1d8a761dffeaeda6fccace44eb649", + "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/1bcaddc55baef2e21ee1fecad8c189fe32b72bdf", + "reference": "1bcaddc55baef2e21ee1fecad8c189fe32b72bdf", "shasum": "" }, "require": { @@ -2822,7 +2822,7 @@ } ], "description": "Composer package containing Nextcloud's public API (classes, interfaces)", - "time": "2020-10-05T12:40:45+00:00" + "time": "2020-10-30T11:54:50+00:00" }, { "name": "christophwurst/nextcloud_testing", diff --git a/lib/Db/AliasMapper.php b/lib/Db/AliasMapper.php index 16a20b1365..8f84796f45 100644 --- a/lib/Db/AliasMapper.php +++ b/lib/Db/AliasMapper.php @@ -19,6 +19,9 @@ use OCP\IDBConnection; use function array_map; +/** + * @template-extends QBMapper + */ class AliasMapper extends QBMapper { /** diff --git a/lib/Db/ClassifierMapper.php b/lib/Db/ClassifierMapper.php index 4e93dbb8e8..f0bce09564 100644 --- a/lib/Db/ClassifierMapper.php +++ b/lib/Db/ClassifierMapper.php @@ -30,6 +30,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class ClassifierMapper extends QBMapper { public function __construct(IDBConnection $db) { parent::__construct($db, 'mail_classifiers'); diff --git a/lib/Db/CollectedAddressMapper.php b/lib/Db/CollectedAddressMapper.php index dc1bef609f..786f781fe9 100644 --- a/lib/Db/CollectedAddressMapper.php +++ b/lib/Db/CollectedAddressMapper.php @@ -27,6 +27,9 @@ use OCP\IDBConnection; use function array_map; +/** + * @template-extends QBMapper + */ class CollectedAddressMapper extends QBMapper { /** diff --git a/lib/Db/LocalAttachmentMapper.php b/lib/Db/LocalAttachmentMapper.php index d32374cb78..c8ccc3c36a 100644 --- a/lib/Db/LocalAttachmentMapper.php +++ b/lib/Db/LocalAttachmentMapper.php @@ -27,6 +27,9 @@ use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; +/** + * @template-extends QBMapper + */ class LocalAttachmentMapper extends QBMapper { /** diff --git a/lib/Db/MailAccountMapper.php b/lib/Db/MailAccountMapper.php index 8635113af7..5b4fec7568 100644 --- a/lib/Db/MailAccountMapper.php +++ b/lib/Db/MailAccountMapper.php @@ -33,6 +33,9 @@ use OCP\IDBConnection; use OCP\IUser; +/** + * @template-extends QBMapper + */ class MailAccountMapper extends QBMapper { /** diff --git a/lib/Db/MailboxMapper.php b/lib/Db/MailboxMapper.php index 5c528f0f77..13dd0a4453 100644 --- a/lib/Db/MailboxMapper.php +++ b/lib/Db/MailboxMapper.php @@ -23,6 +23,9 @@ * along with this program. If not, see . */ +/** + * @template-extends QBMapper + */ namespace OCA\Mail\Db; use OCA\Mail\Account; diff --git a/lib/Db/MessageMapper.php b/lib/Db/MessageMapper.php index 731557203d..0ff20f6706 100644 --- a/lib/Db/MessageMapper.php +++ b/lib/Db/MessageMapper.php @@ -44,6 +44,9 @@ use function ltrim; use function mb_substr; +/** + * @template-extends QBMapper + */ class MessageMapper extends QBMapper { /** @var ITimeFactory */