Merge pull request #25152 from nextcloud/backport/25138/stable20

[stable20] Fix comparison of PHP versions

build/psalm-baseline.xml

@@ -2618,8 +2618,9 @@
     </InvalidReturnType>
   </file>
   <file src="apps/user_ldap/lib/Mapping/AbstractMapping.php">
-    <ImplicitToStringCast occurrences="1">
-      <code>$qb-&gt;createNamedParameter($fdns, QueryBuilder::PARAM_STR_ARRAY)</code>
+    <ImplicitToStringCast occurrences="2">
+      <code>$qb-&gt;createNamedParameter($dnList, QueryBuilder::PARAM_STR_ARRAY)</code>
+      <code>$qb-&gt;createNamedParameter($fdnsSlice, QueryBuilder::PARAM_STR_ARRAY)</code>
     </ImplicitToStringCast>
   </file>
   <file src="apps/user_ldap/lib/Proxy.php">

lib/private/App/AppStore/Fetcher/AppFetcher.php

@@ -113,12 +113,12 @@ class AppFetcher extends Fetcher {
 							$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
 							$minPhpVersion = $phpVersion->getMinimumVersion();
 							$maxPhpVersion = $phpVersion->getMaximumVersion();
-							$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
+							$minPhpFulfilled = $minPhpVersion === '' || version_compare(
 									PHP_VERSION,
 									$minPhpVersion,
 									'>='
 								);
-							$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
+							$maxPhpFulfilled = $maxPhpVersion === '' || version_compare(
 									PHP_VERSION,
 									$maxPhpVersion,
 									'<='