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

Avoid creating unnecessary conflict rules for provide/replace of aliases

pull/9477/head
Nils Adermann 2020-11-13 16:05:20 +01:00
parent 3764b3007d
commit 780e6fc027
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/DependencyResolver/RuleSetGenerator.php
View File

@ -211,7 +211,12 @@ class RuleSetGenerator
$conflicts = $this->pool->whatProvides($link->getTarget(), $link->getConstraint()); $conflicts = $this->pool->whatProvides($link->getTarget(), $link->getConstraint());
foreach ($conflicts as $conflict) { foreach ($conflicts as $conflict) {
$this->addRule(RuleSet::TYPE_PACKAGE, $this->createRule2Literals($package, $conflict, Rule::RULE_PACKAGE_CONFLICT, $link)); // define the conflict rule for regular packages, for alias packages it's only needed if the name
// matches the conflict exactly, otherwise the name match is by provide/replace which means the
// package which this is an alias of will conflict anyway, so no need to create additional rules
if (!$conflict instanceof AliasPackage || $conflict->getName() === $link->getTarget()) {
$this->addRule(RuleSet::TYPE_PACKAGE, $this->createRule2Literals($package, $conflict, Rule::RULE_PACKAGE_CONFLICT, $link));
}
} }
} }
} }