Store size in int|float for 32bit support

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php
index 9bd94edf5bc877657a5ad9e239039dc745d59204..9f99bbaab2bf2c72d8cbf88a316e470823ce714e 100644 (file)
--- a/lib/private/Files/Cache/Scanner.php
+++ b/lib/private/Files/Cache/Scanner.php
@@ -385,10 +385,10 @@ class Scanner extends BasicEmitter implements IScanner {
         * @param int $reuse a combination of self::REUSE_*
         * @param int $folderId id for the folder to be scanned
         * @param bool $lock set to false to disable getting an additional read lock during scanning
-        * @param int $oldSize the size of the folder before (re)scanning the children
+        * @param int|float $oldSize the size of the folder before (re)scanning the children
         * @return int|float the size of the scanned folder or -1 if the size is unknown at this stage
         */
-       protected function scanChildren(string $path, $recursive, int $reuse, int $folderId, bool $lock, int $oldSize) {
+       protected function scanChildren(string $path, $recursive, int $reuse, int $folderId, bool $lock, int|float $oldSize) {
                if ($reuse === -1) {
                        $reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : self::REUSE_ETAG;
                }
@@ -418,7 +418,10 @@ class Scanner extends BasicEmitter implements IScanner {
                return $size;
        }
 
-       private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) {
+       /**
+        * @param bool|IScanner::SCAN_RECURSIVE_INCOMPLETE $recursive
+        */
+       private function handleChildren(string $path, $recursive, int $reuse, int $folderId, bool $lock, int|float &$size): array {
                // we put this in it's own function so it cleans up the memory before we start recursing
                $existingChildren = $this->getExistingChildren($folderId);
                $newChildren = iterator_to_array($this->storage->getDirectoryContent($path));

diff --git a/lib/private/Files/ObjectStore/ObjectStoreScanner.php b/lib/private/Files/ObjectStore/ObjectStoreScanner.php
index f001f90fdaae96b306dd2b9ff90e85a9bca43869..d827662ae0b1a12d75ce709092d620cd9718f82f 100644 (file)
--- a/lib/private/Files/ObjectStore/ObjectStoreScanner.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreScanner.php
@@ -39,7 +39,7 @@ class ObjectStoreScanner extends Scanner {
                return [];
        }
 
-       protected function scanChildren(string $path, $recursive, int $reuse, int $folderId, bool $lock, int $oldSize) {
+       protected function scanChildren(string $path, $recursive, int $reuse, int $folderId, bool $lock, int|float $oldSize) {
                return 0;
        }