public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Fix conflict order to be more accurate

Browse source
This commit is contained in:
Jordi Boggiano 2020-01-30 15:51:56 +01:00
parent 1e68555e0a
commit ec90c17e3b
No known key found for this signature in database
GPG key ID: 7BBD42C429EC80BC
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/Composer/Test/DependencyResolver/SolverTest.php
View file

@ -652,7 +652,7 @@ class SolverTest extends TestCase
$msg = "\n";
$msg .= " Problem 1\n";
$msg .= " - Root composer.json requires a -> satisfiable by A[1.0].\n";
$msg .= " - B 1.0 conflicts with A[1.0].\n";
$msg .= " - A 1.0 conflicts with B 1.0.\n";
$msg .= " - Root composer.json requires b -> satisfiable by B[1.0].\n";
$this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool));
}