From 354bd7f7e29a1f0b9c81422abe9d20572ea6efc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E5=85=B4=E8=8C=82?= Date: Mon, 18 Dec 2017 14:55:03 +0800 Subject: [PATCH 1/3] Update parse name version parirs name to lower --- src/Composer/Package/Version/VersionParser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index 54d7f09c0..5edca4777 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -54,10 +54,10 @@ class VersionParser extends SemverVersionParser } if (strpos($pair, ' ')) { - list($name, $version) = explode(" ", $pair, 2); - $result[] = array('name' => $name, 'version' => $version); + list($name, $version) = explode(' ', $pair, 2); + $result[] = array('name' => strtolower($name), 'version' => $version); } else { - $result[] = array('name' => $pair); + $result[] = array('name' => strtolower($pair)); } } From 1c0a494c727d1e064bece7346172a12feeac69ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E5=85=B4=E8=8C=82?= Date: Tue, 19 Dec 2017 22:17:24 +0800 Subject: [PATCH 2/3] Update findBestVersionForPackage method to support return package name --- src/Composer/Command/InitCommand.php | 21 +++++++++++++------ .../Package/Version/VersionParser.php | 4 ++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index 9a8d542de..7e16d035b 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -385,9 +385,12 @@ EOT foreach ($requires as $requirement) { if (!isset($requirement['version'])) { // 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; + // replace package name from packagist.org + $requirement['name'] = $name; + $io->writeError(sprintf( 'Using version %s for %s', $requirement['version'], @@ -395,7 +398,10 @@ EOT )); } else { // 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']; @@ -493,7 +499,7 @@ EOT ); if (false === $constraint) { - $constraint = $this->findBestVersionForPackage($input, $package, $phpVersion, $preferredStability); + list($name, $constraint) = $this->findBestVersionAndNameForPackage($input, $package, $phpVersion, $preferredStability); $io->writeError(sprintf( 'Using version %s for %s', @@ -662,9 +668,9 @@ EOT * @param string $preferredStability * @param string $minimumStability * @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 $versionSelector = new VersionSelector($this->getPool($input, $minimumStability)); @@ -705,7 +711,10 @@ EOT )); } - return $versionSelector->findRecommendedRequireVersion($package); + return [ + $package->getPrettyName(), + $versionSelector->findRecommendedRequireVersion($package) + ]; } private function findSimilar($package) diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index 5edca4777..22b6dad50 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -55,9 +55,9 @@ class VersionParser extends SemverVersionParser if (strpos($pair, ' ')) { list($name, $version) = explode(' ', $pair, 2); - $result[] = array('name' => strtolower($name), 'version' => $version); + $result[] = array('name' => $name, 'version' => $version); } else { - $result[] = array('name' => strtolower($pair)); + $result[] = array('name' => $pair); } } From e4bb306dfca5d702c83ae87880acfd00267edc69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E5=85=B4=E8=8C=82?= Date: Tue, 19 Dec 2017 22:32:10 +0800 Subject: [PATCH 3/3] Fix for CI --- src/Composer/Command/InitCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index 7e16d035b..88c04373e 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -711,10 +711,10 @@ EOT )); } - return [ + return array( $package->getPrettyName(), $versionSelector->findRecommendedRequireVersion($package) - ]; + ); } private function findSimilar($package)