diff options
author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-20 18:02:45 +0100 |
---|---|---|
committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-02-07 11:23:28 +0100 |
commit | ff776a90b133fa113c29511a5a7983a7a1a8b73c (patch) | |
tree | 5a0493e0939477a082ae2d1811f94788efcd9a33 /lib/private/LargeFileHelper.php | |
parent | 2d8e696c24fef754662ed20f17b5b52091491ac5 (diff) | |
download | nextcloud-server-ff776a90b133fa113c29511a5a7983a7a1a8b73c.tar.gz nextcloud-server-ff776a90b133fa113c29511a5a7983a7a1a8b73c.zip |
Strong type filesize related methods to ease 32bits problem findings
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib/private/LargeFileHelper.php')
-rwxr-xr-x | lib/private/LargeFileHelper.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/LargeFileHelper.php b/lib/private/LargeFileHelper.php index a9c5a329620..c726737a604 100755 --- a/lib/private/LargeFileHelper.php +++ b/lib/private/LargeFileHelper.php @@ -73,7 +73,7 @@ class LargeFileHelper { * * @return string Unsigned integer base-10 string */ - public function formatUnsignedInteger($number) { + public function formatUnsignedInteger(int|float|string $number): string { if (is_float($number)) { // Undo the effect of the php.ini setting 'precision'. return number_format($number, 0, '', ''); @@ -98,7 +98,7 @@ class LargeFileHelper { * @return null|int|float Number of bytes as number (float or int) or * null on failure. */ - public function getFileSize($filename) { + public function getFileSize(string $filename): null|int|float { $fileSize = $this->getFileSizeViaCurl($filename); if (!is_null($fileSize)) { return $fileSize; @@ -118,7 +118,7 @@ class LargeFileHelper { * @return null|int|float Number of bytes as number (float or int) or * null on failure. */ - public function getFileSizeViaCurl($fileName) { + public function getFileSizeViaCurl(string $fileName): null|int|float { if (\OC::$server->get(IniGetWrapper::class)->getString('open_basedir') === '') { $encodedFileName = rawurlencode($fileName); $ch = curl_init("file:///$encodedFileName"); @@ -146,7 +146,7 @@ class LargeFileHelper { * @return null|int|float Number of bytes as number (float or int) or * null on failure. */ - public function getFileSizeViaExec($filename) { + public function getFileSizeViaExec(string $filename): null|int|float { if (\OCP\Util::isFunctionEnabled('exec')) { $os = strtolower(php_uname('s')); $arg = escapeshellarg($filename); @@ -171,7 +171,7 @@ class LargeFileHelper { * * @return int|float Number of bytes as number (float or int). */ - public function getFileSizeNative($filename) { + public function getFileSizeNative(string $filename): int|float { $result = filesize($filename); if ($result < 0) { // For file sizes between 2 GiB and 4 GiB, filesize() will return a @@ -188,7 +188,7 @@ class LargeFileHelper { * @param string $fullPath * @return int */ - public function getFileMtime($fullPath) { + public function getFileMtime(string $fullPath): int { try { $result = filemtime($fullPath); } catch (\Exception $e) { @@ -205,7 +205,7 @@ class LargeFileHelper { return $result; } - protected function exec($cmd) { + protected function exec(string $cmd): null|int|float { $result = trim(exec($cmd)); return ctype_digit($result) ? 0 + $result : null; } |