upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

chore: Fix psalm issues following strong typing of IUser

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2026-06-10 22:35:40 +02:00
parent a8f21da1f7
commit b37044d484
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
7 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_trashbin/lib/Trashbin.php
View file

@ -850,7 +850,7 @@ class Trashbin implements IEventListener {
$softQuota = true;
$quota = $user->getQuota();
if ($quota === null || $quota === 'none') {
if ($quota === 'none') {
$quota = Filesystem::free_space('/');
$softQuota = false;
// inf or unknown free space

2
apps/files_versions/lib/Storage.php
View file

@ -879,7 +879,7 @@ class Storage {
$softQuota = true;
$quota = $user->getQuota();
if ($quota === null || $quota === 'none') {
if ($quota === 'none') {
$quota = Filesystem::free_space('/');
$softQuota = false;
} else {

2
apps/provisioning_api/lib/Controller/GroupsController.php
View file

@ -216,7 +216,7 @@ class GroupsController extends AUserDataOCSController {
foreach ($users as $user) {
try {
/** @var IUser $user */
$userId = (string)$user->getUID();
$userId = $user->getUID();
$userData = $this->getUserData($userId);
// Do not insert empty entry
if ($userData !== null) {

2
apps/user_ldap/lib/Connection.php
View file

@ -313,7 +313,7 @@ class Connection extends LDAPUtility {
$key = $this->getCacheKey($key);
$value = base64_encode(json_encode($value));
$ttl = $ttlOverride ?? $this->configuration->ldapCacheTTL;
$this->cache->set($key, $value, $ttl);
$this->cache->set($key, $value, (int)$ttl);
}
public function clearCache() {

1
build/psalm-baseline.xml
View file

@ -3417,6 +3417,7 @@
<code><![CDATA[getPassword]]></code>
<code><![CDATA[getRemember]]></code>
<code><![CDATA[getScope]]></code>
<code><![CDATA[getToken]]></code>
<code><![CDATA[setExpires]]></code>
<code><![CDATA[setLastCheck]]></code>
<code><![CDATA[setName]]></code>

2
lib/private/Group/Manager.php
View file

@ -452,7 +452,7 @@ class Manager extends PublicEmitter implements IGroupManager {
$matchingUsers = [];
foreach ($groupUsers as $groupUser) {
$matchingUsers[(string)$groupUser->getUID()] = $groupUser->getDisplayName();
$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
}
return $matchingUsers;
}

2
lib/private/User/LazyUser.php
View file

@ -148,7 +148,7 @@ class LazyUser implements IUser {
}
#[\Override]
public function getEMailAddress(): string {
public function getEMailAddress(): ?string {
return $this->getUser()->getEMailAddress();
}