public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 16:42:57 +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
src/Composer/DependencyResolver/Rule.php
View file

@ -162,7 +162,7 @@ abstract class Rule
$package1 = $pool->literalToPackage($literals[0]);
$package2 = $pool->literalToPackage($literals[1]);
return $package1->getPrettyString().' conflicts with '.$this->formatPackagesUnique($pool, array($package2)).'.';
return $package2->getPrettyString().' conflicts with '.$package1->getPrettyString().'.';
case self::RULE_PACKAGE_REQUIRES:
$sourceLiteral = array_shift($literals);