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

Process all jobs in one method and remove lock jobs which are not used

pull/715/head
Nils Adermann 2012-05-15 20:19:38 +02:00
parent 3fcd042fd4
commit 70e306f055
2 changed files with 48 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/DependencyResolver/Rule.php
View File

@ -20,7 +20,6 @@ class Rule
const RULE_INTERNAL_ALLOW_UPDATE = 1; const RULE_INTERNAL_ALLOW_UPDATE = 1;
const RULE_JOB_INSTALL = 2; const RULE_JOB_INSTALL = 2;
const RULE_JOB_REMOVE = 3; const RULE_JOB_REMOVE = 3;
const RULE_JOB_LOCK = 4;
const RULE_PACKAGE_CONFLICT = 6; const RULE_PACKAGE_CONFLICT = 6;
const RULE_PACKAGE_REQUIRES = 7; const RULE_PACKAGE_REQUIRES = 7;
const RULE_PACKAGE_OBSOLETES = 8; const RULE_PACKAGE_OBSOLETES = 8;
@ -196,9 +195,6 @@ class Rule
case self::RULE_JOB_REMOVE: case self::RULE_JOB_REMOVE:
return "Remove command rule ($ruleText)"; return "Remove command rule ($ruleText)";
case self::RULE_JOB_LOCK:
return "Lock command rule ($ruleText)";
case self::RULE_PACKAGE_CONFLICT: case self::RULE_PACKAGE_CONFLICT:
$package1 = $this->literals[0]->getPackage(); $package1 = $this->literals[0]->getPackage();
$package2 = $this->literals[1]->getPackage(); $package2 = $this->literals[1]->getPackage();

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

@ -481,6 +481,53 @@ class Solver
} }
} }
protected function addRulesForJobs()
{
foreach ($this->jobs as $job) {
switch ($job['cmd']) {
case 'update':
foreach ($job['packages'] as $package) {
if (isset($this->installedMap[$package->getId()])) {
$this->updateMap[$package->getId()] = true;
}
}
break;
case 'update-all':
foreach ($this->installedMap as $package) {
$this->updateMap[$package->getId()] = true;
}
break;
case 'install':
if (empty($job['packages'])) {
$problem = new Problem();
$problem->addJobRule($job);
$this->problems[] = $problem;
} else {
foreach ($job['packages'] as $package) {
if (!isset($this->installedMap[$package->getId()])) {
$this->addRulesForPackage($package);
}
}
$rule = $this->createInstallOneOfRule($job['packages'], Rule::RULE_JOB_INSTALL, $job['packageName']);
$this->addRule(RuleSet::TYPE_JOB, $rule);
$this->ruleToJob[$rule->getId()] = $job;
}
break;
case 'remove':
// remove all packages with this name including uninstalled
// ones to make sure none of them are picked as replacements
foreach ($job['packages'] as $package) {
$rule = $this->createRemoveRule($package, Rule::RULE_JOB_REMOVE);
$this->addRule(RuleSet::TYPE_JOB, $rule);
$this->ruleToJob[$rule->getId()] = $job;
}
break;
}
}
}
public function solve(Request $request) public function solve(Request $request)
{ {
$this->jobs = $request->getJobs(); $this->jobs = $request->getJobs();
@ -493,79 +540,12 @@ class Solver
$this->decisionMap = array_fill(0, $this->pool->getMaxId() + 1, 0); $this->decisionMap = array_fill(0, $this->pool->getMaxId() + 1, 0);
} }
foreach ($this->jobs as $job) {
foreach ($job['packages'] as $package) {
switch ($job['cmd']) {
case 'update':
if (isset($this->installedMap[$package->getId()])) {
$this->updateMap[$package->getId()] = true;
}
break;
}
}
switch ($job['cmd']) {
case 'update-all':
foreach ($this->installedMap as $package) {
$this->updateMap[$package->getId()] = true;
}
break;
}
}
foreach ($this->installedMap as $package) { foreach ($this->installedMap as $package) {
$this->addRulesForPackage($package); $this->addRulesForPackage($package);
$this->addRulesForUpdatePackages($package); $this->addRulesForUpdatePackages($package);
} }
foreach ($this->jobs as $job) { $this->addRulesForJobs();
foreach ($job['packages'] as $package) {
switch ($job['cmd']) {
case 'install':
$this->installCandidateMap[$package->getId()] = true;
$this->addRulesForPackage($package);
break;
}
}
}
foreach ($this->jobs as $job) {
switch ($job['cmd']) {
case 'install':
if (empty($job['packages'])) {
$problem = new Problem();
$problem->addJobRule($job);
$this->problems[] = $problem;
} else {
$rule = $this->createInstallOneOfRule($job['packages'], Rule::RULE_JOB_INSTALL, $job['packageName']);
$this->addRule(RuleSet::TYPE_JOB, $rule);
$this->ruleToJob[$rule->getId()] = $job;
}
break;
case 'remove':
// remove all packages with this name including uninstalled
// ones to make sure none of them are picked as replacements
// todo: cleandeps
foreach ($job['packages'] as $package) {
$rule = $this->createRemoveRule($package, Rule::RULE_JOB_REMOVE);
$this->addRule(RuleSet::TYPE_JOB, $rule);
$this->ruleToJob[$rule->getId()] = $job;
}
break;
case 'lock':
foreach ($job['packages'] as $package) {
if (isset($this->installedMap[$package->getId()])) {
$rule = $this->createInstallRule($package, Rule::RULE_JOB_LOCK);
} else {
$rule = $this->createRemoveRule($package, Rule::RULE_JOB_LOCK);
}
$this->addRule(RuleSet::TYPE_JOB, $rule);
$this->ruleToJob[$rule->getId()] = $job;
}
break;
}
}
foreach ($this->rules as $rule) { foreach ($this->rules as $rule) {
$this->addWatchesToRule($rule); $this->addWatchesToRule($rule);