Skip to content

[stable20] Fix/app fetcher php compat comparison #25347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Jan 27, 2021
Merged

[stable20] Fix/app fetcher php compat comparison #25347

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbe8930
Revert "Fix comparison of PHP versions"
ChristophWurst Jan 26, 2021
9010937
Fix app fetcher php comparison to allow wider ranges
ChristophWurst Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Revert "Fix comparison of PHP versions" 
This reverts commit bedd9ac.
  • Loading branch information
@ChristophWurst @backportbot
ChristophWurst authored and backportbot[bot] committed Jan 27, 2021
commit fbe893016f2e2798e1cc00678e2aefa314390916
4 changes: 2 additions & 2 deletions lib/private/App/AppStore/Fetcher/AppFetcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ protected function fetch($ETag, $content, $allowUnstable = false) {
$phpVersion = $versionParser->getVersion($release['rawPhpVersionSpec']);
$minPhpVersion = $phpVersion->getMinimumVersion();
$maxPhpVersion = $phpVersion->getMaximumVersion();
$minPhpFulfilled = $minPhpVersion === '' || version_compare(
$minPhpFulfilled = $minPhpVersion === '' || $this->compareVersion->isCompatible(
PHP_VERSION,
$minPhpVersion,
'>='
);
$maxPhpFulfilled = $maxPhpVersion === '' || version_compare(
$maxPhpFulfilled = $maxPhpVersion === '' || $this->compareVersion->isCompatible(
PHP_VERSION,
$maxPhpVersion,
'<='
Expand Down