Make it clear that file sizes may be float on 32bits

Signed-off-by: Côme Chilliet <[email protected]>
nextcloud · Apr 1, 2023 · ed863fb · ed863fb
1 parent c6b6833
commit ed863fb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git 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 $quota;
 	protected string $sizeRoot;
 	private SystemConfig $config;
 
@@ -57,7 +58,7 @@ public function __construct($parameters) {
 	}
 
 	/**
-	 * @return quota value
+	 * @return int|float quota value
 	 */
 	public function getQuota() {
 		if ($this->quota === 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
@@ -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/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
@@ -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);