fix(QueryBuilder): Make types even more strict

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

apps/dav/lib/DAV/Sharing/SharingMapper.php

@@ -164,7 +164,6 @@ public function getPrincipalUrisByPrefix(string $resourceType, string $prefix):
 			->andWhere($query->expr()->eq(
 				'type',
 				$query->createNamedParameter($resourceType, IQueryBuilder::PARAM_STR)),
-				IQueryBuilder::PARAM_STR,
 			)
 			->executeQuery();
 

lib/private/DB/QueryBuilder/QueryBuilder.php

@@ -290,7 +290,9 @@ public function setFirstResult(int $firstResult): self {
 
 	#[Override]
 	public function getFirstResult(): int {
-		return $this->queryBuilder->getFirstResult();
+		$firstResult = $this->queryBuilder->getFirstResult();
+		assert($firstResult >= 0);
+		return $firstResult;
 	}
 
 	#[Override]
@@ -306,7 +308,9 @@ public function setMaxResults(?int $maxResults): self {
 
 	#[Override]
 	public function getMaxResults(): ?int {
-		return $this->queryBuilder->getMaxResults();
+		$maxResult = $this->queryBuilder->getMaxResults();
+		assert($maxResult === null || $maxResult > 0);
+		return $maxResult;
 	}
 
 	#[Override]

lib/private/Share20/DefaultShareProvider.php

@@ -968,7 +968,7 @@ private function _getSharedWith(
 					->setFirstResult(0);
 
 				if ($limit !== -1) {
-					$qb->setMaxResults($limit - count($shares));
+					$qb->setMaxResults(max($limit - count($shares), 1));
 				}
 
 				// Filter by node if provided

lib/private/User/Manager.php

@@ -36,6 +36,7 @@
 use OCP\User\Events\UserCreatedEvent;
 use OCP\UserInterface;
 use OCP\Util;
+use Override;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -728,16 +729,10 @@ public function validateUserId(string $uid, bool $checkDataDirectory = false): v
 		}
 	}
 
-	/**
-	 * Gets the list of user ids sorted by lastLogin, from most recent to least recent
-	 *
-	 * @param int|null $limit how many users to fetch (default: 25, max: 100)
-	 * @param int $offset from which offset to fetch
-	 * @param string $search search users based on search params
-	 * @return list<string> list of user IDs
-	 */
+	#[Override]
 	public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
 		// We can't load all users who already logged in
+		/** @var int<1, 100> */
 		$limit = min(100, $limit ?: 25);
 
 		$connection = Server::get(IDBConnection::class);

lib/public/DB/QueryBuilder/IQueryBuilder.php

@@ -264,8 +264,8 @@ public function setParameter(string|int $key, mixed $value, string|null|int $typ
 	 *         ));
 	 * </code>
 	 *
-	 * @param array $params The query parameters to set.
-	 * @param array $types The query parameters types to set.
+	 * @param array<string|int, mixed> $params The query parameters to set.
+	 * @param array<string|int, self::PARAM_*> $types The query parameters types to set.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
@@ -293,7 +293,7 @@ public function getParameter(int|string $key): mixed;
 	/**
 	 * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
 	 *
-	 * @return list<self::PARAM_*> The currently defined query parameter types indexed by parameter index or name.
+	 * @return  array<string|int, self::PARAM_*> The currently defined query parameter types indexed by parameter index or name.
 	 * @since 8.2.0
 	 */
 	public function getParameterTypes(): array;
@@ -311,7 +311,7 @@ public function getParameterType(int|string $key): int|string;
 	/**
 	 * Sets the position of the first result to retrieve (the "offset").
 	 *
-	 * @param int $firstResult The first result to return.
+	 * @param non-negative-int $firstResult The first result to return.
 	 *
 	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
@@ -322,15 +322,15 @@ public function setFirstResult(int $firstResult): self;
 	 * Gets the position of the first result the query object was set to retrieve (the "offset").
 	 * Returns 0 if {@link setFirstResult} was not applied to this QueryBuilder.
 	 *
-	 * @return int The position of the first result.
+	 * @return non-negative-int The position of the first result.
 	 * @since 8.2.0
 	 */
 	public function getFirstResult(): int;
 
 	/**
 	 * Sets the maximum number of results to retrieve (the "limit").
 	 *
-	 * @param int|null $maxResults The maximum number of results to retrieve.
+	 * @param positive-int|null $maxResults The maximum number of results to retrieve.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
@@ -341,7 +341,7 @@ public function setMaxResults(?int $maxResults): self;
 	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
 	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
 	 *
-	 * @return int|null The maximum number of results.
+	 * @return positive-int|null The maximum number of results.
 	 * @since 8.2.0
 	 */
 	public function getMaxResults(): ?int;
@@ -357,14 +357,14 @@ public function getMaxResults(): ?int;
 	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
 	 * </code>
 	 *
-	 * @param mixed ...$selects The selection expressions.
+	 * @param string|list<string>|IQueryFunction|ILiteral ...$selects The selection expressions.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $selects
 	 */
-	public function select(...$selects): self;
+	public function select(mixed...$selects): self;
 
 	/**
 	 * Specifies an item that is to be returned with a different name in the query result.
@@ -416,14 +416,14 @@ public function selectDistinct(string|array $select): self;
 	 *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
 	 * </code>
 	 *
-	 * @param mixed ...$select The selection expression.
+	 * @param string|IParameter|IQueryFunction|ILiteral|list<string> ...$select The selection expression.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $select
 	 */
-	public function addSelect(...$select): self;
+	public function addSelect(mixed ...$select): self;
 
 	/**
 	 * Turns the query being built into a bulk delete query that ranges over
@@ -659,14 +659,14 @@ public function set(string $key, ILiteral|IParameter|IQueryFunction|string $valu
 	 *         ->where($or);
 	 * </code>
 	 *
-	 * @param mixed $predicates The restriction predicates.
+	 * @param string|IParameter|IQueryFunction|ILiteral|ICompositeExpression $predicates The restriction predicates.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $predicates
 	 */
-	public function where(...$predicates): self;
+	public function where(mixed ...$predicates): self;
 
 	/**
 	 * Adds one or more restrictions to the query results, forming a logical
@@ -680,15 +680,15 @@ public function where(...$predicates): self;
 	 *         ->andWhere('u.is_active = 1');
 	 * </code>
 	 *
-	 * @param mixed ...$where The query restrictions.
+	 * @param string|IParameter|IQueryFunction|ILiteral|ICompositeExpression ...$where The query restrictions.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @see where()
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $where
 	 */
-	public function andWhere(...$where): self;
+	public function andWhere(mixed ...$where): self;
 
 	/**
 	 * Adds one or more restrictions to the query results, forming a logical
@@ -702,15 +702,15 @@ public function andWhere(...$where): self;
 	 *         ->orWhere('u.id = 2');
 	 * </code>
 	 *
-	 * @param mixed ...$where The WHERE statement.
+	 * @param string|IParameter|IQueryFunction|ILiteral|ICompositeExpression ...$where The WHERE statement.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @see where()
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $where
 	 */
-	public function orWhere(...$where): self;
+	public function orWhere(mixed ...$where): self;
 
 	/**
 	 * Specifies a grouping over the results of the query.
@@ -723,14 +723,14 @@ public function orWhere(...$where): self;
 	 *         ->groupBy('u.id');
 	 * </code>
 	 *
-	 * @param mixed ...$groupBys The grouping expression.
+	 * @param string|IParameter|IQueryFunction|ILiteral|list<string> ...$groupBys The grouping expression.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $groupBys
 	 */
-	public function groupBy(...$groupBys): self;
+	public function groupBy(mixed ...$groupBys): self;
 
 	/**
 	 * Adds a grouping expression to the query.
@@ -743,14 +743,14 @@ public function groupBy(...$groupBys): self;
 	 *         ->addGroupBy('u.createdAt')
 	 * </code>
 	 *
-	 * @param mixed ...$groupBy The grouping expression.
+	 * @param string|IParameter|IQueryFunction|ILiteral|list<string> ...$groupBy The grouping expression.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $groupby
 	 */
-	public function addGroupBy(...$groupBy): self;
+	public function addGroupBy(mixed ...$groupBy): self;
 
 	/**
 	 * Sets a value for a column in an insert query.
@@ -805,14 +805,14 @@ public function values(array $values): self;
 	 * Specifies a restriction over the groups of the query.
 	 * Replaces any previous having restrictions, if any.
 	 *
-	 * @param mixed ...$having The restriction over the groups.
+	 * @param string|IParameter|IQueryFunction|ILiteral ...$having The restriction over the groups.
 	 * @return $this This QueryBuilder instance.
 	 *
 	 * @since 8.2.0
 	 *
 	 * @psalm-taint-sink sql $having
 	 */
-	public function having(...$having): self;
+	public function having(mixed ...$having): self;
 
 	/**
 	 * Adds a restriction over the groups of the query, forming a logical