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

Create pool in show command to use policy, remove todos

pull/7625/head
Nils Adermann 2018-09-11 15:59:02 +02:00
parent b6e2d60c9e
commit 1747df97e7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Command/ShowCommand.php
View File

@ -539,9 +539,11 @@ EOT
$matches[$index] = $package->getId(); $matches[$index] = $package->getId();
} }
$pool = $repositorySet->createPool();
// select preferred package according to policy rules // select preferred package according to policy rules
if (!$matchedPackage && $matches && $preferred = $policy->selectPreferredPackages($repositorySet->getPoolTemp(), array(), $matches)) { // TODO get rid of the pool call if (!$matchedPackage && $matches && $preferred = $policy->selectPreferredPackages($pool, array(), $matches)) {
$matchedPackage = $repositorySet->getPoolTemp()->literalToPackage($preferred[0]); $matchedPackage = $pool->literalToPackage($preferred[0]);
} }
return array($matchedPackage, $versions); return array($matchedPackage, $versions);

10
src/Composer/Installer.php
View File

@ -127,7 +127,7 @@ class Installer
* @var array|null * @var array|null
*/ */
protected $updateWhitelist = null; protected $updateWhitelist = null;
protected $whitelistDependencies = false; // TODO 2.0 rename to whitelistTransitiveDependencies protected $whitelistTransitiveDependencies = false;
protected $whitelistAllDependencies = false; protected $whitelistAllDependencies = false;
/** /**
@ -1327,7 +1327,7 @@ class Installer
foreach ($this->updateWhitelist as $packageName => $void) { foreach ($this->updateWhitelist as $packageName => $void) {
$packageQueue = new \SplQueue; $packageQueue = new \SplQueue;
$depPackages = $repositorySet->findPackages($packageName); // TODO does this need replacers/providers? $depPackages = $repositorySet->findPackages($packageName, null, false);
$nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames, true); $nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames, true);
@ -1359,14 +1359,14 @@ class Installer
$seen[spl_object_hash($package)] = true; $seen[spl_object_hash($package)] = true;
$this->updateWhitelist[$package->getName()] = true; $this->updateWhitelist[$package->getName()] = true;
if (!$this->whitelistDependencies && !$this->whitelistAllDependencies) { if (!$this->whitelistTransitiveDependencies && !$this->whitelistAllDependencies) {
continue; continue;
} }
$requires = $package->getRequires(); $requires = $package->getRequires();
foreach ($requires as $require) { foreach ($requires as $require) {
$requirePackages = $repositorySet->findPackages($require->getTarget()); // TODO does this need replacers/providers? $requirePackages = $repositorySet->findPackages($require->getTarget(), null, false);
foreach ($requirePackages as $requirePackage) { foreach ($requirePackages as $requirePackage) {
if (isset($this->updateWhitelist[$requirePackage->getName()])) { if (isset($this->updateWhitelist[$requirePackage->getName()])) {
@ -1678,7 +1678,7 @@ class Installer
*/ */
public function setWhitelistTransitiveDependencies($updateTransitiveDependencies = true) public function setWhitelistTransitiveDependencies($updateTransitiveDependencies = true)
{ {
$this->whitelistDependencies = (bool) $updateTransitiveDependencies; $this->whitelistTransitiveDependencies = (bool) $updateTransitiveDependencies;
return $this; return $this;
} }