Преглед изворни кода

Merge pull request #7451 from staabm/patch-1

Temporary save the package-name into a variable
Rob пре 6 година
родитељ
комит
e0eaca21f7
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      src/Composer/DependencyResolver/RuleSetGenerator.php

+ 3 - 2
src/Composer/DependencyResolver/RuleSetGenerator.php

@@ -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));
                 }
             }