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

Solver: Ensure multi conflict rules still get added to learned pool

pull/8999/head
Nils Adermann 2020-06-26 22:04:17 +02:00
parent de3931c742
commit 3f5dde9873
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -473,6 +473,7 @@ class Solver
// there is only ever exactly one positive decision in a multiconflict rule // there is only ever exactly one positive decision in a multiconflict rule
foreach ($rule->getLiterals() as $literal) { foreach ($rule->getLiterals() as $literal) {
if (!isset($seen[abs($literal)]) && $this->decisions->satisfy(-$literal)) { if (!isset($seen[abs($literal)]) && $this->decisions->satisfy(-$literal)) {
$this->learnedPool[\count($this->learnedPool) - 1][] = $rule;
$l = $this->decisions->decisionLevel($literal); $l = $this->decisions->decisionLevel($literal);
if (1 === $l) { if (1 === $l) {
$l1num++; $l1num++;