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

Define the calculation of package priorities in a single method

pull/60/head
Nils Adermann 2011-10-22 16:48:23 +02:00
parent 1b6f57e651
commit 44369472be
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Composer/DependencyResolver/DefaultPolicy.php
View File

@ -63,6 +63,11 @@ class DefaultPolicy implements PolicyInterface
return true; return true;
} }
public function getPriority(Pool $pool, PackageInterface $package)
{
return $pool->getPriority($package->getRepository());
}
public function selectPreferedPackages(Pool $pool, RepositoryInterface $installed, array $literals) public function selectPreferedPackages(Pool $pool, RepositoryInterface $installed, array $literals)
{ {
$packages = $this->groupLiteralsByNamePreferInstalled($installed, $literals); $packages = $this->groupLiteralsByNamePreferInstalled($installed, $literals);
@ -119,7 +124,7 @@ class DefaultPolicy implements PolicyInterface
return 1; return 1;
} }
return ($pool->getPriority($a->getRepository()) > $pool->getPriority($b->getRepository())) ? -1 : 1; return ($this->getPriority($pool, $a) > $this->getPriority($pool, $b)) ? -1 : 1;
} }
protected function pruneToBestVersion($literals) protected function pruneToBestVersion($literals)
@ -169,18 +174,18 @@ class DefaultPolicy implements PolicyInterface
$priority = null; $priority = null;
foreach ($literals as $literal) { foreach ($literals as $literal) {
$repo = $literal->getPackage()->getRepository(); $package = $literal->getPackage();
if ($repo === $installed) { if ($package->getRepository() === $installed) {
$selected[] = $literal; $selected[] = $literal;
continue; continue;
} }
if (null === $priority) { if (null === $priority) {
$priority = $pool->getPriority($repo); $priority = $this->getPriority($pool, $package);
} }
if ($pool->getPriority($repo) != $priority) { if ($this->getPriority($pool, $package) != $priority) {
break; break;
} }