Fix display of conflicts when a rule has the conflicter out of order, f…

…ixes #10355
composer · Dec 19, 2021 · d812982 · d812982
1 parent 239638e
commit d812982
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Composer/DependencyResolver/Rule.php b/src/Composer/DependencyResolver/Rule.php
@@ -241,7 +241,6 @@ public function getSourcePackage(Pool $pool)
                 $package1 = $this->deduplicateDefaultBranchAlias($pool->literalToPackage($literals[0]));
                 $package2 = $this->deduplicateDefaultBranchAlias($pool->literalToPackage($literals[1]));
 
-                $conflictTarget = $package1->getPrettyString();
                 if ($reasonData = $this->getReasonData()) {
                     // swap literals if they are not in the right order with package2 being the conflicter
                     if ($reasonData->getSource() === $package1->getName()) {
@@ -313,6 +312,7 @@ public function getPrettyString(RepositorySet $repositorySet, Request $request,
                     // swap literals if they are not in the right order with package2 being the conflicter
                     if ($reasonData->getSource() === $package1->getName()) {
                         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,