From: Côme Chilliet <91878298+come-nc@users.noreply.github.com> Date: Thu, 30 Mar 2023 08:30:12 +0000 (+0200) Subject: Fix quota typing for 32bits after forward port from 25 X-Git-Tag: v26.0.1rc1~29^2~1 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a0beacde69245d409604a7d0722286d8290d6563;p=nextcloud-server.git Fix quota typing for 32bits after forward port from 25 Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> --- diff --git a/lib/private/Files/Storage/Wrapper/Quota.php b/lib/private/Files/Storage/Wrapper/Quota.php index 5b702890675..cfb2c455a2c 100644 --- a/lib/private/Files/Storage/Wrapper/Quota.php +++ b/lib/private/Files/Storage/Wrapper/Quota.php @@ -42,7 +42,7 @@ class Quota extends Wrapper { /** @var callable|null */ protected $quotaCallback; /** @var int|float|null int on 64bits, float on 32bits for bigint */ - protected $quota; + protected int|float|null $quota; protected string $sizeRoot; private SystemConfig $config; @@ -60,7 +60,7 @@ class Quota extends Wrapper { /** * @return int|float quota value */ - public function getQuota() { + public function getQuota(): int|float { if ($this->quota === null) { $quotaCallback = $this->quotaCallback; if ($quotaCallback === null) { diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index 09bb959cdcf..c8d6ba42eb5 100755 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -95,10 +95,9 @@ class LargeFileHelper { * * @param string $filename Path to the file. * - * @return int|float Number of bytes as number (float or int) or - * null on failure. + * @return int|float Number of bytes as number (float or int) */ - public function getFileSize(string $filename): null|int|float { + public function getFileSize(string $filename): int|float { $fileSize = $this->getFileSizeViaCurl($filename); if (!is_null($fileSize)) { return $fileSize;