Fixes #4558 Add Global options section to command help

src/Application.php

@@ -77,7 +77,7 @@ public function configureGlobalOptions()
 
         $this->getDefinition()
             ->addOption(
-                new InputOption('--uri', '-l', InputOption::VALUE_REQUIRED, 'Which multisite from the selected root to use.')
+                new InputOption('--uri', '-l', InputOption::VALUE_REQUIRED, 'An URL for building links and selecting a multi-site. Defaults to https://default.')
             );
 
         $this->getDefinition()

src/Commands/core/MkCommands.php

@@ -160,6 +160,27 @@ protected static function appendOptions($command): string
         return '';
     }
 
+    protected static function appendOptionsGlobal($application): string
+    {
+        if ($opts = $application->getDefinition()->getOptions()) {
+            $body = '';
+            foreach ($opts as $key => $value) {
+                if (!in_array($key, HelpCLIFormatter::OPTIONS_GLOBAL_IMPORTANT)) {
+                    continue;
+                }
+                $name = '--' . $key;
+                if ($value->getShortcut()) {
+                    $name = '-' . $name . ', ' . $value->getShortcut();
+                }
+                $body .= '- ** ' . $name . '**. ' . self::cliTextToMarkdown($value->getDescription()) . "\n";
+            }
+            $body .= '- <code>drush topic</code>. Pick first choice to see all global options.' . "\n";
+            $body = "#### Global Options\n\n$body\n";
+            return $body;
+        }
+        return '';
+    }
+
     protected static function appendArguments($command): string
     {
         if ($args = $command->getDefinition()->getArguments()) {
@@ -328,6 +349,9 @@ public function writeContentFilesAndBuildNavAndBuildRedirectMap(array $namespace
                 }
                 $body .= self::appendArguments($command);
                 $body .= self::appendOptions($command);
+                if ($destination == 'commands') {
+                    $body .= self::appendOptionsGlobal($command->getApplication());
+                }
                 if ($command instanceof AnnotatedCommand) {
                     $body .= self::appendTopics($command, $destination_path);
                 }

src/Commands/help/HelpCLIFormatter.php

@@ -14,6 +14,8 @@
  */
 class HelpCLIFormatter implements FormatterInterface
 {
+    const OPTIONS_GLOBAL_IMPORTANT = ['uri', 'verbose', 'yes'];
+
     /**
      * @inheritdoc
      */
@@ -53,16 +55,34 @@ public function write(OutputInterface $output, $data, FormatterOptions $options)
 
         $this->cleanOptions($data);
         if (!empty($data['options'])) {
-            $rows = [];
-            $output->writeln('');
-            $output->writeln('<comment>Options:</comment>');
-            foreach ($data['options'] as $option) {
-                if (substr($option['name'], 0, 8) !== '--notify' && substr($option['name'], 0, 5) !== '--xh-' && substr($option['name'], 0, 11) !== '--druplicon') {
-                    $rows[] = [$this->formatOptionKeys($option), $this->formatOptionDescription($option)];
-                }
-            }
+            $rows = $this->optionRows($output, $data['options'], 'Options');
             $formatterManager->write($output, 'table', new RowsOfFields($rows), $options);
         }
+        unset($rows);
+
+
+        $output->writeln('');
+        $output->writeln('<comment>Global options:</comment>');
+        $application = Drush::getApplication();
+        $def = $application->getDefinition();
+        foreach ($def->getOptions() as $key => $value) {
+            if (!in_array($key, self::OPTIONS_GLOBAL_IMPORTANT)) {
+                continue;
+            }
+            $name = $name = '--' . $key;
+            if ($value->getShortcut()) {
+                $name = '-' . $value->getShortcut() . ', ' . $name;
+            }
+            $rows[] = [
+                $name,
+                $value->getDescription(),
+            ];
+        }
+        $rows[] = [
+            '',
+            'Run `drush topic` and pick first choice to see all global options.',
+        ];
+        $formatterManager->write($output, 'table', new RowsOfFields($rows), $options);
 
         if (array_key_exists('topics', $data)) {
             $rows = [];
@@ -158,4 +178,17 @@ public static function isGlobalOption($name): bool
         $def = $application->getDefinition();
         return array_key_exists($name, $def->getOptions()) || substr($name, 0, 6) == 'notify' || substr($name, 0, 3) == 'xh-' || substr($name, 0, 9) == 'druplicon';
     }
+
+    public function optionRows(OutputInterface $output, array $options, string $title): array
+    {
+        $rows = [];
+        $output->writeln('');
+        $output->writeln("<comment>$title:</comment>");
+        foreach ($options as $option) {
+            if (substr($option['name'], 0, 8) !== '--notify' && substr($option['name'], 0, 5) !== '--xh-' && substr($option['name'], 0, 11) !== '--druplicon') {
+                 $rows[] = [$this->formatOptionKeys($option), $this->formatOptionDescription($option)];
+            }
+        }
+        return $rows;
+    }
 }