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

Merge remote-tracking branch 'swumao/feature-6892'

pull/6969/head
Jordi Boggiano 2018-01-03 16:46:50 +01:00
parent 3be9591930 e4bb306dfc
commit ab8437ce06
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,9 +385,12 @@ EOT
foreach ($requires as $requirement) { foreach ($requires as $requirement) {
if (!isset($requirement['version'])) { if (!isset($requirement['version'])) {
// determine the best version automatically // determine the best version automatically
$version = $this->findBestVersionForPackage($input, $requirement['name'], $phpVersion, $preferredStability); list($name, $version) = $this->findBestVersionAndNameForPackage($input, $requirement['name'], $phpVersion, $preferredStability);
$requirement['version'] = $version; $requirement['version'] = $version;
// replace package name from packagist.org
$requirement['name'] = $name;
$io->writeError(sprintf( $io->writeError(sprintf(
'Using version <info>%s</info> for <info>%s</info>', 'Using version <info>%s</info> for <info>%s</info>',
$requirement['version'], $requirement['version'],
@ -395,7 +398,10 @@ EOT
)); ));
} else { } else {
// check that the specified version/constraint exists before we proceed // check that the specified version/constraint exists before we proceed
$this->findBestVersionForPackage($input, $requirement['name'], $phpVersion, $preferredStability, $requirement['version'], 'dev'); list($name, $version) = $this->findBestVersionAndNameForPackage($input, $requirement['name'], $phpVersion, $preferredStability, $requirement['version'], 'dev');
// replace package name from packagist.org
$requirement['name'] = $name;
} }
$result[] = $requirement['name'] . ' ' . $requirement['version']; $result[] = $requirement['name'] . ' ' . $requirement['version'];
@ -493,7 +499,7 @@ EOT
); );
if (false === $constraint) { if (false === $constraint) {
$constraint = $this->findBestVersionForPackage($input, $package, $phpVersion, $preferredStability); list($name, $constraint) = $this->findBestVersionAndNameForPackage($input, $package, $phpVersion, $preferredStability);
$io->writeError(sprintf( $io->writeError(sprintf(
'Using version <info>%s</info> for <info>%s</info>', 'Using version <info>%s</info> for <info>%s</info>',
@ -665,9 +671,9 @@ EOT
* @param string|null $requiredVersion * @param string|null $requiredVersion
* @param string $minimumStability * @param string $minimumStability
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return string * @return array name version
*/ */
private function findBestVersionForPackage(InputInterface $input, $name, $phpVersion, $preferredStability = 'stable', $requiredVersion = null, $minimumStability = null) private function findBestVersionAndNameForPackage(InputInterface $input, $name, $phpVersion, $preferredStability = 'stable', $requiredVersion = null, $minimumStability = null)
{ {
// find the latest version allowed in this pool // find the latest version allowed in this pool
$versionSelector = new VersionSelector($this->getPool($input, $minimumStability)); $versionSelector = new VersionSelector($this->getPool($input, $minimumStability));
@ -715,7 +721,10 @@ EOT
)); ));
} }
return $versionSelector->findRecommendedRequireVersion($package); return array(
$package->getPrettyName(),
$versionSelector->findRecommendedRequireVersion($package)
);
} }
private function findSimilar($package) private function findSimilar($package)

2
src/Composer/Package/Version/VersionParser.php
View File

@ -54,7 +54,7 @@ class VersionParser extends SemverVersionParser
} }
if (strpos($pair, ' ')) { if (strpos($pair, ' ')) {
list($name, $version) = explode(" ", $pair, 2); list($name, $version) = explode(' ', $pair, 2);
$result[] = array('name' => $name, 'version' => $version); $result[] = array('name' => $name, 'version' => $version);
} else { } else {
$result[] = array('name' => $pair); $result[] = array('name' => $pair);