From 28afc4de32e5d795948403e031a0a297dcebc252 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 12 Nov 2019 23:04:58 +0100 Subject: [PATCH] MultiConflictRules cannot be disabled, so no need to check --- src/Composer/DependencyResolver/RuleWatchGraph.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Composer/DependencyResolver/RuleWatchGraph.php b/src/Composer/DependencyResolver/RuleWatchGraph.php index 59a259356..e7fae0c61 100644 --- a/src/Composer/DependencyResolver/RuleWatchGraph.php +++ b/src/Composer/DependencyResolver/RuleWatchGraph.php @@ -128,7 +128,6 @@ class RuleWatchGraph $decisions->decide($otherWatch, $level, $node->getRule()); } } else { - // check isDisabled? foreach ($node->getRule()->getLiterals() as $otherLiteral) { if ($literal !== $otherLiteral && !$decisions->satisfy($otherLiteral)) { if ($decisions->conflict($otherLiteral)) {