danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Allow older composer/semver cc @xurizaemon

Browse Source
This commit is contained in:
Matt Brown 2021-03-28 23:45:45 -04:00
parent ec7de89f0c
commit 2d197e3e12
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -24,7 +24,7 @@
"amphp/amp": "^2.4.2",
"amphp/byte-stream": "^1.5",
"composer/package-versions-deprecated": "^1.8.0",
"composer/semver": "^2.0 || ^3.0",
"composer/semver": "^1.4 || ^2.0 || ^3.0",
"composer/xdebug-handler": "^1.1",
"dnoegel/php-xdg-base-dir": "^0.1.1",
"felixfbecker/advanced-json-rpc": "^3.0.3",

7
src/Psalm/Config.php
View File

@ -2064,14 +2064,17 @@ class Config
if (\is_string($php_version)) {
$version_parser = new VersionParser();
$min_php_version = $version_parser->parseConstraints($php_version)->getLowerBound()->getVersion();
$constraint = $version_parser->parseConstraints($php_version);
foreach (['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0'] as $candidate) {
if (Semver::satisfies($min_php_version, "~$candidate.0")) {
if ($constraint->matches(new \Composer\Semver\Constraint\Constraint('<=', "$candidate.0.0-dev"))) {
return $candidate;
}
}
}
}
return null;
}