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

Merge pull request #9309 from naderman/fix-solver-9290 

MultiConflictRule conflict analysis handling on level 1 decisions
pull/9317/head
Jordi Boggiano 2020-10-21 18:40:03 +02:00 committed by GitHub
parent 7cfb6dadf0 7f41698157
commit b74afd772b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 119 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,35 +465,35 @@ class Solver
// only level 1 marks left
$l1num++;
$l1retry = true;
}
} else {
$decision = $this->decisions->atOffset($decisionId);
$rule = $decision[Decisions::DECISION_REASON];
$decision = $this->decisions->atOffset($decisionId);
$rule = $decision[Decisions::DECISION_REASON];
if ($rule instanceof MultiConflictRule) {
// there is only ever exactly one positive decision in a multiconflict rule
foreach ($rule->getLiterals() as $literal) {
if (!isset($seen[abs($literal)]) && $this->decisions->satisfy(-$literal)) {
$this->learnedPool[\count($this->learnedPool) - 1][] = $rule;
$l = $this->decisions->decisionLevel($literal);
if (1 === $l) {
$l1num++;
} elseif ($level === $l) {
$num++;
} else {
// not level1 or conflict level, add to new rule
$learnedLiterals[] = $literal;
if ($rule instanceof MultiConflictRule) {
// there is only ever exactly one positive decision in a multiconflict rule
foreach ($rule->getLiterals() as $literal) {
if (!isset($seen[abs($literal)]) && $this->decisions->satisfy(-$literal)) {
$this->learnedPool[\count($this->learnedPool) - 1][] = $rule;
$l = $this->decisions->decisionLevel($literal);
if (1 === $l) {
$l1num++;
} elseif ($level === $l) {
$num++;
} else {
// not level1 or conflict level, add to new rule
$learnedLiterals[] = $literal;
if ($l > $ruleLevel) {
$ruleLevel = $l;
if ($l > $ruleLevel) {
$ruleLevel = $l;
}
}
$seen[abs($literal)] = true;
break;
}
$seen[abs($literal)] = true;
break;
}
}
$l1retry = true;
$l1retry = true;
}
}
}

96
tests/Composer/Test/Fixtures/installer/github-issues-9290.test Normal file
View File

@ -0,0 +1,96 @@
--TEST--
See Github issue #9290 ( https://github.com/composer/composer/issues/9290 ).
MultiConflictRule with a level 1 decision needs to exit correctly.
--COMPOSER--
{
"require": {
"mailgun/mailgun-php": "^2.8"
},
"minimum-stability": "dev",
"repositories": {
"mailgun/mailgun-php": {
"type": "package",
"package": [
{
"name": "mailgun/mailgun-php",
"version": "2.x-dev",
"type": "library",
"require": {
"php-http/httplug": "^1.0 || ^2.0",
"php-http/client-common": "^1.1"
}
}
]
},
"php-http/client-common": {
"type": "package",
"package": [
{
"name": "php-http/client-common",
"version": "1.10.0",
"type": "library",
"require": {
"php-http/httplug": "^1.1",
"symfony/options-resolver": "^5.0"
}
},
{
"name": "php-http/client-common",
"version": "1.x-dev",
"type": "library",
"require": {
"php-http/httplug": "^1.1",
"symfony/options-resolver": "^5.0"
}
}
]
},
"php-http/httplug": {
"type": "package",
"package": [
{
"name": "php-http/httplug",
"version": "v2.0.0",
"type": "library"
},
{
"name": "php-http/httplug",
"version": "v1.1.0",
"type": "library"
},
{
"name": "php-http/httplug",
"version": "dev-master",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"default-branch": true
}
]
},
"symfony/options-resolver": {
"type": "package",
"package": [
{
"name": "symfony/options-resolver",
"version": "v5.2.0-BETA1",
"type": "library"
}
]
}
}
}
--RUN--
update
--EXPECT--
Installing php-http/httplug (v1.1.0)
Installing symfony/options-resolver (v5.2.0-BETA1)
Installing php-http/client-common (1.x-dev)
Installing mailgun/mailgun-php (2.x-dev)