Merge branch '4.4' into 5.2

fabpot · fabpot · commit 298a08ddda62 · 2021-03-06T08:59:01.000+01:00
* 4.4:
  Fix #36973: Command description consistency
  Render email once
diff --git a/Command/LintCommand.php b/Command/LintCommand.php
@@ -53,7 +53,7 @@ public function __construct(string $name = null, callable $directoryIteratorProv
     protected function configure()
     {
         $this
-            ->setDescription('Lints a file and outputs encountered errors')
+            ->setDescription('Lint a file and outputs encountered errors')
             ->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')
             ->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format', 'txt')
             ->addOption('parse-tags', null, InputOption::VALUE_NONE, 'Parse custom tags')

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function __construct(string $name = null, callable $directoryIteratorProv`
`53`	`53`	`protected function configure()`
`54`	`54`	`{`
`55`	`55`	`$this`
`56`		`- ->setDescription('Lints a file and outputs encountered errors')`
	`56`	`+ ->setDescription('Lint a file and outputs encountered errors')`
`57`	`57`	`->addArgument('filename', InputArgument::IS_ARRAY, 'A file, a directory or "-" for reading from STDIN')`
`58`	`58`	`->addOption('format', null, InputOption::VALUE_REQUIRED, 'The output format', 'txt')`
`59`	`59`	`->addOption('parse-tags', null, InputOption::VALUE_NONE, 'Parse custom tags')`