From 815b8597d17588b2884ef7547b496e9274ee8794 Mon Sep 17 00:00:00 2001
From: Raul <raul@nextcloud.com>
Date: Wed, 13 Apr 2022 12:39:39 +0200
Subject: [PATCH] Use `numeric` typehint instead of `int` to allow for numeric
 strings to be passed to find methods. Fixes the psalm check.

Signed-off-by: Raul <raul@nextcloud.com>
---
 lib/Db/AclMapper.php        |  8 ++++----
 lib/Db/AssignmentMapper.php |  3 ---
 lib/Db/LabelMapper.php      | 16 ++++++++--------
 lib/Db/StackMapper.php      | 12 ++++++------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/Db/AclMapper.php b/lib/Db/AclMapper.php
index 56b7cb5c0..45a3be468 100644
--- a/lib/Db/AclMapper.php
+++ b/lib/Db/AclMapper.php
@@ -35,7 +35,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $boardId
+	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Acl[]
@@ -53,8 +53,8 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $userId
-	 * @param int $aclId
+	 * @param numeric $userId
+	 * @param numeric $aclId
 	 * @return bool
 	 * @throws \OCP\DB\Exception
 	 */
@@ -70,7 +70,7 @@ class AclMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $id
+	 * @param numeric $id
 	 * @return int|null
 	 */
 	public function findBoardId($id): ?int {
diff --git a/lib/Db/AssignmentMapper.php b/lib/Db/AssignmentMapper.php
index fdbf80d85..98a2ead71 100644
--- a/lib/Db/AssignmentMapper.php
+++ b/lib/Db/AssignmentMapper.php
@@ -55,9 +55,6 @@ class AssignmentMapper extends QBMapper implements IPermissionMapper {
 		$this->circleService = $circleService;
 	}
 
-	/**
-	 * @return Assignment[]
-	 */
 	public function findAll(int $cardId): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
diff --git a/lib/Db/LabelMapper.php b/lib/Db/LabelMapper.php
index ba2d34cff..2dcf502c4 100644
--- a/lib/Db/LabelMapper.php
+++ b/lib/Db/LabelMapper.php
@@ -36,7 +36,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $boardId
+	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Label[]
@@ -65,7 +65,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $cardId
+	 * @param numeric $cardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Label[]
@@ -85,7 +85,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $boardId
+	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Label[]
@@ -130,7 +130,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $boardId
+	 * @param numeric $boardId
 	 * @return array
 	 * @throws \OCP\DB\Exception
 	 */
@@ -147,7 +147,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $labelId
+	 * @param numeric $labelId
 	 * @return void
 	 * @throws \OCP\DB\Exception
 	 */
@@ -159,7 +159,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $cardId
+	 * @param numeric $cardId
 	 * @return void
 	 * @throws \OCP\DB\Exception
 	 */
@@ -172,7 +172,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 
 	/**
 	 * @param string $userId
-	 * @param int $labelId
+	 * @param numeric $labelId
 	 * @return bool
 	 * @throws \OCP\DB\Exception
 	 */
@@ -188,7 +188,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $id
+	 * @param numeric $id
 	 * @return int|null
 	 */
 	public function findBoardId($id): ?int {
diff --git a/lib/Db/StackMapper.php b/lib/Db/StackMapper.php
index 9990ad6c5..66e3b0689 100644
--- a/lib/Db/StackMapper.php
+++ b/lib/Db/StackMapper.php
@@ -39,7 +39,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 
 
 	/**
-	 * @param int $id
+	 * @param numeric $id
 	 * @return Stack
 	 * @throws DoesNotExistException
 	 * @throws MultipleObjectsReturnedException
@@ -75,7 +75,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $boardId
+	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Stack[]
@@ -94,7 +94,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $boardId
+	 * @param numeric $boardId
 	 * @param int|null $limit
 	 * @param int|null $offset
 	 * @return Stack[]
@@ -124,8 +124,8 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param int $userId
-	 * @param int $stackId
+	 * @param numeric $userId
+	 * @param numeric $stackId
 	 * @return bool
 	 * @throws \OCP\DB\Exception
 	 */
@@ -141,7 +141,7 @@ class StackMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	/**
-	 * @param $id
+	 * @param numeric $id
 	 * @return int|null
 	 * @throws \OCP\DB\Exception
 	 */