upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #38104 from nextcloud/feat/um-32-bit

Browse source
This commit is contained in:
Pytal 2023-05-09 08:20:41 -07:00 committed by GitHub
commit 972b2097d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/dav/lib/UserMigration/CalendarMigrator.php
View file

@ -211,7 +211,7 @@ class CalendarMigrator implements IMigrator, ISizeEstimationMigrator {
/**
* {@inheritDoc}
*/
public function getEstimatedExportSize(IUser $user): int {
public function getEstimatedExportSize(IUser $user): int|float {
$calendarExports = $this->getCalendarExports($user, new NullOutput());
$calendarCount = count($calendarExports);
@ -230,7 +230,7 @@ class CalendarMigrator implements IMigrator, ISizeEstimationMigrator {
// 450B for each component (events, todos, alarms, etc.)
$size += ($componentCount * 450) / 1024;
return (int)ceil($size);
return ceil($size);
}
/**

4
apps/dav/lib/UserMigration/ContactsMigrator.php
View file

@ -202,7 +202,7 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
/**
* {@inheritDoc}
*/
public function getEstimatedExportSize(IUser $user): int {
public function getEstimatedExportSize(IUser $user): int|float {
$addressBookExports = $this->getAddressBookExports($user, new NullOutput());
$addressBookCount = count($addressBookExports);
@ -217,7 +217,7 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
// 350B for each contact
$size += ($contactsCount * 350) / 1024;
return (int)ceil($size);
return ceil($size);
}
/**

4
apps/files_trashbin/lib/UserMigration/TrashbinMigrator.php
View file

@ -67,7 +67,7 @@ class TrashbinMigrator implements IMigrator, ISizeEstimationMigrator {
/**
* {@inheritDoc}
*/
public function getEstimatedExportSize(IUser $user): int {
public function getEstimatedExportSize(IUser $user): int|float {
$uid = $user->getUID();
try {
@ -75,7 +75,7 @@ class TrashbinMigrator implements IMigrator, ISizeEstimationMigrator {
if (!$trashbinFolder instanceof Folder) {
return 0;
}
return (int)ceil($trashbinFolder->getSize() / 1024);
return ceil($trashbinFolder->getSize() / 1024);
} catch (\Throwable $e) {
return 0;
}

4
apps/settings/lib/UserMigration/AccountMigrator.php
View file

@ -84,7 +84,7 @@ class AccountMigrator implements IMigrator, ISizeEstimationMigrator {
/**
* {@inheritDoc}
*/
public function getEstimatedExportSize(IUser $user): int {
public function getEstimatedExportSize(IUser $user): int|float {
$size = 100; // 100KiB for account JSON
try {
@ -97,7 +97,7 @@ class AccountMigrator implements IMigrator, ISizeEstimationMigrator {
// Skip avatar in size estimate on failure
}
return (int)ceil($size);
return ceil($size);
}
/**

3
lib/public/UserMigration/ISizeEstimationMigrator.php
View file

@ -38,6 +38,7 @@ interface ISizeEstimationMigrator {
* Should be fast, favor performance over accuracy.
*
* @since 25.0.0
* @since 27.0.0 return value may overflow from int to float
*/
public function getEstimatedExportSize(IUser $user): int;
public function getEstimatedExportSize(IUser $user): int|float;
}