public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

fix based on test, fixes #5724

pull/5726/head
Rob Bast 2016-09-27 17:17:30 +02:00
parent 9f2bd34c87
commit 710bb0d008
No known key found for this signature in database
GPG Key ID: 73076E35E6165F39
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Composer/Package/Version/VersionSelector.php
View File

@ -71,11 +71,21 @@ class VersionSelector
$candidatePriority = $candidate->getStabilityPriority(); $candidatePriority = $candidate->getStabilityPriority();
$currentPriority = $package->getStabilityPriority(); $currentPriority = $package->getStabilityPriority();
// candidate is less stable than our preferred stability, and we have a package that is more stable than it, so we skip it // candidate is less stable than our preferred stability,
// and current package is more stable than candidate, skip it
if ($minPriority < $candidatePriority && $currentPriority < $candidatePriority) { if ($minPriority < $candidatePriority && $currentPriority < $candidatePriority) {
continue; continue;
} }
// candidate is more stable than our preferred stability, and current package is less stable than preferred stability, then we select the candidate always
// candidate is less stable than our preferred stability,
// and current package is less stable than candidate, select candidate
if ($minPriority < $candidatePriority && $candidatePriority < $currentPriority) {
$package = $candidate;
continue;
}
// candidate is more stable than our preferred stability,
// and current package is less stable than preferred stability, select candidate
if ($minPriority >= $candidatePriority && $minPriority < $currentPriority) { if ($minPriority >= $candidatePriority && $minPriority < $currentPriority) {
$package = $candidate; $package = $candidate;
continue; continue;