public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-10 17:12:51 +00:00
Code Activity

Merge remote-tracking branch 'mheleniak/prefer_dist' and fix dists

Browse source 
Conflicts:
	src/Composer/Installer.php
	src/Composer/Package/Locker.php
This commit is contained in:
Jordi Boggiano 2012-09-27 18:36:55 +02:00
commit a9afa8bc1f
6 changed files with 90 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Composer/Command/InstallCommand.php
View file

@ -31,6 +31,7 @@ class InstallCommand extends Command
->setDescription('Installs the project dependencies from the composer.lock file if present, or falls back on the composer.json.')
->setDefinition(array(
new InputOption('prefer-source', null, InputOption::VALUE_NONE, 'Forces installation from package sources when possible, including VCS information.'),
new InputOption('prefer-dist', null, InputOption::VALUE_NONE, 'Forces installation from package dist even for dev versions.'),
new InputOption('dry-run', null, InputOption::VALUE_NONE, 'Outputs the operations but will not execute anything (implicitly enables --verbose).'),
new InputOption('dev', null, InputOption::VALUE_NONE, 'Enables installation of dev-require packages.'),
new InputOption('no-custom-installers', null, InputOption::VALUE_NONE, 'Disables all custom installers.'),
@ -60,6 +61,7 @@ EOT
->setDryRun($input->getOption('dry-run'))
->setVerbose($input->getOption('verbose'))
->setPreferSource($input->getOption('prefer-source'))
->setPreferDist($input->getOption('prefer-dist'))
->setDevMode($input->getOption('dev'))
->setRunScripts(!$input->getOption('no-scripts'))
;