Skip to content

Commit 00ccbd3

Browse files
committed
Fix psalm spotted type errors
Signed-off-by: Côme Chilliet <[email protected]>
1 parent 011c963 commit 00ccbd3

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

lib/private/Group/Database.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,11 @@ public function groupsExists(array $gids): array {
359359
->where($qb->expr()->in('gid', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_STR_ARRAY)))
360360
->executeQuery();
361361
while ($row = $result->fetch()) {
362-
$this->groupCache[$row['gid']] = [
363-
'displayname' => $row['displayname'],
364-
'gid' => $row['gid'],
362+
$this->groupCache[(string)$row['gid']] = [
363+
'displayname' => (string)$row['displayname'],
364+
'gid' => (string)$row['gid'],
365365
];
366-
$existingGroups[] = $gid;
366+
$existingGroups[] = (string)$row['gid'];
367367
}
368368
$result->closeCursor();
369369
}
@@ -553,10 +553,10 @@ public function getGroupsDetails(array $gids): array {
553553

554554
$result = $query->executeQuery();
555555
while ($row = $result->fetch()) {
556-
$details[$row['gid']] = ['displayName' => $row['displayname']];
557-
$this->groupCache[$row['gid']] = [
558-
'displayname' => $row['displayname'],
559-
'gid' => $row['gid'],
556+
$details[(string)$row['gid']] = ['displayName' => (string)$row['displayname']];
557+
$this->groupCache[(string)$row['gid']] = [
558+
'displayname' => (string)$row['displayname'],
559+
'gid' => (string)$row['gid'],
560560
];
561561
}
562562
$result->closeCursor();

lib/public/Group/Backend/IBatchMethodsBackend.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public function groupsExists(array $gids): array;
4848
/**
4949
* @brief Batch method to get the group details of a list of groups
5050
*
51-
* The default implementation in ABackend will just call getGroupDetail in
52-
* a loop. But a GroupBackend implementation should provides a more optimized
53-
* override this method to provide a more optimized way to execute this operation.
51+
* The default implementation in ABackend will just call getGroupDetails in
52+
* a loop. But a GroupBackend implementation should override this method
53+
* to provide a more optimized way to execute this operation.
5454
*
5555
* @throw \RuntimeException if called on a backend that doesn't implements IGroupDetailsBackend
5656
*
57-
* @return array<string, array{displayName: string}>
57+
* @return array<string, array{displayName?: string}>
5858
* @since 28.0.0
5959
*/
6060
public function getGroupsDetails(array $gids): array;

0 commit comments

Comments
 (0)