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

Allow people to manually enter requirements

pull/303/merge
Jordi Boggiano 2012-02-16 20:41:12 +01:00
parent 9a2204cd74
commit ee7b68c049
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,17 +273,23 @@ EOT
return false; return false;
} }
if (!is_numeric($selection) && preg_match('{^\s*(\S+) +(\S.*)\s*}', $selection, $matches)) {
return $matches[1].' '.$matches[2];
}
if (!isset($matches[(int) $selection])) { if (!isset($matches[(int) $selection])) {
throw new \Exception('Not a valid selection'); throw new \Exception('Not a valid selection');
} }
return $matches[(int) $selection]; $package = $matches[(int) $selection];
return sprintf('%s %s', $package->getName(), $package->getPrettyVersion());
}; };
$package = $dialog->askAndValidate($output, $dialog->getQuestion('Enter package # to add', false, ':'), $validator, 3); $package = $dialog->askAndValidate($output, $dialog->getQuestion('Enter package # to add, or a <package> <version> couple if it is not listed', false, ':'), $validator, 3);
if (false !== $package) { if (false !== $package) {
$requires[] = sprintf('%s %s', $package->getName(), $package->getPrettyVersion()); $requires[] = $package;
} }
} }
} }
@ -300,7 +306,7 @@ EOT
{ {
$requires = array(); $requires = array();
foreach ($requirements as $requirement) { foreach ($requirements as $requirement) {
list($packageName, $packageVersion) = explode(" ", $requirement); list($packageName, $packageVersion) = explode(" ", $requirement, 2);
$requires[$packageName] = $packageVersion; $requires[$packageName] = $packageVersion;
} }