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

Make sure versions are sorted before they get trimmed in error output

pull/8807/head
Jordi Boggiano 2020-04-19 15:51:13 +02:00
parent 424c08d6b2
commit 3f338ee8d9
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Composer/DependencyResolver/Problem.php
View File

@ -300,6 +300,7 @@ class Problem
unset($package['versions'][VersionParser::DEV_MASTER_ALIAS]); unset($package['versions'][VersionParser::DEV_MASTER_ALIAS]);
} }
if (!$isVerbose && count($package['versions']) > 4) { if (!$isVerbose && count($package['versions']) > 4) {
uksort($package['versions'], 'version_compare');
$filtered = array(); $filtered = array();
$byMajor = array(); $byMajor = array();
foreach ($package['versions'] as $version => $pretty) { foreach ($package['versions'] as $version => $pretty) {

8
tests/Composer/Test/Fixtures/installer/problems-reduce-versions.test
View File

@ -11,29 +11,30 @@ Test the error output minifies version lists
{"name": "b/b", "version": "1.0.1"}, {"name": "b/b", "version": "1.0.1"},
{"name": "b/b", "version": "1.0.2"}, {"name": "b/b", "version": "1.0.2"},
{"name": "b/b", "version": "1.0.3"}, {"name": "b/b", "version": "1.0.3"},
{"name": "b/b", "version": "v1.1.4"},
{"name": "b/b", "version": "1.0.4"}, {"name": "b/b", "version": "1.0.4"},
{"name": "b/b", "version": "1.0.5"}, {"name": "b/b", "version": "1.0.5"},
{"name": "b/b", "version": "1.0.6"}, {"name": "b/b", "version": "1.0.6"},
{"name": "b/b", "version": "1.0.7"}, {"name": "b/b", "version": "1.0.7"},
{"name": "b/b", "version": "1.1.0"},
{"name": "b/b", "version": "2.0.5"},
{"name": "b/b", "version": "1.0.8"}, {"name": "b/b", "version": "1.0.8"},
{"name": "b/b", "version": "1.0.9"}, {"name": "b/b", "version": "1.0.9"},
{"name": "b/b", "version": "1.1.0"},
{"name": "b/b", "version": "1.1.1"}, {"name": "b/b", "version": "1.1.1"},
{"name": "b/b", "version": "1.1.2"}, {"name": "b/b", "version": "1.1.2"},
{"name": "b/b", "version": "1.1.3"}, {"name": "b/b", "version": "1.1.3"},
{"name": "b/b", "version": "v1.1.4"},
{"name": "b/b", "version": "1.1.5"}, {"name": "b/b", "version": "1.1.5"},
{"name": "b/b", "version": "v1.1.6"}, {"name": "b/b", "version": "v1.1.6"},
{"name": "b/b", "version": "1.1.7-alpha"}, {"name": "b/b", "version": "1.1.7-alpha"},
{"name": "b/b", "version": "1.1.8"}, {"name": "b/b", "version": "1.1.8"},
{"name": "b/b", "version": "1.1.9"}, {"name": "b/b", "version": "1.1.9"},
{"name": "b/b", "version": "1.2.0"}, {"name": "b/b", "version": "1.2.0"},
{"name": "b/b", "version": "1.2.1"},
{"name": "b/b", "version": "1.2.2"}, {"name": "b/b", "version": "1.2.2"},
{"name": "b/b", "version": "1.2.3"}, {"name": "b/b", "version": "1.2.3"},
{"name": "b/b", "version": "1.2.4"}, {"name": "b/b", "version": "1.2.4"},
{"name": "b/b", "version": "1.2.5"}, {"name": "b/b", "version": "1.2.5"},
{"name": "b/b", "version": "1.2.6"}, {"name": "b/b", "version": "1.2.6"},
{"name": "b/b", "version": "1.2.1"},
{"name": "b/b", "version": "1.2.7"}, {"name": "b/b", "version": "1.2.7"},
{"name": "b/b", "version": "1.2.8"}, {"name": "b/b", "version": "1.2.8"},
{"name": "b/b", "version": "1.2.9"}, {"name": "b/b", "version": "1.2.9"},
@ -42,7 +43,6 @@ Test the error output minifies version lists
{"name": "b/b", "version": "2.0.2"}, {"name": "b/b", "version": "2.0.2"},
{"name": "b/b", "version": "2.0.3"}, {"name": "b/b", "version": "2.0.3"},
{"name": "b/b", "version": "2.0.4"}, {"name": "b/b", "version": "2.0.4"},
{"name": "b/b", "version": "2.0.5"},
{"name": "b/b", "version": "2.0.6"}, {"name": "b/b", "version": "2.0.6"},
{"name": "b/b", "version": "2.0.7"}, {"name": "b/b", "version": "2.0.7"},
{"name": "b/b", "version": "2.0.8"}, {"name": "b/b", "version": "2.0.8"},