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

MultiConflictRules cannot be disabled, so no need to check

pull/8424/head
Nils Adermann 2019-11-12 23:04:58 +01:00
parent 79066931e6
commit 28afc4de32
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Composer/DependencyResolver/RuleWatchGraph.php
View File

@ -128,7 +128,6 @@ class RuleWatchGraph
$decisions->decide($otherWatch, $level, $node->getRule()); $decisions->decide($otherWatch, $level, $node->getRule());
} }
} else { } else {
// check isDisabled?
foreach ($node->getRule()->getLiterals() as $otherLiteral) { foreach ($node->getRule()->getLiterals() as $otherLiteral) {
if ($literal !== $otherLiteral && !$decisions->satisfy($otherLiteral)) { if ($literal !== $otherLiteral && !$decisions->satisfy($otherLiteral)) {
if ($decisions->conflict($otherLiteral)) { if ($decisions->conflict($otherLiteral)) {