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

Fix issue when requiring multiple packages once without and once with explicit version, fixes #6859

pull/6785/merge
Jordi Boggiano 2017-12-18 10:35:44 +01:00
parent 4c8c574b6c
commit 00f6c0a44a
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Composer/Command/InitCommand.php
View File

@ -40,8 +40,8 @@ class InitCommand extends BaseCommand
/** @var array */ /** @var array */
private $gitConfig; private $gitConfig;
/** @var Pool */ /** @var Pool[] */
private $pool; private $pools;
/** /**
* {@inheritdoc} * {@inheritdoc}
@ -598,12 +598,14 @@ EOT
private function getPool(InputInterface $input, $minimumStability = null) private function getPool(InputInterface $input, $minimumStability = null)
{ {
if (!$this->pool) { $key = $minimumStability ?: 'default';
$this->pool = new Pool($minimumStability ?: $this->getMinimumStability($input));
$this->pool->addRepository($this->getRepos()); if (!isset($this->pools[$key])) {
$this->pools[$key] = $pool = new Pool($minimumStability ?: $this->getMinimumStability($input));
$pool->addRepository($this->getRepos());
} }
return $this->pool; return $this->pools[$key];
} }
private function getMinimumStability(InputInterface $input) private function getMinimumStability(InputInterface $input)
@ -642,13 +644,14 @@ EOT
$package = $versionSelector->findBestCandidate($name, $requiredVersion, $phpVersion, $preferredStability); $package = $versionSelector->findBestCandidate($name, $requiredVersion, $phpVersion, $preferredStability);
if (!$package) { if (!$package) {
if ($requiredVersion && $versionSelector->findBestCandidate($name, null, $phpVersion, $preferredStability)) {
// Check whether the PHP version was the problem // Check whether the PHP version was the problem
if ($phpVersion && $versionSelector->findBestCandidate($name, null, null, $preferredStability)) { if ($phpVersion && $versionSelector->findBestCandidate($name, $requiredVersion, null, $preferredStability)) {
throw new \InvalidArgumentException(sprintf( throw new \InvalidArgumentException(sprintf(
'Package %s at version %s has a PHP requirement incompatible with your PHP version (%s)', $name, $requiredVersion, $phpVersion 'Package %s at version %s has a PHP requirement incompatible with your PHP version (%s)', $name, $requiredVersion, $phpVersion
)); ));
} }
// Check whether the required version was the problem
if ($requiredVersion && $versionSelector->findBestCandidate($name, null, $phpVersion, $preferredStability)) {
throw new \InvalidArgumentException(sprintf( throw new \InvalidArgumentException(sprintf(
'Could not find package %s in a version matching %s', $name, $requiredVersion 'Could not find package %s in a version matching %s', $name, $requiredVersion
)); ));

2
src/Composer/Command/RequireCommand.php
View File

@ -113,7 +113,7 @@ EOT
$preferredStability = $composer->getPackage()->getMinimumStability(); $preferredStability = $composer->getPackage()->getMinimumStability();
} }
$phpVersion = $this->repos->findPackage('php', '*')->getVersion(); $phpVersion = $this->repos->findPackage('php', '*')->getPrettyVersion();
$requirements = $this->determineRequirements($input, $output, $input->getArgument('packages'), $phpVersion, $preferredStability); $requirements = $this->determineRequirements($input, $output, $input->getArgument('packages'), $phpVersion, $preferredStability);
$requireKey = $input->getOption('dev') ? 'require-dev' : 'require'; $requireKey = $input->getOption('dev') ? 'require-dev' : 'require';