diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 737c1e9d51e31..3473eebc4a0e1 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -477,7 +477,7 @@ public function test() { * get the free space in the storage * * @param string $path - * @return int|false + * @return int|float|false */ public function free_space($path) { return \OCP\Files\FileInfo::SPACE_UNKNOWN; diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php index fcb07cb9748da..0c4a81b7491bc 100644 --- a/lib/private/Files/Storage/DAV.php +++ b/lib/private/Files/Storage/DAV.php @@ -486,7 +486,7 @@ public function touch($path, $mtime = null) { /** * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false */ public function file_put_contents($path, $data) { $path = $this->cleanPath($path); diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php index fe6a6d6e21ad5..1ff733e0d9251 100644 --- a/lib/private/Files/Storage/Local.php +++ b/lib/private/Files/Storage/Local.php @@ -249,7 +249,7 @@ public function filesize($path): false|int|float { $fullPath = $this->getSourcePath($path); if (PHP_INT_SIZE === 4) { $helper = new \OC\LargeFileHelper; - return $helper->getFileSize($fullPath) ?? false; + return $helper->getFileSize($fullPath); } return filesize($fullPath); } @@ -617,6 +617,7 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t } public function writeStream(string $path, $stream, int $size = null): int { + /** @var int|false $result We consider here that returned size will never be a float because we write less than 4GB */ $result = $this->file_put_contents($path, $stream); if (is_resource($stream)) { fclose($stream); diff --git a/lib/private/Files/Storage/Wrapper/Encoding.php b/lib/private/Files/Storage/Wrapper/Encoding.php index 6aba839d26d4d..d6006f746ad4e 100644 --- a/lib/private/Files/Storage/Wrapper/Encoding.php +++ b/lib/private/Files/Storage/Wrapper/Encoding.php @@ -311,7 +311,7 @@ public function file_get_contents($path) { * * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false */ public function file_put_contents($path, $data) { return $this->storage->file_put_contents($this->findPathToUse($path), $data); @@ -396,7 +396,7 @@ public function hash($type, $path, $raw = false) { * see https://www.php.net/manual/en/function.free_space.php * * @param string $path - * @return int|bool + * @return int|float|bool */ public function free_space($path) { return $this->storage->free_space($this->findPathToUse($path)); diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php index 4501c96d63146..e21a2cba244a8 100644 --- a/lib/private/Files/Storage/Wrapper/Jail.php +++ b/lib/private/Files/Storage/Wrapper/Jail.php @@ -259,7 +259,7 @@ public function file_get_contents($path) { * * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false */ public function file_put_contents($path, $data) { return $this->getWrapperStorage()->file_put_contents($this->getUnjailedPath($path), $data); @@ -335,7 +335,7 @@ public function hash($type, $path, $raw = false) { * see https://www.php.net/manual/en/function.free_space.php * * @param string $path - * @return int|bool + * @return int|float|bool */ public function free_space($path) { return $this->getWrapperStorage()->free_space($this->getUnjailedPath($path)); diff --git a/lib/private/Files/Storage/Wrapper/Quota.php b/lib/private/Files/Storage/Wrapper/Quota.php index 5c542361c3663..cfb2c455a2ce8 100644 --- a/lib/private/Files/Storage/Wrapper/Quota.php +++ b/lib/private/Files/Storage/Wrapper/Quota.php @@ -41,7 +41,8 @@ class Quota extends Wrapper { /** @var callable|null */ protected $quotaCallback; - protected ?int $quota; + /** @var int|float|null int on 64bits, float on 32bits for bigint */ + protected int|float|null $quota; protected string $sizeRoot; private SystemConfig $config; @@ -57,9 +58,9 @@ public function __construct($parameters) { } /** - * @return int quota value + * @return int|float quota value */ - public function getQuota(): int { + public function getQuota(): int|float { if ($this->quota === null) { $quotaCallback = $this->quotaCallback; if ($quotaCallback === null) { @@ -77,7 +78,8 @@ private function hasQuota(): bool { /** * @param string $path - * @param \OC\Files\Storage\Storage $storage + * @param IStorage $storage + * @return int|float */ protected function getSize($path, $storage = null) { if ($this->config->getValue('quota_include_external_storage', false)) { @@ -101,7 +103,7 @@ protected function getSize($path, $storage = null) { * Get free space as limited by the quota * * @param string $path - * @return int|bool + * @return int|float|bool */ public function free_space($path) { if (!$this->hasQuota()) { @@ -128,7 +130,7 @@ public function free_space($path) { * * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false */ public function file_put_contents($path, $data) { if (!$this->hasQuota()) { @@ -177,7 +179,7 @@ public function fopen($path, $mode) { // don't apply quota for part files if (!$this->isPartFile($path)) { $free = $this->free_space($path); - if ($source && is_int($free) && $free >= 0 && $mode !== 'r' && $mode !== 'rb') { + if ($source && (is_int($free) || is_float($free)) && $free >= 0 && $mode !== 'r' && $mode !== 'rb') { // only apply quota for files, not metadata, trash or others if ($this->shouldApplyQuota($path)) { return \OC\Files\Stream\Quota::wrap($source, $free); @@ -192,7 +194,7 @@ public function fopen($path, $mode) { * Checks whether the given path is a part file * * @param string $path Path that may identify a .part file - * @return string File path without .part extension + * @return bool * @note this is needed for reusing keys */ private function isPartFile($path) { diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php index 26b4570cc7542..c2d382f5dfc52 100644 --- a/lib/private/Files/Storage/Wrapper/Wrapper.php +++ b/lib/private/Files/Storage/Wrapper/Wrapper.php @@ -249,7 +249,7 @@ public function file_get_contents($path) { * * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false */ public function file_put_contents($path, $data) { return $this->getWrapperStorage()->file_put_contents($path, $data); @@ -325,7 +325,7 @@ public function hash($type, $path, $raw = false) { * see https://www.php.net/manual/en/function.free_space.php * * @param string $path - * @return int|bool + * @return int|float|bool */ public function free_space($path) { return $this->getWrapperStorage()->free_space($path); diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index 2b2fed4e9f126..c8d6ba42eb5fd 100755 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -95,10 +95,9 @@ public function formatUnsignedInteger(int|float|string $number): string { * * @param string $filename Path to the file. * - * @return null|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; diff --git a/lib/public/Files/Storage.php b/lib/public/Files/Storage.php index ca5276af1e8fb..c91d47bdcdfec 100644 --- a/lib/public/Files/Storage.php +++ b/lib/public/Files/Storage.php @@ -227,7 +227,7 @@ public function file_get_contents($path); * * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false * @since 6.0.0 */ public function file_put_contents($path, $data); @@ -296,7 +296,7 @@ public function hash($type, $path, $raw = false); * see https://www.php.net/manual/en/function.disk-free-space.php * * @param string $path - * @return int|bool + * @return int|float|bool * @since 6.0.0 */ public function free_space($path); diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php index 1084eb7c94183..7b3b9eb484e82 100644 --- a/lib/public/Files/Storage/IStorage.php +++ b/lib/public/Files/Storage/IStorage.php @@ -224,7 +224,7 @@ public function file_get_contents($path); * * @param string $path * @param mixed $data - * @return int|false + * @return int|float|false * @since 9.0.0 */ public function file_put_contents($path, $data); @@ -293,7 +293,7 @@ public function hash($type, $path, $raw = false); * see https://www.php.net/manual/en/function.free_space.php * * @param string $path - * @return int|bool + * @return int|float|bool * @since 9.0.0 */ public function free_space($path);