From 410db0323ee0b1dad6463e5a0fcbf643ca338fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 5 Dec 2023 16:53:54 +0100
Subject: [PATCH] fix: Avoid undefined variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Db/BoardMapper.php                        | 55 +++++++------------
 .../database/AssignmentMapperTest.php         |  7 +++
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/lib/Db/BoardMapper.php b/lib/Db/BoardMapper.php
index 88613fb30..eec9ce901 100644
--- a/lib/Db/BoardMapper.php
+++ b/lib/Db/BoardMapper.php
@@ -23,10 +23,10 @@
 
 namespace OCA\Deck\Db;
 
-use OC\Cache\CappedMemoryCache;
 use OCA\Deck\Service\CirclesService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\QBMapper;
+use OCP\Cache\CappedMemoryCache;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IGroupManager;
@@ -35,37 +35,22 @@
 
 /** @template-extends QBMapper<Board> */
 class BoardMapper extends QBMapper implements IPermissionMapper {
-	private $labelMapper;
-	private $aclMapper;
-	private $stackMapper;
-	private $userManager;
-	private $groupManager;
-	private $circlesService;
-	private $logger;
-
 	/** @var CappedMemoryCache<Board[]> */
-	private $userBoardCache;
+	private CappedMemoryCache $userBoardCache;
 	/** @var CappedMemoryCache<Board> */
-	private $boardCache;
+	private CappedMemoryCache $boardCache;
 
 	public function __construct(
 		IDBConnection $db,
-		LabelMapper $labelMapper,
-		AclMapper $aclMapper,
-		StackMapper $stackMapper,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		CirclesService $circlesService,
-		LoggerInterface $logger
+		private LabelMapper $labelMapper,
+		private AclMapper $aclMapper,
+		private StackMapper $stackMapper,
+		private IUserManager $userManager,
+		private IGroupManager $groupManager,
+		private CirclesService $circlesService,
+		private LoggerInterface $logger
 	) {
 		parent::__construct($db, 'deck_boards', Board::class);
-		$this->labelMapper = $labelMapper;
-		$this->aclMapper = $aclMapper;
-		$this->stackMapper = $stackMapper;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->circlesService = $circlesService;
-		$this->logger = $logger;
 
 		$this->userBoardCache = new CappedMemoryCache();
 		$this->boardCache = new CappedMemoryCache();
@@ -81,7 +66,8 @@ public function __construct(
 	 * @throws DoesNotExistException
 	 */
 	public function find(int $id, bool $withLabels = false, bool $withAcl = false, bool $allowDeleted = false): Board {
-		if (!isset($this->boardCache[$id])) {
+		$cacheKey = (string)$id;
+		if (!isset($this->boardCache[$cacheKey])) {
 			$qb = $this->db->getQueryBuilder();
 			$deletedWhere = $allowDeleted ? $qb->expr()->gte('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)) : $qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT));
 			$qb->select('*')
@@ -89,22 +75,22 @@ public function find(int $id, bool $withLabels = false, bool $withAcl = false, b
 				->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
 				->andWhere($deletedWhere)
 				->orderBy('id');
-			$this->boardCache[$id] = $this->findEntity($qb);
+			$this->boardCache[(string)$id] = $this->findEntity($qb);
 		}
 
 		// Add labels
-		if ($withLabels && $this->boardCache[$id]->getLabels() === null) {
+		if ($withLabels && $this->boardCache[$cacheKey]->getLabels() === null) {
 			$labels = $this->labelMapper->findAll($id);
-			$this->boardCache[$id]->setLabels($labels);
+			$this->boardCache[$cacheKey]->setLabels($labels);
 		}
 
 		// Add acl
-		if ($withAcl && $this->boardCache[$id]->getAcl() === null) {
+		if ($withAcl && $this->boardCache[$cacheKey]->getAcl() === null) {
 			$acl = $this->aclMapper->findAll($id);
-			$this->boardCache[$id]->setAcl($acl);
+			$this->boardCache[$cacheKey]->setAcl($acl);
 		}
 
-		return $this->boardCache[$id];
+		return $this->boardCache[$cacheKey];
 	}
 
 	public function findBoardIds(string $userId): array {
@@ -464,8 +450,7 @@ public function findBoardId($id): ?int {
 	}
 
 	public function mapAcl(Acl &$acl) {
-		$groupManager = $this->groupManager;
-		$acl->resolveRelation('participant', function ($participant) use (&$acl, &$userManager, &$groupManager) {
+		$acl->resolveRelation('participant', function ($participant) use (&$acl) {
 			if ($acl->getType() === Acl::PERMISSION_TYPE_USER) {
 				if ($this->userManager->userExists($acl->getParticipant())) {
 					return new User($acl->getParticipant(), $this->userManager);
@@ -474,7 +459,7 @@ public function mapAcl(Acl &$acl) {
 				return null;
 			}
 			if ($acl->getType() === Acl::PERMISSION_TYPE_GROUP) {
-				$group = $groupManager->get($participant);
+				$group = $this->groupManager->get($participant);
 				if ($group !== null) {
 					return new Group($group);
 				}
diff --git a/tests/integration/database/AssignmentMapperTest.php b/tests/integration/database/AssignmentMapperTest.php
index 9b9f08070..e2c2119e2 100644
--- a/tests/integration/database/AssignmentMapperTest.php
+++ b/tests/integration/database/AssignmentMapperTest.php
@@ -55,6 +55,13 @@ class AssignmentMapperTest extends \Test\TestCase {
 	/** @var AssignmentService */
 	private $assignmentService;
 
+	/** @var Board */
+	private $board;
+	/** @var Card[] */
+	private $cards;
+	/** @var Stack[] */
+	private $stacks;
+
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();