Merge pull request #34032 from nextcloud/backport/34019/stable24

skjnldsv · web-flow · commit a117878240a2 · 2022-10-27T12:10:28.000+02:00
[stable24] Fix quota type to int
diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php
@@ -95,7 +95,7 @@ public static function humanFileSize($bytes) {
 	/**
 	 * Make a computer file size
 	 * @param string $str file size in human readable format
-	 * @return float|bool a file size in bytes
+	 * @return int|false a file size in bytes
 	 *
 	 * Makes 2kB to 2048.
 	 *
@@ -104,7 +104,7 @@ public static function humanFileSize($bytes) {
 	public static function computerFileSize($str) {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
-			return (float)$str;
+			return (int)$str;
 		}
 
 		$bytes_array = [
@@ -131,7 +131,7 @@ public static function computerFileSize($str) {
 
 		$bytes = round($bytes);
 
-		return $bytes;
+		return (int)$bytes;
 	}
 
 	/**
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
@@ -158,7 +158,7 @@ public static function isDefaultExpireDateEnforced() {
 	 * Get the quota of a user
 	 *
 	 * @param IUser|null $user
-	 * @return float Quota bytes
+	 * @return int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes
 	 */
 	public static function getUserQuota(?IUser $user) {
 		if (is_null($user)) {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static function humanFileSize($bytes) {`
`95`	`95`	`/**`
`96`	`96`	`* Make a computer file size`
`97`	`97`	`* @param string $str file size in human readable format`
`98`		`- * @return float\|bool a file size in bytes`
	`98`	`+ * @return int\|false a file size in bytes`
`99`	`99`	`*`
`100`	`100`	`* Makes 2kB to 2048.`
`101`	`101`	`*`
`@@ -104,7 +104,7 @@ public static function humanFileSize($bytes) {`
`104`	`104`	`public static function computerFileSize($str) {`
`105`	`105`	`$str = strtolower($str);`
`106`	`106`	`if (is_numeric($str)) {`
`107`		`- return (float)$str;`
	`107`	`+ return (int)$str;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`$bytes_array = [`
`@@ -131,7 +131,7 @@ public static function computerFileSize($str) {`
`131`	`131`
`132`	`132`	`$bytes = round($bytes);`
`133`	`133`
`134`		`- return $bytes;`
	`134`	`+ return (int)$bytes;`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public static function isDefaultExpireDateEnforced() {`
`158`	`158`	`* Get the quota of a user`
`159`	`159`	`*`
`160`	`160`	`* @param IUser\|null $user`
`161`		`- * @return float Quota bytes`
	`161`	`+ * @return int\|\OCP\Files\FileInfo::SPACE_UNLIMITED\|false Quota bytes`
`162`	`162`	`*/`
`163`	`163`	`public static function getUserQuota(?IUser $user) {`
`164`	`164`	`if (is_null($user)) {`