Merge pull request #49114 from nextcloud/fix/qbmapper/find-entities-r…

…eturn-type fix(QBMapper): Fix findEntities() return type to be list<T>
nextcloud · Nov 7, 2024 · c6002ed · c6002ed
2 parents 9290b85 + 2c65d0c
commit c6002ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/private/TaskProcessing/Db/TaskMapper.php b/lib/private/TaskProcessing/Db/TaskMapper.php
@@ -114,7 +114,7 @@ public function findByUserAndTaskType(?string $userId, ?string $taskType = null,
 		if ($customId !== null) {
 			$qb->andWhere($qb->expr()->eq('custom_id', $qb->createPositionalParameter($customId)));
 		}
-		return array_values($this->findEntities($qb));
+		return $this->findEntities($qb);
 	}
 
 	/**
@@ -133,7 +133,7 @@ public function findUserTasksByApp(?string $userId, string $appId, ?string $cust
 		if ($customId !== null) {
 			$qb->andWhere($qb->expr()->eq('custom_id', $qb->createPositionalParameter($customId)));
 		}
-		return array_values($this->findEntities($qb));
+		return $this->findEntities($qb);
 	}
 
 	/**
@@ -178,7 +178,7 @@ public function findTasks(
 			$qb->andWhere($qb->expr()->isNotNull('ended_at'));
 			$qb->andWhere($qb->expr()->lt('ended_at', $qb->createPositionalParameter($endedBefore, IQueryBuilder::PARAM_INT)));
 		}
-		return array_values($this->findEntities($qb));
+		return $this->findEntities($qb);
 	}
 
 	/**

diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
@@ -320,8 +320,8 @@ protected function mapRowToEntity(array $row): Entity {
 	 * Runs a sql query and returns an array of entities
 	 *
 	 * @param IQueryBuilder $query
-	 * @return Entity[] all fetched entities
-	 * @psalm-return T[] all fetched entities
+	 * @return list<Entity> all fetched entities
+	 * @psalm-return list<T> all fetched entities
 	 * @throws Exception
 	 * @since 14.0.0
 	 */