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

Merge branch '1.5'

pull/6675/merge
Jordi Boggiano 2017-09-11 16:23:25 +02:00
parent dae575c197 69ecb2403e
commit 92458596ea
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/03-cli.md
View File

@ -118,7 +118,9 @@ resolution.
## update
In order to get the latest versions of the dependencies and to update the
`composer.lock` file, you should use the `update` command.
`composer.lock` file, you should use the `update` command. This command is also
aliased as `upgrade` as it does the same as `upgrade` does if you are thinking
of `apt-get` or similar package managers.
```sh
php composer.phar update

3
src/Composer/Command/UpdateCommand.php
View File

@ -34,7 +34,8 @@ class UpdateCommand extends BaseCommand
{
$this
->setName('update')
->setDescription('Updates your dependencies to the latest version according to composer.json, and updates the composer.lock file.')
->setAliases(array('upgrade'))
->setDescription('Upgrades your dependencies to the latest version according to composer.json, and updates the composer.lock file.')
->setDefinition(array(
new InputArgument('packages', InputArgument::IS_ARRAY | InputArgument::OPTIONAL, 'Packages that should be updated, if not provided all packages are.'),
new InputOption('prefer-source', null, InputOption::VALUE_NONE, 'Forces installation from package sources when possible, including VCS information.'),