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 reporting of replace conflicts to not mention provides

Browse source
This commit is contained in:
Jordi Boggiano 2020-01-30 17:11:34 +01:00
parent ec90c17e3b
commit 189d5adab0
No known key found for this signature in database
GPG key ID: 7BBD42C429EC80BC
5 changed files with 74 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -726,7 +726,7 @@ class SolverTest extends TestCase
$msg .= " - C 1.0 requires d >= 1.0 -> satisfiable by D[1.0].\n";
$msg .= " - D 1.0 requires b < 1.0 -> satisfiable by B[0.9].\n";
$msg .= " - B 1.0 requires c >= 1.0 -> satisfiable by C[1.0].\n";
$msg .= " - Only one of these can be installed: B[0.9, 1.0].\n";
$msg .= " - You can only install one version of a package, so only one of these can be installed: B[0.9, 1.0].\n";
$msg .= " - A 1.0 requires b >= 1.0 -> satisfiable by B[1.0].\n";
$msg .= " - Root composer.json requires a -> satisfiable by A[1.0].\n";
$this->assertEquals($msg, $e->getPrettyString($this->repoSet, $this->request, $this->pool));