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

Call feature rules update rules, as there is no difference in composer

pull/636/head
Nils Adermann 2012-04-27 18:25:38 +02:00
parent f98ab2e491
commit d153ab3f8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ class Solver
protected $decisionMap; protected $decisionMap;
protected $installedMap; protected $installedMap;
protected $packageToFeatureRule = array(); protected $packageToUpdateRule = array();
protected $decisionQueue = array(); protected $decisionQueue = array();
protected $decisionQueueWhy = array(); protected $decisionQueueWhy = array();
@ -555,7 +555,7 @@ class Solver
$updates = $this->policy->findUpdatePackages($this, $this->pool, $this->installedMap, $package); $updates = $this->policy->findUpdatePackages($this, $this->pool, $this->installedMap, $package);
$rule = $this->createUpdateRule($package, $updates, Rule::RULE_INTERNAL_ALLOW_UPDATE, (string) $package); $rule = $this->createUpdateRule($package, $updates, Rule::RULE_INTERNAL_ALLOW_UPDATE, (string) $package);
$this->packageToFeatureRule[$package->getId()] = $rule; $this->packageToUpdateRule[$package->getId()] = $rule;
} }
foreach ($this->jobs as $job) { foreach ($this->jobs as $job) {
@ -625,8 +625,8 @@ class Solver
if (!$literal->isWanted() && isset($this->installedMap[$package->getId()])) { if (!$literal->isWanted() && isset($this->installedMap[$package->getId()])) {
$literals = array(); $literals = array();
if (isset($this->packageToFeatureRule[$package->getId()])) { if (isset($this->packageToUpdateRule[$package->getId()])) {
$literals = array_merge($literals, $this->packageToFeatureRule[$package->getId()]->getLiterals()); $literals = array_merge($literals, $this->packageToUpdateRule[$package->getId()]->getLiterals());
} }
foreach ($literals as $updateLiteral) { foreach ($literals as $updateLiteral) {