Merge branch '5.2' into 5.x

fabpot · fabpot · commit 3f8b57066958 · 2021-03-06T09:05:19.000+01:00
* 5.2:
  Fix #36973: Command description consistency
  Render email once
diff --git a/Command/AboutCommand.php b/Command/AboutCommand.php
@@ -30,7 +30,7 @@
 class AboutCommand extends Command
 {
     protected static $defaultName = 'about';
-    protected static $defaultDescription = 'Displays information about the current project';
+    protected static $defaultDescription = 'Display information about the current project';
 
     /**
      * {@inheritdoc}
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -40,7 +40,7 @@ class AssetsInstallCommand extends Command
     public const METHOD_RELATIVE_SYMLINK = 'relative symlink';
 
     protected static $defaultName = 'assets:install';
-    protected static $defaultDescription = 'Installs bundles web assets under a public directory';
+    protected static $defaultDescription = 'Install bundle\'s web assets under a public directory';
 
     private $filesystem;
     private $projectDir;
@@ -62,7 +62,7 @@ protected function configure()
             ->setDefinition([
                 new InputArgument('target', InputArgument::OPTIONAL, 'The target directory', null),
             ])
-            ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it')
+            ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlink the assets instead of copying them')
             ->addOption('relative', null, InputOption::VALUE_NONE, 'Make relative symlinks')
             ->addOption('no-cleanup', null, InputOption::VALUE_NONE, 'Do not remove the assets of the bundles that no longer exist')
             ->setDescription(self::$defaultDescription)
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -36,7 +36,7 @@
 class CacheClearCommand extends Command
 {
     protected static $defaultName = 'cache:clear';
-    protected static $defaultDescription = 'Clears the cache';
+    protected static $defaultDescription = 'Clear the cache';
 
     private $cacheClearer;
     private $filesystem;
diff --git a/Command/CachePoolClearCommand.php b/Command/CachePoolClearCommand.php
@@ -28,7 +28,7 @@
 final class CachePoolClearCommand extends Command
 {
     protected static $defaultName = 'cache:pool:clear';
-    protected static $defaultDescription = 'Clears cache pools';
+    protected static $defaultDescription = 'Clear cache pools';
 
     private $poolClearer;
 
diff --git a/Command/CachePoolDeleteCommand.php b/Command/CachePoolDeleteCommand.php
@@ -26,7 +26,7 @@
 final class CachePoolDeleteCommand extends Command
 {
     protected static $defaultName = 'cache:pool:delete';
-    protected static $defaultDescription = 'Deletes an item from a cache pool';
+    protected static $defaultDescription = 'Delete an item from a cache pool';
 
     private $poolClearer;
 
diff --git a/Command/CachePoolPruneCommand.php b/Command/CachePoolPruneCommand.php
@@ -25,7 +25,7 @@
 final class CachePoolPruneCommand extends Command
 {
     protected static $defaultName = 'cache:pool:prune';
-    protected static $defaultDescription = 'Prunes cache pools';
+    protected static $defaultDescription = 'Prune cache pools';
 
     private $pools;
 
diff --git a/Command/CacheWarmupCommand.php b/Command/CacheWarmupCommand.php
@@ -29,7 +29,7 @@
 class CacheWarmupCommand extends Command
 {
     protected static $defaultName = 'cache:warmup';
-    protected static $defaultDescription = 'Warms up an empty cache';
+    protected static $defaultDescription = 'Warm up an empty cache';
 
     private $cacheWarmer;
 
diff --git a/Command/ConfigDebugCommand.php b/Command/ConfigDebugCommand.php
@@ -33,7 +33,7 @@
 class ConfigDebugCommand extends AbstractConfigCommand
 {
     protected static $defaultName = 'debug:config';
-    protected static $defaultDescription = 'Dumps the current configuration for an extension';
+    protected static $defaultDescription = 'Dump the current configuration for an extension';
 
     /**
      * {@inheritdoc}
diff --git a/Command/ConfigDumpReferenceCommand.php b/Command/ConfigDumpReferenceCommand.php
@@ -36,7 +36,7 @@
 class ConfigDumpReferenceCommand extends AbstractConfigCommand
 {
     protected static $defaultName = 'config:dump-reference';
-    protected static $defaultDescription = 'Dumps the default configuration for an extension';
+    protected static $defaultDescription = 'Dump the default configuration for an extension';
 
     /**
      * {@inheritdoc}
diff --git a/Command/ContainerDebugCommand.php b/Command/ContainerDebugCommand.php
@@ -35,7 +35,7 @@ class ContainerDebugCommand extends Command
     use BuildDebugContainerTrait;
 
     protected static $defaultName = 'debug:container';
-    protected static $defaultDescription = 'Displays current services for an application';
+    protected static $defaultDescription = 'Display current services for an application';
 
     /**
      * {@inheritdoc}
@@ -45,18 +45,18 @@ protected function configure()
         $this
             ->setDefinition([
                 new InputArgument('name', InputArgument::OPTIONAL, 'A service name (foo)'),
-                new InputOption('show-arguments', null, InputOption::VALUE_NONE, 'Used to show arguments in services'),
-                new InputOption('show-hidden', null, InputOption::VALUE_NONE, 'Used to show hidden (internal) services'),
-                new InputOption('tag', null, InputOption::VALUE_REQUIRED, 'Shows all services with a specific tag'),
-                new InputOption('tags', null, InputOption::VALUE_NONE, 'Displays tagged services for an application'),
-                new InputOption('parameter', null, InputOption::VALUE_REQUIRED, 'Displays a specific parameter for an application'),
-                new InputOption('parameters', null, InputOption::VALUE_NONE, 'Displays parameters for an application'),
-                new InputOption('types', null, InputOption::VALUE_NONE, 'Displays types (classes/interfaces) available in the container'),
-                new InputOption('env-var', null, InputOption::VALUE_REQUIRED, 'Displays a specific environment variable used in the container'),
-                new InputOption('env-vars', null, InputOption::VALUE_NONE, 'Displays environment variables used in the container'),
+                new InputOption('show-arguments', null, InputOption::VALUE_NONE, 'Show arguments in services'),
+                new InputOption('show-hidden', null, InputOption::VALUE_NONE, 'Show hidden (internal) services'),
+                new InputOption('tag', null, InputOption::VALUE_REQUIRED, 'Show all services with a specific tag'),
+                new InputOption('tags', null, InputOption::VALUE_NONE, 'Display tagged services for an application'),
+                new InputOption('parameter', null, InputOption::VALUE_REQUIRED, 'Display a specific parameter for an application'),
+                new InputOption('parameters', null, InputOption::VALUE_NONE, 'Display parameters for an application'),
+                new InputOption('types', null, InputOption::VALUE_NONE, 'Display types (classes/interfaces) available in the container'),
+                new InputOption('env-var', null, InputOption::VALUE_REQUIRED, 'Display a specific environment variable used in the container'),
+                new InputOption('env-vars', null, InputOption::VALUE_NONE, 'Display environment variables used in the container'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (txt, xml, json, or md)', 'txt'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
-                new InputOption('deprecations', null, InputOption::VALUE_NONE, 'Displays deprecations generated when compiling and warming up the container'),
+                new InputOption('deprecations', null, InputOption::VALUE_NONE, 'Display deprecations generated when compiling and warming up the container'),
             ])
             ->setDescription(self::$defaultDescription)
             ->setHelp(<<<'EOF'
diff --git a/Command/ContainerLintCommand.php b/Command/ContainerLintCommand.php
@@ -30,7 +30,7 @@
 final class ContainerLintCommand extends Command
 {
     protected static $defaultName = 'lint:container';
-    protected static $defaultDescription = 'Ensures that arguments injected into services match type declarations';
+    protected static $defaultDescription = 'Ensure that arguments injected into services match type declarations';
 
     /**
      * @var ContainerBuilder
diff --git a/Command/DebugAutowiringCommand.php b/Command/DebugAutowiringCommand.php
@@ -30,7 +30,7 @@
 class DebugAutowiringCommand extends ContainerDebugCommand
 {
     protected static $defaultName = 'debug:autowiring';
-    protected static $defaultDescription = 'Lists classes/interfaces you can use for autowiring';
+    protected static $defaultDescription = 'List classes/interfaces you can use for autowiring';
 
     private $supportsHref;
     private $fileLinkFormatter;
diff --git a/Command/EventDispatcherDebugCommand.php b/Command/EventDispatcherDebugCommand.php
@@ -33,7 +33,7 @@ class EventDispatcherDebugCommand extends Command
     private const DEFAULT_DISPATCHER = 'event_dispatcher';
 
     protected static $defaultName = 'debug:event-dispatcher';
-    protected static $defaultDescription = 'Displays configured listeners for an application';
+    protected static $defaultDescription = 'Display configured listeners for an application';
     private $dispatchers;
 
     public function __construct(ContainerInterface $dispatchers)
diff --git a/Command/RouterDebugCommand.php b/Command/RouterDebugCommand.php
@@ -36,7 +36,7 @@ class RouterDebugCommand extends Command
     use BuildDebugContainerTrait;
 
     protected static $defaultName = 'debug:router';
-    protected static $defaultDescription = 'Displays current routes for an application';
+    protected static $defaultDescription = 'Display current routes for an application';
     private $router;
     private $fileLinkFormatter;
 
diff --git a/Command/RouterMatchCommand.php b/Command/RouterMatchCommand.php
@@ -31,7 +31,7 @@
 class RouterMatchCommand extends Command
 {
     protected static $defaultName = 'router:match';
-    protected static $defaultDescription = 'Helps debug routes by simulating a path info match';
+    protected static $defaultDescription = 'Help debug routes by simulating a path info match';
 
     private $router;
     private $expressionLanguageProviders;
@@ -52,9 +52,9 @@ protected function configure()
         $this
             ->setDefinition([
                 new InputArgument('path_info', InputArgument::REQUIRED, 'A path info'),
-                new InputOption('method', null, InputOption::VALUE_REQUIRED, 'Sets the HTTP method'),
-                new InputOption('scheme', null, InputOption::VALUE_REQUIRED, 'Sets the URI scheme (usually http or https)'),
-                new InputOption('host', null, InputOption::VALUE_REQUIRED, 'Sets the URI host'),
+                new InputOption('method', null, InputOption::VALUE_REQUIRED, 'Set the HTTP method'),
+                new InputOption('scheme', null, InputOption::VALUE_REQUIRED, 'Set the URI scheme (usually http or https)'),
+                new InputOption('host', null, InputOption::VALUE_REQUIRED, 'Set the URI host'),
             ])
             ->setDescription(self::$defaultDescription)
             ->setHelp(<<<'EOF'
diff --git a/Command/SecretsDecryptToLocalCommand.php b/Command/SecretsDecryptToLocalCommand.php
@@ -27,7 +27,7 @@
 final class SecretsDecryptToLocalCommand extends Command
 {
     protected static $defaultName = 'secrets:decrypt-to-local';
-    protected static $defaultDescription = 'Decrypts all secrets and stores them in the local vault';
+    protected static $defaultDescription = 'Decrypt all secrets and stores them in the local vault';
 
     private $vault;
     private $localVault;
@@ -44,7 +44,7 @@ protected function configure()
     {
         $this
             ->setDescription(self::$defaultDescription)
-            ->addOption('force', 'f', InputOption::VALUE_NONE, 'Forces overriding of secrets that already exist in the local vault')
+            ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force overriding of secrets that already exist in the local vault')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command decrypts all secrets and copies them in the local vault.
 
diff --git a/Command/SecretsEncryptFromLocalCommand.php b/Command/SecretsEncryptFromLocalCommand.php
@@ -26,7 +26,7 @@
 final class SecretsEncryptFromLocalCommand extends Command
 {
     protected static $defaultName = 'secrets:encrypt-from-local';
-    protected static $defaultDescription = 'Encrypts all local secrets to the vault';
+    protected static $defaultDescription = 'Encrypt all local secrets to the vault';
 
     private $vault;
     private $localVault;
diff --git a/Command/SecretsGenerateKeysCommand.php b/Command/SecretsGenerateKeysCommand.php
@@ -29,7 +29,7 @@
 final class SecretsGenerateKeysCommand extends Command
 {
     protected static $defaultName = 'secrets:generate-keys';
-    protected static $defaultDescription = 'Generates new encryption keys';
+    protected static $defaultDescription = 'Generate new encryption keys';
 
     private $vault;
     private $localVault;
@@ -46,8 +46,8 @@ protected function configure()
     {
         $this
             ->setDescription(self::$defaultDescription)
-            ->addOption('local', 'l', InputOption::VALUE_NONE, 'Updates the local vault.')
-            ->addOption('rotate', 'r', InputOption::VALUE_NONE, 'Re-encrypts existing secrets with the newly generated keys.')
+            ->addOption('local', 'l', InputOption::VALUE_NONE, 'Update the local vault.')
+            ->addOption('rotate', 'r', InputOption::VALUE_NONE, 'Re-encrypt existing secrets with the newly generated keys.')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command generates a new encryption key.
 
diff --git a/Command/SecretsListCommand.php b/Command/SecretsListCommand.php
@@ -30,7 +30,7 @@
 final class SecretsListCommand extends Command
 {
     protected static $defaultName = 'secrets:list';
-    protected static $defaultDescription = 'Lists all secrets';
+    protected static $defaultDescription = 'List all secrets';
 
     private $vault;
     private $localVault;
diff --git a/Command/SecretsRemoveCommand.php b/Command/SecretsRemoveCommand.php
@@ -29,7 +29,7 @@
 final class SecretsRemoveCommand extends Command
 {
     protected static $defaultName = 'secrets:remove';
-    protected static $defaultDescription = 'Removes a secret from the vault';
+    protected static $defaultDescription = 'Remove a secret from the vault';
 
     private $vault;
     private $localVault;
@@ -47,7 +47,7 @@ protected function configure()
         $this
             ->setDescription(self::$defaultDescription)
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the secret')
-            ->addOption('local', 'l', InputOption::VALUE_NONE, 'Updates the local vault.')
+            ->addOption('local', 'l', InputOption::VALUE_NONE, 'Update the local vault.')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command removes a secret from the vault.
 
diff --git a/Command/SecretsSetCommand.php b/Command/SecretsSetCommand.php
@@ -30,7 +30,7 @@
 final class SecretsSetCommand extends Command
 {
     protected static $defaultName = 'secrets:set';
-    protected static $defaultDescription = 'Sets a secret in the vault';
+    protected static $defaultDescription = 'Set a secret in the vault';
 
     private $vault;
     private $localVault;
@@ -49,8 +49,8 @@ protected function configure()
             ->setDescription(self::$defaultDescription)
             ->addArgument('name', InputArgument::REQUIRED, 'The name of the secret')
             ->addArgument('file', InputArgument::OPTIONAL, 'A file where to read the secret from or "-" for reading from STDIN')
-            ->addOption('local', 'l', InputOption::VALUE_NONE, 'Updates the local vault.')
-            ->addOption('random', 'r', InputOption::VALUE_OPTIONAL, 'Generates a random value.', false)
+            ->addOption('local', 'l', InputOption::VALUE_NONE, 'Update the local vault.')
+            ->addOption('random', 'r', InputOption::VALUE_OPTIONAL, 'Generate a random value.', false)
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command stores a secret in the vault.
 
diff --git a/Command/TranslationDebugCommand.php b/Command/TranslationDebugCommand.php
@@ -47,7 +47,7 @@ class TranslationDebugCommand extends Command
     public const MESSAGE_EQUALS_FALLBACK = 2;
 
     protected static $defaultName = 'debug:translation';
-    protected static $defaultDescription = 'Displays translation messages information';
+    protected static $defaultDescription = 'Display translation messages information';
 
     private $translator;
     private $reader;
@@ -80,8 +80,8 @@ protected function configure()
                 new InputArgument('locale', InputArgument::REQUIRED, 'The locale'),
                 new InputArgument('bundle', InputArgument::OPTIONAL, 'The bundle name or directory where to load the messages'),
                 new InputOption('domain', null, InputOption::VALUE_OPTIONAL, 'The messages domain'),
-                new InputOption('only-missing', null, InputOption::VALUE_NONE, 'Displays only missing messages'),
-                new InputOption('only-unused', null, InputOption::VALUE_NONE, 'Displays only unused messages'),
+                new InputOption('only-missing', null, InputOption::VALUE_NONE, 'Display only missing messages'),
+                new InputOption('only-unused', null, InputOption::VALUE_NONE, 'Display only unused messages'),
                 new InputOption('all', null, InputOption::VALUE_NONE, 'Load messages from all registered bundles'),
             ])
             ->setDescription(self::$defaultDescription)
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -42,7 +42,7 @@ class TranslationUpdateCommand extends Command
     private const SORT_ORDERS = [self::ASC, self::DESC];
 
     protected static $defaultName = 'translation:update';
-    protected static $defaultDescription = 'Updates the translation file';
+    protected static $defaultDescription = 'Update the translation file';
 
     private $writer;
     private $reader;
diff --git a/Command/WorkflowDumpCommand.php b/Command/WorkflowDumpCommand.php
@@ -41,7 +41,7 @@ protected function configure()
             ->setDefinition([
                 new InputArgument('name', InputArgument::REQUIRED, 'A workflow name'),
                 new InputArgument('marking', InputArgument::IS_ARRAY, 'A marking (a list of places)'),
-                new InputOption('label', 'l', InputOption::VALUE_REQUIRED, 'Labels a graph'),
+                new InputOption('label', 'l', InputOption::VALUE_REQUIRED, 'Label a graph'),
                 new InputOption('dump-format', null, InputOption::VALUE_REQUIRED, 'The dump format [dot|puml]', 'dot'),
             ])
             ->setDescription(self::$defaultDescription)

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`class AboutCommand extends Command`
`31`	`31`	`{`
`32`	`32`	`protected static $defaultName = 'about';`
`33`		`- protected static $defaultDescription = 'Displays information about the current project';`
	`33`	`+ protected static $defaultDescription = 'Display information about the current project';`
`34`	`34`
`35`	`35`	`/**`
`36`	`36`	`* {@inheritdoc}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`class CacheClearCommand extends Command`
`37`	`37`	`{`
`38`	`38`	`protected static $defaultName = 'cache:clear';`
`39`		`- protected static $defaultDescription = 'Clears the cache';`
	`39`	`+ protected static $defaultDescription = 'Clear the cache';`
`40`	`40`
`41`	`41`	`private $cacheClearer;`
`42`	`42`	`private $filesystem;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`final class CachePoolClearCommand extends Command`
`29`	`29`	`{`
`30`	`30`	`protected static $defaultName = 'cache:pool:clear';`
`31`		`- protected static $defaultDescription = 'Clears cache pools';`
	`31`	`+ protected static $defaultDescription = 'Clear cache pools';`
`32`	`32`
`33`	`33`	`private $poolClearer;`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`final class CachePoolDeleteCommand extends Command`
`27`	`27`	`{`
`28`	`28`	`protected static $defaultName = 'cache:pool:delete';`
`29`		`- protected static $defaultDescription = 'Deletes an item from a cache pool';`
	`29`	`+ protected static $defaultDescription = 'Delete an item from a cache pool';`
`30`	`30`
`31`	`31`	`private $poolClearer;`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`final class CachePoolPruneCommand extends Command`
`26`	`26`	`{`
`27`	`27`	`protected static $defaultName = 'cache:pool:prune';`
`28`		`- protected static $defaultDescription = 'Prunes cache pools';`
	`28`	`+ protected static $defaultDescription = 'Prune cache pools';`
`29`	`29`
`30`	`30`	`private $pools;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`class CacheWarmupCommand extends Command`
`30`	`30`	`{`
`31`	`31`	`protected static $defaultName = 'cache:warmup';`
`32`		`- protected static $defaultDescription = 'Warms up an empty cache';`
	`32`	`+ protected static $defaultDescription = 'Warm up an empty cache';`
`33`	`33`
`34`	`34`	`private $cacheWarmer;`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`class ConfigDebugCommand extends AbstractConfigCommand`
`34`	`34`	`{`
`35`	`35`	`protected static $defaultName = 'debug:config';`
`36`		`- protected static $defaultDescription = 'Dumps the current configuration for an extension';`
	`36`	`+ protected static $defaultDescription = 'Dump the current configuration for an extension';`
`37`	`37`
`38`	`38`	`/**`
`39`	`39`	`* {@inheritdoc}`