From: skjnldsv <skjnldsv@protonmail.com>
Date: Tue, 19 Nov 2024 18:05:35 +0000 (+0100)
Subject: fix(settings): psalm PhpMaxFileSize setup check warning
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbackport%2F49384%2Fmaster;p=nextcloud-server.git

fix(settings): psalm PhpMaxFileSize setup check warning

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
---

diff --git a/apps/settings/lib/SetupChecks/PhpMaxFileSize.php b/apps/settings/lib/SetupChecks/PhpMaxFileSize.php
index 942a8408e81..d81cbe6d45c 100644
--- a/apps/settings/lib/SetupChecks/PhpMaxFileSize.php
+++ b/apps/settings/lib/SetupChecks/PhpMaxFileSize.php
@@ -33,8 +33,8 @@ class PhpMaxFileSize implements ISetupCheck {
 	}
 
 	public function run(): SetupResult {
-		$upload_max_filesize = Util::computerFileSize((string)$this->iniGetWrapper->getString('upload_max_filesize'));
-		$post_max_size = Util::computerFileSize((string)$this->iniGetWrapper->getString('post_max_size'));
+		$upload_max_filesize = (string)$this->iniGetWrapper->getString('upload_max_filesize');
+		$post_max_size = (string)$this->iniGetWrapper->getString('post_max_size');
 		$max_input_time = (int)$this->iniGetWrapper->getString('max_input_time');
 		$max_execution_time = (int)$this->iniGetWrapper->getString('max_execution_time');
 
@@ -43,16 +43,16 @@ class PhpMaxFileSize implements ISetupCheck {
 		$recommendedTime = 3600;
 
 		// Check if the PHP upload limit is too low
-		if ($upload_max_filesize < $recommendedSize) {
+		if (Util::computerFileSize($upload_max_filesize) < $recommendedSize) {
 			$warnings[] = $this->l10n->t('The PHP upload_max_filesize is too low. A size of at least %1$s is recommended. Current value: %2$s.', [
 				Util::humanFileSize($recommendedSize),
-				Util::humanFileSize($upload_max_filesize),
+				$upload_max_filesize,
 			]);
 		}
-		if ($post_max_size < $recommendedSize) {
+		if (Util::computerFileSize($post_max_size) < $recommendedSize) {
 			$warnings[] = $this->l10n->t('The PHP post_max_size is too low. A size of at least %1$s is recommended. Current value: %2$s.', [
 				Util::humanFileSize($recommendedSize),
-				Util::humanFileSize($post_max_size),
+				$post_max_size,
 			]);
 		}