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

Fix display of conflicts when a rule has the conflicter out of order, fixes #10355

pull/10372/head
Jordi Boggiano 2021-12-19 16:07:20 +01:00
parent 239638e687
commit d81298239b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/DependencyResolver/Rule.php
View File

@ -241,7 +241,6 @@ abstract class Rule
$package1 = $this->deduplicateDefaultBranchAlias($pool->literalToPackage($literals[0])); $package1 = $this->deduplicateDefaultBranchAlias($pool->literalToPackage($literals[0]));
$package2 = $this->deduplicateDefaultBranchAlias($pool->literalToPackage($literals[1])); $package2 = $this->deduplicateDefaultBranchAlias($pool->literalToPackage($literals[1]));
$conflictTarget = $package1->getPrettyString();
if ($reasonData = $this->getReasonData()) { if ($reasonData = $this->getReasonData()) {
// swap literals if they are not in the right order with package2 being the conflicter // swap literals if they are not in the right order with package2 being the conflicter
if ($reasonData->getSource() === $package1->getName()) { if ($reasonData->getSource() === $package1->getName()) {
@ -313,6 +312,7 @@ abstract class Rule
// swap literals if they are not in the right order with package2 being the conflicter // swap literals if they are not in the right order with package2 being the conflicter
if ($reasonData->getSource() === $package1->getName()) { if ($reasonData->getSource() === $package1->getName()) {
list($package2, $package1) = array($package1, $package2); list($package2, $package1) = array($package1, $package2);
$conflictTarget = $package1->getPrettyName().' '.$reasonData->getPrettyConstraint();
} }
// if the conflict is not directly against the package but something it provides/replaces, // if the conflict is not directly against the package but something it provides/replaces,