From 9c4b00be674d8fa41703f63549cb6d8020a0bf54 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 12 Oct 2020 10:36:12 +0200 Subject: [PATCH] Add -w/-W to docs, refs #9257 --- doc/03-cli.md | 13 ++++++++----- src/Composer/Command/RemoveCommand.php | 4 ++-- src/Composer/Command/RequireCommand.php | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/03-cli.md b/doc/03-cli.md index e3a68cccc..7db7d6239 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -181,8 +181,8 @@ php composer.phar update vendor/package:2.0.1 vendor/package2:3.0.* * **--no-scripts:** Skips execution of scripts defined in `composer.json`. * **--no-progress:** Removes the progress display that can mess with some terminals or scripts which don't handle backspace characters. -* **--with-dependencies:** Update also dependencies of packages in the argument list, except those which are root requirements. -* **--with-all-dependencies:** Update also dependencies of packages in the argument list, including those which are root requirements. +* **--with-dependencies (-w):** Update also dependencies of packages in the argument list, except those which are root requirements. +* **--with-all-dependencies (-W):** Update also dependencies of packages in the argument list, including those which are root requirements. * **--optimize-autoloader (-o):** Convert PSR-0/4 autoloading to classmap to get a faster autoloader. This is recommended especially for production, but can take a bit of time to run, so it is currently not done by default. @@ -237,8 +237,8 @@ If you do not specify a package, composer will prompt you to search for a packag * **--no-install:** Does not run the install step after updating the composer.lock file. * **--no-scripts:** Skips execution of scripts defined in `composer.json`. * **--update-no-dev:** Run the dependency update with the `--no-dev` option. -* **--update-with-dependencies:** Also update dependencies of the newly required packages, except those that are root requirements. -* **--update-with-all-dependencies:** Also update dependencies of the newly required packages, including those that are root requirements. +* **--update-with-dependencies (-w):** Also update dependencies of the newly required packages, except those that are root requirements. +* **--update-with-all-dependencies (-W):** Also update dependencies of the newly required packages, including those that are root requirements. * **--ignore-platform-reqs:** ignore all platform requirements (`php`, `hhvm`, `lib-*` and `ext-*`) and force the installation even if the local machine does not fulfill these. @@ -278,7 +278,10 @@ uninstalled. * **--no-install:** Does not run the install step after updating the composer.lock file. * **--no-scripts:** Skips execution of scripts defined in `composer.json`. * **--update-no-dev:** Run the dependency update with the --no-dev option. -* **--update-with-dependencies:** Also update dependencies of the removed packages. +* **--update-with-dependencies (-w):** Also update dependencies of the removed packages. + (Deprecrated, is now default behavior) +* **--update-with-all-dependencies (-W):** Allows all inherited dependencies to be updated, + including those that are root requirements. * **--ignore-platform-reqs:** ignore all platform requirements (`php`, `hhvm`, `lib-*` and `ext-*`) and force the installation even if the local machine does not fulfill these. diff --git a/src/Composer/Command/RemoveCommand.php b/src/Composer/Command/RemoveCommand.php index 53c040412..4a7942e55 100644 --- a/src/Composer/Command/RemoveCommand.php +++ b/src/Composer/Command/RemoveCommand.php @@ -45,8 +45,8 @@ class RemoveCommand extends BaseCommand new InputOption('no-install', null, InputOption::VALUE_NONE, 'Skip the install step after updating the composer.lock file.'), new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Skips the execution of all scripts defined in composer.json file.'), new InputOption('update-no-dev', null, InputOption::VALUE_NONE, 'Run the dependency update with the --no-dev option.'), - new InputOption('update-with-dependencies', null, InputOption::VALUE_NONE, 'Allows inherited dependencies to be updated with explicit dependencies. (Deprecrated, is now default behavior)'), - new InputOption('update-with-all-dependencies', null, InputOption::VALUE_NONE, 'Allows all inherited dependencies to be updated, including those that are root requirements.'), + new InputOption('update-with-dependencies', 'w', InputOption::VALUE_NONE, 'Allows inherited dependencies to be updated with explicit dependencies. (Deprecrated, is now default behavior)'), + new InputOption('update-with-all-dependencies', 'W', InputOption::VALUE_NONE, 'Allows all inherited dependencies to be updated, including those that are root requirements.'), new InputOption('with-all-dependencies', null, InputOption::VALUE_NONE, 'Alias for --update-with-all-dependencies'), new InputOption('no-update-with-dependencies', null, InputOption::VALUE_NONE, 'Does not allow inherited dependencies to be updated with explicit dependencies.'), new InputOption('unused', null, InputOption::VALUE_NONE, 'Remove all packages which are locked but not required by any other package.'), diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index b60c3f688..2d49a7901 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -65,10 +65,10 @@ class RequireCommand extends InitCommand new InputOption('no-install', null, InputOption::VALUE_NONE, 'Skip the install step after updating the composer.lock file.'), new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Skips the execution of all scripts defined in composer.json file.'), new InputOption('update-no-dev', null, InputOption::VALUE_NONE, 'Run the dependency update with the --no-dev option.'), - new InputOption('update-with-dependencies', null, InputOption::VALUE_NONE, 'Allows inherited dependencies to be updated, except those that are root requirements.'), - new InputOption('update-with-all-dependencies', null, InputOption::VALUE_NONE, 'Allows all inherited dependencies to be updated, including those that are root requirements.'), - new InputOption('with-dependencies', 'w', InputOption::VALUE_NONE, 'Alias for --update-with-dependencies'), - new InputOption('with-all-dependencies', 'W', InputOption::VALUE_NONE, 'Alias for --update-with-all-dependencies'), + new InputOption('update-with-dependencies', 'w', InputOption::VALUE_NONE, 'Allows inherited dependencies to be updated, except those that are root requirements.'), + new InputOption('update-with-all-dependencies', 'W', InputOption::VALUE_NONE, 'Allows all inherited dependencies to be updated, including those that are root requirements.'), + new InputOption('with-dependencies', null, InputOption::VALUE_NONE, 'Alias for --update-with-dependencies'), + new InputOption('with-all-dependencies', null, InputOption::VALUE_NONE, 'Alias for --update-with-all-dependencies'), new InputOption('ignore-platform-req', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Ignore a specific platform requirement (php & ext- packages).'), new InputOption('ignore-platform-reqs', null, InputOption::VALUE_NONE, 'Ignore all platform requirements (php & ext- packages).'), new InputOption('prefer-stable', null, InputOption::VALUE_NONE, 'Prefer stable versions of dependencies.'),