Merge pull request #35334 from nextcloud/revert-34032-backport/34019/stable24

Revert "[stable24] Fix quota type to int"

Author: szaimen

build/psalm-baseline.xml

@@ -4404,7 +4404,8 @@
     <InvalidReturnType occurrences="1">
       <code>IImage|null</code>
     </InvalidReturnType>
-    <InvalidScalarArgument occurrences="1">
+    <InvalidScalarArgument occurrences="2">
+      <code>$quota</code>
       <code>$this-&gt;lastLogin</code>
     </InvalidScalarArgument>
     <NullableReturnStatement occurrences="1">
@@ -4528,6 +4529,14 @@
       <code>\Test\Util\User\Dummy</code>
     </UndefinedClass>
   </file>
+  <file src="lib/private/legacy/OC_Util.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>OC_Helper::computerFileSize($userQuota)</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>float</code>
+    </InvalidReturnType>
+  </file>
   <file src="lib/public/AppFramework/ApiController.php">
     <NoInterfaceProperties occurrences="1">
       <code>$this-&gt;request-&gt;server</code>
@@ -4625,4 +4634,12 @@
       <code>PreconditionNotMetException</code>
     </InvalidClass>
   </file>
+  <file src="lib/public/Util.php">
+    <InvalidReturnStatement occurrences="1">
+      <code>\OC_Helper::computerFileSize($str)</code>
+    </InvalidReturnStatement>
+    <InvalidReturnType occurrences="1">
+      <code>float|false</code>
+    </InvalidReturnType>
+  </file>
 </files>

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 int|false a file size in bytes
+	 * @return float|bool 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 (int)$str;
+			return (float)$str;
 		}
 
 		$bytes_array = [
@@ -131,7 +131,7 @@ public static function computerFileSize($str) {
 
 		$bytes = round($bytes);
 
-		return (int)$bytes;
+		return $bytes;
 	}
 
 	/**
@@ -605,7 +605,7 @@ public static function getStorageInfo($path, $rootInfo = null, $includeMountPoin
 	/**
 	 * Get storage info including all mount points and quota
 	 */
-	private static function getGlobalStorageInfo(int $quota, IUser $user, IMountPoint $mount): array {
+	private static function getGlobalStorageInfo(float $quota, IUser $user, IMountPoint $mount): array {
 		$rootInfo = \OC\Files\Filesystem::getFileInfo('', 'ext');
 		$used = $rootInfo['size'];
 		if ($used < 0) {

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 int|\OCP\Files\FileInfo::SPACE_UNLIMITED|false Quota bytes
+	 * @return float Quota bytes
 	 */
 	public static function getUserQuota(?IUser $user) {
 		if (is_null($user)) {