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

Prune unreachable required versions correctly for aliased packages 

In trials this seems pointless, so maybe better to skip aliases and
reduce memory and cpu wasted on looking these things up
pull/7644/head
Nils Adermann 2018-09-14 15:03:38 +02:00
parent 83efeaec5c
commit 537f4fbc3b
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Composer/DependencyResolver/PoolBuilder.php
View File

@ -99,12 +99,27 @@ class PoolBuilder
} }
foreach ($this->packages as $i => $package) { foreach ($this->packages as $i => $package) {
if (!$package instanceof AliasPackage && !isset($this->aliasMap[spl_object_hash($package)]) && isset($this->nameConstraints[$package->getName()])) { // we check all alias related packages at once, so no need ot check individual aliases
// isset also checks non-null value
if (!$package instanceof AliasPackage && isset($this->nameConstraints[$package->getName()])) {
$constraint = $this->nameConstraints[$package->getName()]; $constraint = $this->nameConstraints[$package->getName()];
if ($constraint && !$constraint->matches(new Constraint('==', $package->getVersion()))) { $aliasedPackages = array($i => $package);
unset($this->packages[$i]); if (isset($this->aliasMap[spl_object_hash($package)])) {
unset($this->priorities[$i]); $aliasedPackages += $this->aliasMap[spl_object_hash($package)];
}
$found = false;
foreach ($aliasedPackages as $packageOrAlias) {
if ($constraint->matches(new Constraint('==', $packageOrAlias->getVersion()))) {
$found = true;
}
}
if (!$found) {
foreach ($aliasedPackages as $index => $packageOrAlias) {
unset($this->packages[$index]);
unset($this->priorities[$index]);
}
} }
} }
} }
@ -120,16 +135,21 @@ class PoolBuilder
$this->pool->setPackages($this->packages, $this->priorities); $this->pool->setPackages($this->packages, $this->priorities);
unset($this->aliasMap);
unset($this->loadedNames);
unset($this->nameConstraints);
return $this->pool; return $this->pool;
} }
private function loadPackage(PackageInterface $package, $repoIndex) private function loadPackage(PackageInterface $package, $repoIndex)
{ {
$index = count($this->packages);
$this->packages[] = $package; $this->packages[] = $package;
$this->priorities[] = -$repoIndex; $this->priorities[] = -$repoIndex;
if ($package instanceof AliasPackage) { if ($package instanceof AliasPackage) {
$this->aliasMap[spl_object_hash($package->getAliasOf())][] = $package; $this->aliasMap[spl_object_hash($package->getAliasOf())][$index] = $package;
} }
// handle root package aliases // handle root package aliases
@ -147,7 +167,7 @@ class PoolBuilder
$package->getRepository()->addPackage($aliasPackage); // TODO do we need this? $package->getRepository()->addPackage($aliasPackage); // TODO do we need this?
$this->packages[] = $aliasPackage; $this->packages[] = $aliasPackage;
$this->priorities[] = -$repoIndex; $this->priorities[] = -$repoIndex;
$this->aliasMap[spl_object_hash($aliasPackage->getAliasOf())][] = $aliasPackage; $this->aliasMap[spl_object_hash($aliasPackage->getAliasOf())][$index+1] = $aliasPackage;
} }
$loadNames = array(); $loadNames = array();