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

Merge pull request #2734 from naderman/optimize-solver 

Optimize the solver and remove unnecessary code
pull/3442/head
Nils Adermann 2014-11-20 12:56:16 +01:00
parent 8a40b2443e 9751e1ab58
commit 9e6cfaa3fe
3 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ class Pool
protected $providerRepos = array();
protected $packages = array();
protected $packageByName = array();
protected $packageByExactName = array();
protected $acceptableStabilities;
protected $stabilityFlags;
protected $versionParser;
@ -122,6 +123,7 @@ class Pool
$package['id'] = $this->id++;
$package['stability'] = $stability;
$this->packages[] = $package;
$this->packageByExactName[$package->getName()][$package['id']] = $this->packages[$this->id - 2];
foreach ($names as $provided) {
$this->packageByName[$provided][$package['id']] = $this->packages[$this->id - 2];
@ -144,6 +146,7 @@ class Pool
$alias['id'] = $this->id++;
$alias['root_alias'] = true;
$this->packages[] = $alias;
$this->packageByExactName[$package->getName()][$alias['id']] = $this->packages[$this->id - 2];
foreach ($names as $provided) {
$this->packageByName[$provided][$alias['id']] = $this->packages[$this->id - 2];
@ -159,6 +162,7 @@ class Pool
$alias['alias_of'] = $package['id'];
$alias['id'] = $this->id++;
$this->packages[] = $alias;
$this->packageByExactName[$package->getName()][$alias['id']] = $this->packages[$this->id - 2];
foreach ($names as $provided) {
$this->packageByName[$provided][$alias['id']] = $this->packages[$this->id - 2];
@ -173,6 +177,7 @@ class Pool
if ($exempt || $this->isPackageAcceptable($names, $stability)) {
$package->setId($this->id++);
$this->packages[] = $package;
$this->packageByExactName[$package->getName()][$package->getId()] = $package;
foreach ($names as $provided) {
$this->packageByName[$provided][] = $package;
@ -191,6 +196,7 @@ class Pool
$package->getRepository()->addPackage($aliasPackage);
$this->packages[] = $aliasPackage;
$this->packageByExactName[$aliasPackage->getName()][$aliasPackage->getId()] = $aliasPackage;
foreach ($aliasPackage->getNames() as $name) {
$this->packageByName[$name][] = $aliasPackage;
@ -261,7 +267,14 @@ class Pool
}
}
if (isset($this->packageByName[$name])) {
if ($mustMatchName) {
$candidates = array_filter($candidates, function ($candidate) use ($name) {
return $candidate->getName() == $name;
});
if (isset($this->packageByExactName[$name])) {
$candidates = array_merge($candidates, $this->packageByExactName[$name]);
}
} elseif (isset($this->packageByName[$name])) {
$candidates = array_merge($candidates, $this->packageByName[$name]);
}
@ -313,12 +326,6 @@ class Pool
}
}
if ($mustMatchName) {
return array_filter($matches, function ($match) use ($name) {
return $match->getName() == $name;
});
}
// if a package with the required name exists, we ignore providers
if ($nameMatch) {
return $matches;

26
src/Composer/DependencyResolver/RuleSetGenerator.php
View File

@ -263,30 +263,6 @@ class RuleSetGenerator
return $impossible;
}
/**
* Adds all rules for all update packages of a given package
*
* @param PackageInterface $package Rules for this package's updates are to
* be added
*/
private function addRulesForUpdatePackages(PackageInterface $package, $ignorePlatformReqs)
{
$updates = $this->policy->findUpdatePackages($this->pool, $this->installedMap, $package);
foreach ($updates as $update) {
$this->addRulesForPackage($update, $ignorePlatformReqs);
}
}
private function whitelistFromUpdatePackages(PackageInterface $package)
{
$updates = $this->policy->findUpdatePackages($this->pool, $this->installedMap, $package, true);
foreach ($updates as $update) {
$this->whitelistFromPackage($update);
}
}
protected function whitelistFromJobs()
{
foreach ($this->jobs as $job) {
@ -344,7 +320,6 @@ class RuleSetGenerator
$this->whitelistedMap = array();
foreach ($this->installedMap as $package) {
$this->whitelistFromPackage($package);
$this->whitelistFromUpdatePackages($package);
}
$this->whitelistFromJobs();
@ -353,7 +328,6 @@ class RuleSetGenerator
$this->addedMap = array();
foreach ($this->installedMap as $package) {
$this->addRulesForPackage($package, $ignorePlatformReqs);
$this->addRulesForUpdatePackages($package, $ignorePlatformReqs);
}
$this->addRulesForJobs($ignorePlatformReqs);

19
src/Composer/Repository/ComposerRepository.php
View File

@ -381,25 +381,6 @@ class ComposerRepository extends ArrayRepository implements StreamableRepository
}
}
} else {
if (isset($version['provide']) || isset($version['replace'])) {
// collect names
$names = array(
strtolower($version['name']) => true,
);
if (isset($version['provide'])) {
foreach ($version['provide'] as $target => $constraint) {
$names[strtolower($target)] = true;
}
}
if (isset($version['replace'])) {
foreach ($version['replace'] as $target => $constraint) {
$names[strtolower($target)] = true;
}
}
$names = array_keys($names);
} else {
$names = array(strtolower($version['name']));
}
if (!$pool->isPackageAcceptable(strtolower($version['name']), VersionParser::parseStability($version['version']))) {
continue;
}