diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 4d78638e38328..1e0c40d7d2664 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -2618,8 +2618,9 @@ - - $qb->createNamedParameter($fdns, QueryBuilder::PARAM_STR_ARRAY) + + $qb->createNamedParameter($dnList, QueryBuilder::PARAM_STR_ARRAY) + $qb->createNamedParameter($fdnsSlice, QueryBuilder::PARAM_STR_ARRAY) diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 4dc517879e83b..70bf2a37d9d52 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -113,12 +113,12 @@ protected function fetch($ETag, $content, $allowUnstable = false) { $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, '<='