Revert "[stable25] Fix quota type to int"

[PVince81]

Like #35334 for stable25.
Reverts #34019

For #34961 (comment)

[szaimen]

@PVince81 are you sure with the exact revert? https://github.com/nextcloud/server/pull/34019/files looked a bit different...

[PVince81]

I cherry-picked the stable24 commit

but can double check in case there's more there

[PVince81]

@szaimen looks fine to me. please let me know if you saw something I missed

[szaimen]

@szaimen looks fine to me. please let me know if you saw something I missed

@PVince81 the exact revert for stable25 would look like this: https://github.com/nextcloud/server/pull/35336/files

[blizzz]

#35335 (comment)

[PVince81]

right, let me redo this then. thanks

[PVince81]

should be better now @blizzz @szaimen

[szaimen]

Seems to.be good now

fixed

[blizzz]

CI is red

[PVince81]

that thing not even related to the diff:

 Error: lib/private/legacy/OC_Helper.php:511:39: InvalidScalarArgument: Argument 1 of OC_Helper::getGlobalStorageInfo expects int, false|float provided (see https://psalm.dev/012)

I'll update the baseline

[CarlSchwan]

Error: lib/private/legacy/OC_Helper.php:511:39: InvalidScalarArgument: Argument 1 of OC_Helper::getGlobalStorageInfo expects int, false|float provided (see https://psalm.dev/012)

It is related private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array; int need be changed to float

[PVince81]

I ran lib/composer/bin/psalm --threads=1 --update-baseline --set-baseline=build/psalm-baseline.xml but it did not update anything related to that function.

Looks like I'll need to fiddle with the baseline file manually again 😡

or do I need to run it with a specific php version ? PHP 8.1 here

[PVince81]

Error: lib/private/legacy/OC_Helper.php:511:39: InvalidScalarArgument: Argument 1 of OC_Helper::getGlobalStorageInfo expects int, false|float provided (see https://psalm.dev/012)

It is related private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array; int need be changed to float

but it wasn't in the original PR ? or was there another PR also that changed it ?

I'll adjust it now just to get done with it

[szaimen]

@PVince81 i think we should probably double check that this PR does not break 64-bit instances now...

[PVince81]

@szaimen mind testing it ?

[szaimen]

@szaimen mind testing it ?

Honestly I dont know what I need to test. Only changing the quota?

[PVince81]

tested on 64-bit system by setting the quota of a user to 5 GB (which is more than the usual 4 GB or 2 GB 32-bit limit), and uploading and reporting that value in the files app worked fine

[PVince81]

rebased and DCO'd

[szaimen]

tested on 64-bit system by setting the quota of a user to 5 GB (which is more than the usual 4 GB or 2 GB 32-bit limit), and uploading and reporting that value in the files app worked fine

All right. Fine by me then 👍

However looks like tests are failing?

[PVince81]

drone test failures unrelated

also there's this mysterious "push" entry that appeared again. codecov fails but not the tests there

I'll restart the timed out workflow ones