From 357786f36a55e7f0b4a490d9f8d6f9881c362982 Mon Sep 17 00:00:00 2001 From: yemkareems Date: Thu, 4 Jul 2024 19:18:16 +0530 Subject: [PATCH] fix: return type doc block added as per psalm Signed-off-by: yemkareems --- lib/private/AllConfig.php | 13 +++++++------ lib/public/IConfig.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php index 6b93fc9f637..c2fff700e10 100644 --- a/lib/private/AllConfig.php +++ b/lib/private/AllConfig.php @@ -497,7 +497,7 @@ class AllConfig implements IConfig { * @param int|null $limit how many users to fetch * @param int $offset from which offset to fetch * @param string $search search users based on search params - * @return array list of user IDs + * @return list list of user IDs */ public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array { // TODO - FIXME @@ -513,15 +513,15 @@ class AllConfig implements IConfig { ); if($search !== '') { $query->leftJoin('u', 'preferences', 'p1', $query->expr()->andX( - $query->expr()->eq('p1.userid', 'uid'), - $query->expr()->eq('p1.appid', $query->expr()->literal('settings')), - $query->expr()->eq('p1.configkey', $query->expr()->literal('email'))) - ) + $query->expr()->eq('p1.userid', 'uid'), + $query->expr()->eq('p1.appid', $query->expr()->literal('settings')), + $query->expr()->eq('p1.configkey', $query->expr()->literal('email'))) + ) // sqlite doesn't like re-using a single named parameter here ->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%'))) ->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%'))) ->orWhere($query->expr()->iLike('p1.configvalue', $query->createPositionalParameter('%' . $this->connection->escapeLikeParameter($search) . '%')) - ); + ); } $query->orderBy($query->func()->lower('p.configvalue'), 'DESC') ->addOrderBy('uid_lower', 'ASC') @@ -529,6 +529,7 @@ class AllConfig implements IConfig { ->setMaxResults($limit); $result = $query->executeQuery(); + /** @var list $uids */ $uids = $result->fetchAll(\PDO::FETCH_COLUMN); $result->closeCursor(); diff --git a/lib/public/IConfig.php b/lib/public/IConfig.php index 01d513fc2b1..175f0e90c49 100644 --- a/lib/public/IConfig.php +++ b/lib/public/IConfig.php @@ -256,7 +256,7 @@ interface IConfig { * @param int|null $limit how many records to fetch * @param int $offset from which offset to fetch * @param string $search search users based on search params - * @return array list of user IDs + * @return list list of user IDs * @since 30.0.0 */ public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array; -- 2.39.5