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

Move private function further down in pool

pull/3994/head
Nils Adermann 2015-05-05 20:28:22 +02:00
parent aa7d145dd0
commit cfd0e44312
1 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/Composer/DependencyResolver/Pool.php
View File

@ -107,44 +107,6 @@ class Pool
} }
} }
private function loadPackage(PackageInterface $package, array $rootAliases, $acceptableExemption = false)
{
$names = $package->getNames();
$stability = $package->getStability();
if (!$acceptableExemption && !$this->isPackageAcceptable($names, $stability)) {
return;
}
$package->setId($this->id++);
$this->packages[] = $package;
$this->packageByExactName[$package->getName()][$package->id] = $package;
foreach ($names as $provided) {
$this->packageByName[$provided][] = $package;
}
// handle root package aliases
$name = $package->getName();
if (isset($rootAliases[$name][$package->getVersion()])) {
$alias = $rootAliases[$name][$package->getVersion()];
if ($package instanceof AliasPackage) {
$package = $package->getAliasOf();
}
$aliasPackage = new AliasPackage($package, $alias['alias_normalized'], $alias['alias']);
$aliasPackage->setRootPackageAlias(true);
$aliasPackage->setId($this->id++);
$package->getRepository()->addPackage($aliasPackage);
$this->packages[] = $aliasPackage;
$this->packageByExactName[$aliasPackage->getName()][$aliasPackage->id] = $aliasPackage;
foreach ($aliasPackage->getNames() as $name) {
$this->packageByName[$name][] = $aliasPackage;
}
}
}
public function getPriority(RepositoryInterface $repo) public function getPriority(RepositoryInterface $repo)
{ {
$priority = array_search($repo, $this->repositories, true); $priority = array_search($repo, $this->repositories, true);
@ -167,6 +129,11 @@ class Pool
return $this->packages[$id - 1]; return $this->packages[$id - 1];
} }
/**
* Ensures that all given names and their requirements are loaded.
*
* @param array $packageNames A list of names that need to be available
*/
public function loadRecursively(array $packageNames) public function loadRecursively(array $packageNames)
{ {
$loadedMap = array(); $loadedMap = array();
@ -214,6 +181,44 @@ class Pool
return $this->providerCache[$name][$key] = $this->computeWhatProvides($name, $constraint, $mustMatchName); return $this->providerCache[$name][$key] = $this->computeWhatProvides($name, $constraint, $mustMatchName);
} }
private function loadPackage(PackageInterface $package, array $rootAliases, $acceptableExemption = false)
{
$names = $package->getNames();
$stability = $package->getStability();
if (!$acceptableExemption && !$this->isPackageAcceptable($names, $stability)) {
return;
}
$package->setId($this->id++);
$this->packages[] = $package;
$this->packageByExactName[$package->getName()][$package->id] = $package;
foreach ($names as $provided) {
$this->packageByName[$provided][] = $package;
}
// handle root package aliases
$name = $package->getName();
if (isset($rootAliases[$name][$package->getVersion()])) {
$alias = $rootAliases[$name][$package->getVersion()];
if ($package instanceof AliasPackage) {
$package = $package->getAliasOf();
}
$aliasPackage = new AliasPackage($package, $alias['alias_normalized'], $alias['alias']);
$aliasPackage->setRootPackageAlias(true);
$aliasPackage->setId($this->id++);
$package->getRepository()->addPackage($aliasPackage);
$this->packages[] = $aliasPackage;
$this->packageByExactName[$aliasPackage->getName()][$aliasPackage->id] = $aliasPackage;
foreach ($aliasPackage->getNames() as $name) {
$this->packageByName[$name][] = $aliasPackage;
}
}
}
/** /**
* @see whatProvides * @see whatProvides
*/ */