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

Merge branch '1.5'

pull/6785/merge
Jordi Boggiano 2017-12-18 11:13:19 +01:00
parent 0a9abeef88 512188d212
commit 3e1b0c88d7
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -117,7 +117,7 @@ EOT
$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);
$requireKey = $input->getOption('dev') ? 'require-dev' : 'require';

1
src/Composer/Downloader/ArchiveDownloader.php
View File

@ -148,6 +148,7 @@ abstract class ArchiveDownloader extends FileDownloader
$finder = Finder::create()
->ignoreVCS(false)
->ignoreDotFiles(false)
->notName('.DS_Store')
->depth(0)
->in($dir);