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

Fix Solver CS

pull/911/head
Adrien Brault 2012-07-15 17:31:03 +03:00
parent bf245ab885
commit 4263fe9255
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,12 +524,14 @@ class Solver
if (!$job) { if (!$job) {
$why->disable(); $why->disable();
} else {
// disable all rules of this job return;
foreach ($this->rules as $rule) { }
if ($job === $rule->getJob()) {
$rule->disable(); // disable all rules of this job
} foreach ($this->rules as $rule) {
if ($job === $rule->getJob()) {
$rule->disable();
} }
} }
} }
@ -600,12 +602,12 @@ class Solver
if (1 === $level) { if (1 === $level) {
$conflictRule = $this->propagate($level); $conflictRule = $this->propagate($level);
if ($conflictRule !== null) { if (null !== $conflictRule) {
if ($this->analyzeUnsolvable($conflictRule, $disableRules)) { if ($this->analyzeUnsolvable($conflictRule, $disableRules)) {
continue; continue;
} else {
return;
} }
return;
} }
} }