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

Merge pull request #7451 from staabm/patch-1 

Temporary save the package-name into a variable
pull/7432/merge
Rob 2018-07-12 09:57:18 +02:00 committed by GitHub
parent f24fcea35b 07383552b3
commit e0eaca21f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,8 @@ class RuleSetGenerator
}
}
$obsoleteProviders = $this->pool->whatProvides($package->getName(), null);
$packageName = $package->getName();
$obsoleteProviders = $this->pool->whatProvides($packageName, null);
foreach ($obsoleteProviders as $provider) {
if ($provider === $package) {
@ -242,7 +243,7 @@ class RuleSetGenerator
if (($package instanceof AliasPackage) && $package->getAliasOf() === $provider) {
$this->addRule(RuleSet::TYPE_PACKAGE, $rule = $this->createRequireRule($package, array($provider), Rule::RULE_PACKAGE_ALIAS, $package));
} elseif (!$this->obsoleteImpossibleForAlias($package, $provider)) {
$reason = ($package->getName() == $provider->getName()) ? Rule::RULE_PACKAGE_SAME_NAME : Rule::RULE_PACKAGE_IMPLICIT_OBSOLETES;
$reason = ($packageName == $provider->getName()) ? Rule::RULE_PACKAGE_SAME_NAME : Rule::RULE_PACKAGE_IMPLICIT_OBSOLETES;
$this->addRule(RuleSet::TYPE_PACKAGE, $rule = $this->createRule2Literals($package, $provider, $reason, $package));
}
}