Pass along -vv and -vvv to redispatches. (#5948)

composer.json

@@ -41,7 +41,7 @@
     "consolidation/output-formatters": "^4.3.2",
     "consolidation/robo": "^4.0.6",
     "consolidation/site-alias": "^4",
-    "consolidation/site-process": "^5.2.0",
+    "consolidation/site-process": "^5.3.0",
     "grasmash/yaml-cli": "^3.1",
     "guzzlehttp/guzzle": "^7.0",
     "laravel/prompts": "^0.1.15",

src/Drush.php

@@ -4,7 +4,6 @@
 
 namespace Drush;
 
-use Psr\Container\ContainerInterface;
 use Composer\InstalledVersions;
 use Consolidation\AnnotatedCommand\AnnotatedCommandFactory;
 use Consolidation\SiteAlias\SiteAliasInterface;
@@ -17,6 +16,7 @@
 use Drush\Preflight\PreflightArgs;
 use Drush\Runtime\DependencyInjection;
 use Drush\SiteAlias\ProcessManager;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 use Robo\Robo;
 use Robo\Runner;
@@ -446,12 +446,18 @@ public static function redispatchOptions($input = null)
         // $input->getOptions() returns an associative array of option => value
         $options = $input->getOptions();
 
-        // The 'runtime.options' config contains a list of option names on th cli
+        // The 'runtime.options' config contains a list of option names on the CLI
         $optionNamesFromCommandline = self::config()->get('runtime.options');
 
         // Attempt to normalize option names.
         foreach ($optionNamesFromCommandline as $key => $name) {
             try {
+                // Don't incorrectly remap these to --verbose, or discard them.
+                if ($name == 'vv' || $name == 'vvv') {
+                    // Special handling is in \Consolidation\SiteProcess\Util\ArgumentProcessor::convertOptions
+                    $options[$name] = true;
+                    continue;
+                }
                 $optionNamesFromCommandline[$key] = Drush::getApplication()->get($command_name)->getDefinition()->shortcutToName($name);
             } catch (InvalidArgumentException $e) {
                 // Do nothing. It's expected.