Skip to content

Revert "[stable24] Fix quota type to int" #35334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szaimen merged 3 commits into from
Nov 25, 2022
Merged

Revert "[stable24] Fix quota type to int" #35334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a66cb8
Revert "[stable24] Fix quota type to int"
PVince81 Nov 22, 2022
c73f11b
Float the quota
PVince81 Nov 23, 2022
f8e18e5
Update baseline for some unrelated errors
PVince81 Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4404,7 +4404,8 @@
<InvalidReturnType occurrences="1">
<code>IImage|null</code>
</InvalidReturnType>
<InvalidScalarArgument occurrences="1">
<InvalidScalarArgument occurrences="2">
<code>$quota</code>
<code>$this-&gt;lastLogin</code>
</InvalidScalarArgument>
<NullableReturnStatement occurrences="1">
Expand Down Expand Up @@ -4528,6 +4529,14 @@
<code>\Test\Util\User\Dummy</code>
</UndefinedClass>
</file>
<file src="lib/private/legacy/OC_Util.php">
<InvalidReturnStatement occurrences="1">
<code>OC_Helper::computerFileSize($userQuota)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>float</code>
</InvalidReturnType>
</file>
<file src="lib/public/AppFramework/ApiController.php">
<NoInterfaceProperties occurrences="1">
<code>$this-&gt;request-&gt;server</code>
Expand Down Expand Up @@ -4625,4 +4634,12 @@
<code>PreconditionNotMetException</code>
</InvalidClass>
</file>
<file src="lib/public/Util.php">
<InvalidReturnStatement occurrences="1">
<code>\OC_Helper::computerFileSize($str)</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>float|false</code>
</InvalidReturnType>
</file>
</files>
8 changes: 4 additions & 4 deletions lib/private/legacy/OC_Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static function humanFileSize($bytes) {
/**
* Make a computer file size
* @param string $str file size in human readable format
* @return int|false a file size in bytes
* @return float|bool a file size in bytes
*
* Makes 2kB to 2048.
*
Expand All @@ -104,7 +104,7 @@ public static function humanFileSize($bytes) {
public static function computerFileSize($str) {
$str = strtolower($str);
if (is_numeric($str)) {
return (int)$str;
return (float)$str;
}

$bytes_array = [
Expand All @@ -131,7 +131,7 @@ public static function computerFileSize($str) {

$bytes = round($bytes);

return (int)$bytes;
return $bytes;
}

/**
Expand Down Expand Up @@ -605,7 +605,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
/**
* Get storage info including all mount points and quota
*/
private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array {
private static function getGlobalStorageInfo(float $quota, IUser $user, IMountPoint $mount): array {
$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
$used = $rootInfo['size'];
if ($used < 0) {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/legacy/OC_Util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public static function isDefaultExpireDateEnforced() {
* Get the quota of a user
*
* @param IUser|null $user
* @return int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes
* @return float Quota bytes
*/
public static function getUserQuota(?IUser $user) {
if (is_null($user)) {
Expand Down