Merge pull request #34845 from nextcloud/dependaskjnldsv/32413/stable24

[stable24] Fix psalm errors fron the end of the baseline file

apps/files_trashbin/lib/Trashbin.php

@@ -801,7 +801,7 @@ private static function calculateFreeSpace($trashbinSize, $user) {
 			$availableSpace = $quota;
 		}
 
-		return $availableSpace;
+		return (int)$availableSpace;
 	}
 
 	/**

build/psalm-baseline.xml

@@ -4404,8 +4404,7 @@
     <InvalidReturnType occurrences="1">
       <code>IImage|null</code>
     </InvalidReturnType>
-    <InvalidScalarArgument occurrences="2">
-      <code>$quota</code>
+    <InvalidScalarArgument occurrences="1">
       <code>$this-&gt;lastLogin</code>
     </InvalidScalarArgument>
     <NullableReturnStatement occurrences="1">
@@ -4490,19 +4489,16 @@
     <InvalidOperand occurrences="1">
       <code>$matches[1][$last_match][0]</code>
     </InvalidOperand>
-    <InvalidReturnStatement occurrences="4">
+    <InvalidReturnStatement occurrences="2">
       <code>(INF &gt; 0)? INF: PHP_INT_MAX</code>
       <code>INF</code>
-      <code>max($upload_max_filesize, $post_max_size)</code>
-      <code>min($upload_max_filesize, $post_max_size)</code>
     </InvalidReturnStatement>
     <InvalidReturnType occurrences="1">
       <code>int</code>
     </InvalidReturnType>
-    <InvalidScalarArgument occurrences="4">
+    <InvalidScalarArgument occurrences="3">
       <code>$includeExtStorage ? 'ext' : false</code>
       <code>$path</code>
-      <code>$quota</code>
       <code>'ext'</code>
     </InvalidScalarArgument>
     <RedundantCondition occurrences="1">
@@ -4532,22 +4528,6 @@
       <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>
-    <RedundantCondition occurrences="1">
-      <code>is_string($expected)</code>
-    </RedundantCondition>
-    <TypeDoesNotContainType occurrences="3">
-      <code>is_bool($expected)</code>
-      <code>is_bool($setting[1])</code>
-      <code>is_int($expected)</code>
-    </TypeDoesNotContainType>
-  </file>
   <file src="lib/public/AppFramework/ApiController.php">
     <NoInterfaceProperties occurrences="1">
       <code>$this-&gt;request-&gt;server</code>
@@ -4645,29 +4625,4 @@
       <code>PreconditionNotMetException</code>
     </InvalidClass>
   </file>
-  <file src="lib/public/Search/SearchResult.php">
-    <InvalidArgument occurrences="1">
-      <code>$cursor</code>
-    </InvalidArgument>
-  </file>
-  <file src="lib/public/Share.php">
-    <InvalidReturnType occurrences="3">
-      <code>array</code>
-      <code>array|bool</code>
-      <code>mixed</code>
-    </InvalidReturnType>
-  </file>
-  <file src="lib/public/Util.php">
-    <InvalidReturnStatement occurrences="1">
-      <code>\OC_Helper::computerFileSize($str)</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>float</code>
-    </InvalidReturnType>
-  </file>
-  <file src="remote.php">
-    <InvalidScalarArgument occurrences="1">
-      <code>$e-&gt;getCode()</code>
-    </InvalidScalarArgument>
-  </file>
 </files>

lib/private/legacy/OC_Helper.php

@@ -420,11 +420,11 @@ public static function freeSpace($dir) {
 	 */
 	public static function uploadLimit() {
 		$ini = \OC::$server->get(IniGetWrapper::class);
-		$upload_max_filesize = OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
-		$post_max_size = OCP\Util::computerFileSize($ini->get('post_max_size'));
-		if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) {
+		$upload_max_filesize = (int)OCP\Util::computerFileSize($ini->get('upload_max_filesize'));
+		$post_max_size = (int)OCP\Util::computerFileSize($ini->get('post_max_size'));
+		if ($upload_max_filesize === 0 && $post_max_size === 0) {
 			return INF;
-		} elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) {
+		} elseif ($upload_max_filesize === 0 || $post_max_size === 0) {
 			return max($upload_max_filesize, $post_max_size); //only the non 0 value counts
 		} else {
 			return min($upload_max_filesize, $post_max_size);

lib/private/legacy/OC_Util.php

@@ -657,20 +657,8 @@ public static function checkServer(\OC\SystemConfig $config) {
 			}
 		}
 		foreach ($dependencies['ini'] as $setting => $expected) {
-			if (is_bool($expected)) {
-				if ($iniWrapper->getBool($setting) !== $expected) {
-					$invalidIniSettings[] = [$setting, $expected];
-				}
-			}
-			if (is_int($expected)) {
-				if ($iniWrapper->getNumeric($setting) !== $expected) {
-					$invalidIniSettings[] = [$setting, $expected];
-				}
-			}
-			if (is_string($expected)) {
-				if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
-					$invalidIniSettings[] = [$setting, $expected];
-				}
+			if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
+				$invalidIniSettings[] = [$setting, $expected];
 			}
 		}
 
@@ -682,9 +670,6 @@ public static function checkServer(\OC\SystemConfig $config) {
 			$webServerRestart = true;
 		}
 		foreach ($invalidIniSettings as $setting) {
-			if (is_bool($setting[1])) {
-				$setting[1] = $setting[1] ? 'on' : 'off';
-			}
 			$errors[] = [
 				'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),
 				'hint' => $l->t('Adjusting this setting in php.ini will make Nextcloud run again')

lib/public/Search/SearchResult.php

@@ -50,7 +50,7 @@ final class SearchResult implements JsonSerializable {
 	 * @param string $name the translated name of the result section or group, e.g. "Mail"
 	 * @param bool $isPaginated
 	 * @param SearchResultEntry[] $entries
-	 * @param null $cursor
+	 * @param ?int|?string $cursor
 	 *
 	 * @since 20.0.0
 	 */

lib/public/Share.php

@@ -64,7 +64,7 @@ public static function getItemSharedWithUser($itemType, $itemSource, $user, $own
 	 * @param int $format (optional) Format type must be defined by the backend
 	 * @param mixed $parameters
 	 * @param bool $includeCollections
-	 * @return array
+	 * @return void
 	 * @since 5.0.0
 	 * @deprecated 17.0.0
 	 */
@@ -77,7 +77,7 @@ public static function getItemSharedWithBySource($itemType, $itemSource, $format
 	 * Based on the given token the share information will be returned - password protected shares will be verified
 	 * @param string $token
 	 * @param bool $checkPasswordProtection
-	 * @return array|bool false will be returned in case the token is unknown or unauthorized
+	 * @return void
 	 * @since 5.0.0 - parameter $checkPasswordProtection was added in 7.0.0
 	 * @deprecated 17.0.0
 	 */
@@ -93,7 +93,7 @@ public static function getShareByToken($token, $checkPasswordProtection = true)
 	 * @param mixed $parameters
 	 * @param int $limit Number of items to return (optional) Returns all by default
 	 * @param bool $includeCollections
-	 * @return mixed Return depends on format
+	 * @return void
 	 * @since 5.0.0
 	 * @deprecated 17.0.0
 	 */

lib/public/Util.php

@@ -372,7 +372,7 @@ public static function humanFileSize($bytes) {
 	/**
 	 * Make a computer file size (2 kB to 2048)
 	 * @param string $str file size in a fancy format
-	 * @return float a file size in bytes
+	 * @return float|false a file size in bytes
 	 *
 	 * Inspired by: https://www.php.net/manual/en/function.filesize.php#92418
 	 * @since 4.0.0

remote.php

@@ -81,7 +81,7 @@ function handleException($e) {
 			}
 			if ($e instanceof RemoteException) {
 				// we shall not log on RemoteException
-				OC_Template::printErrorPage($e->getMessage(), '', $e->getCode());
+				OC_Template::printErrorPage($e->getMessage(), '', (int)$e->getCode());
 			} else {
 				\OC::$server->getLogger()->logException($e, ['app' => 'remote']);
 				OC_Template::printExceptionErrorPage($e, $statusCode);