merged branch Seldaek/verbosityflags (PR #7841)

This PR was merged into the master branch.

Discussion
----------

[Console] Add more verbosity levels

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6066
| License       | MIT
| Doc PR        | symfony/symfony-docs#2554

This adds new verbosity levels.

Replaces #7626 /cc @dlsniper

Commits
-------

02c2038 Fix tests
5327ec4 Add notes in UPGRADE and CHANGELOG
77c9791 [Console] Add tests and support for more types of inputs
54c1377 [Console] Handle new verbosity levels
e639686 Revert invalid changes
8f4d376 Removed unused options
5bb4163 Fixed tests
b62d35f Fix handling of --verbose=... and BC break
16cdb61 Added more verbosity levels

UPGRADE-2.3.md

@@ -184,3 +184,22 @@ DomCrawler
        return $crawler->text();
    });
    ```
+
+Console
+-------
+
+ * New verbosity levels have been added, therefore if you used to do check
+   the output verbosity level directly for VERBOSITY_VERBOSE you probably
+   want to update it to a greater than comparison:
+
+   Before:
+
+   ```
+   if (OutputInterface::VERBOSITY_VERBOSE === $output->getVerbosity()) { ... }
+   ```
+
+   After:
+
+   ```
+   if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) { ... }
+   ```

src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php

@@ -96,7 +96,7 @@ EOF
         $builder->setWorkingDirectory($input->getOption('docroot'));
         $builder->setTimeout(null);
         $builder->getProcess()->run(function ($type, $buffer) use ($output) {
-            if (OutputInterface::VERBOSITY_VERBOSE === $output->getVerbosity()) {
+            if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                 $output->write($buffer);
             }
         });

src/Symfony/Component/Console/Application.php

@@ -184,8 +184,14 @@ class Application
 
         if (true === $input->hasParameterOption(array('--quiet', '-q'))) {
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-        } elseif (true === $input->hasParameterOption(array('--verbose', '-v'))) {
-            $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+        } else {
+            if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') || $input->getParameterOption('--verbose') === 3) {
+                $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
+            } elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') || $input->getParameterOption('--verbose') === 2) {
+                $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
+            } elseif ($input->hasParameterOption('-v') || $input->hasParameterOption('--verbose=1') || $input->hasParameterOption('--verbose') || $input->getParameterOption('--verbose')) {
+                $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
+            }
         }
 
         if (true === $input->hasParameterOption(array('--version', '-V'))) {
@@ -764,7 +770,7 @@ class Application
             $output->writeln("");
             $output->writeln("");
 
-            if (OutputInterface::VERBOSITY_VERBOSE === $output->getVerbosity()) {
+            if (OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
                 $output->writeln('<comment>Exception trace:</comment>');
 
                 // exception related properties
@@ -917,7 +923,7 @@ class Application
 
             new InputOption('--help',           '-h', InputOption::VALUE_NONE, 'Display this help message.'),
             new InputOption('--quiet',          '-q', InputOption::VALUE_NONE, 'Do not output any message.'),
-            new InputOption('--verbose',        '-v', InputOption::VALUE_NONE, 'Increase verbosity of messages.'),
+            new InputOption('--verbose',        '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
             new InputOption('--version',        '-V', InputOption::VALUE_NONE, 'Display this application version.'),
             new InputOption('--ansi',           '',   InputOption::VALUE_NONE, 'Force ANSI output.'),
             new InputOption('--no-ansi',        '',   InputOption::VALUE_NONE, 'Disable ANSI output.'),

src/Symfony/Component/Console/CHANGELOG.md

@@ -10,6 +10,7 @@ CHANGELOG
  * added a way to normalize EOLs in `ApplicationTester::getDisplay()` and `CommandTester::getDisplay()`
  * added a way to set the progress bar progress via the `setCurrent` method
  * added support for multiple InputOption shortcuts, written as `'-a|-b|-c'`
+ * added two additional verbosity levels, VERBOSITY_VERY_VERBOSE and VERBOSITY_DEBUG
 
 2.2.0
 -----

src/Symfony/Component/Console/Descriptor/JsonDescriptor.php

@@ -45,7 +45,7 @@ class JsonDescriptor extends Descriptor
     {
         return $this->output(array(
             'name'              => '--'.$option->getName(),
-            'shortcut'          => $option->getShortcut() ? '-'.$option->getShortcut() : '',
+            'shortcut'          => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '',
             'accept_value'      => $option->acceptValue(),
             'is_value_required' => $option->isValueRequired(),
             'is_multiple'       => $option->isArray(),

src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php

@@ -44,7 +44,7 @@ class MarkdownDescriptor extends Descriptor
     {
         return '**'.$option->getName().':**'."\n\n"
             .'* Name: `--'.$option->getName().'`'."\n"
-            .'* Shortcut: '.($option->getShortcut() ? '`-'.$option->getShortcut().'`' : '<none>')."\n"
+            .'* Shortcut: '.($option->getShortcut() ? '`-'.implode('|-', explode('|', $option->getShortcut())).'`' : '<none>')."\n"
             .'* Accept value: '.($option->acceptValue() ? 'yes' : 'no')."\n"
             .'* Is value required: '.($option->isValueRequired() ? 'yes' : 'no')."\n"
             .'* Is multiple: '.($option->isArray() ? 'yes' : 'no')."\n"

src/Symfony/Component/Console/Helper/ProgressHelper.php

@@ -196,6 +196,8 @@ class ProgressHelper extends Helper
                     }
                     break;
                 case OutputInterface::VERBOSITY_VERBOSE:
+                case OutputInterface::VERBOSITY_VERY_VERBOSE:
+                case OutputInterface::VERBOSITY_DEBUG:
                     $this->format = self::FORMAT_VERBOSE_NOMAX;
                     if ($this->max > 0) {
                         $this->format = self::FORMAT_VERBOSE;

src/Symfony/Component/Console/Output/OutputInterface.php

@@ -22,13 +22,15 @@ use Symfony\Component\Console\Formatter\OutputFormatterInterface;
  */
 interface OutputInterface
 {
-    const VERBOSITY_QUIET   = 0;
-    const VERBOSITY_NORMAL  = 1;
-    const VERBOSITY_VERBOSE = 2;
+    const VERBOSITY_QUIET        = 0;
+    const VERBOSITY_NORMAL       = 1;
+    const VERBOSITY_VERBOSE      = 2;
+    const VERBOSITY_VERY_VERBOSE = 3;
+    const VERBOSITY_DEBUG        = 4;
 
     const OUTPUT_NORMAL = 0;
-    const OUTPUT_RAW = 1;
-    const OUTPUT_PLAIN = 2;
+    const OUTPUT_RAW    = 1;
+    const OUTPUT_PLAIN  = 2;
 
     /**
      * Writes a message to the output.

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -502,9 +502,27 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
         $tester->run(array('command' => 'list', '--verbose' => true));
         $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if --verbose is passed');
 
+        $tester->run(array('command' => 'list', '--verbose' => 1));
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if --verbose=1 is passed');
+
+        $tester->run(array('command' => 'list', '--verbose' => 2));
+        $this->assertSame(Output::VERBOSITY_VERY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to very verbose if --verbose=2 is passed');
+
+        $tester->run(array('command' => 'list', '--verbose' => 3));
+        $this->assertSame(Output::VERBOSITY_DEBUG, $tester->getOutput()->getVerbosity(), '->run() sets the output to debug if --verbose=3 is passed');
+
+        $tester->run(array('command' => 'list', '--verbose' => 4));
+        $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if unknown --verbose level is passed');
+
         $tester->run(array('command' => 'list', '-v' => true));
         $this->assertSame(Output::VERBOSITY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
 
+        $tester->run(array('command' => 'list', '-vv' => true));
+        $this->assertSame(Output::VERBOSITY_VERY_VERBOSE, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
+
+        $tester->run(array('command' => 'list', '-vvv' => true));
+        $this->assertSame(Output::VERBOSITY_DEBUG, $tester->getOutput()->getVerbosity(), '->run() sets the output to verbose if -v is passed');
+
         $application = new Application();
         $application->setAutoExit(false);
         $application->setCatchExceptions(false);

src/Symfony/Component/Console/Tests/Fixtures/application_1.json

@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--xml] [--format=\"...\"] [--raw] [command_name]","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message.","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message.","default":false},"verbose":{"name":"--verbose","shortcut":"-v","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase verbosity of messages.","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version.","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output.","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output.","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question.","default":false}}}},{"name":"list","usage":"list [--xml] [--raw] [--format=\"...\"] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php app\/console list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":null}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
+{"commands":[{"name":"help","usage":"help [--xml] [--format=\"...\"] [--raw] [command_name]","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php app\/console help list<\/info>\n\nYou can also output the help in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console help --format=xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":{"command_name":{"name":"command_name","is_required":false,"is_array":false,"description":"The command name","default":"help"}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output help in other formats","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command help","default":false},"help":{"name":"--help","shortcut":"-h","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this help message.","default":false},"quiet":{"name":"--quiet","shortcut":"-q","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not output any message.","default":false},"verbose":{"name":"--verbose","shortcut":"-v|-vv|-vvv","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug","default":false},"version":{"name":"--version","shortcut":"-V","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Display this application version.","default":false},"ansi":{"name":"--ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Force ANSI output.","default":false},"no-ansi":{"name":"--no-ansi","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Disable ANSI output.","default":false},"no-interaction":{"name":"--no-interaction","shortcut":"-n","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"Do not ask any interactive question.","default":false}}}},{"name":"list","usage":"list [--xml] [--raw] [--format=\"...\"] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php app\/console list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php app\/console list test<\/info>\n\nYou can also output the information in other formats by using the <comment>--format<\/comment> option:\n\n  <info>php app\/console list --format=xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php app\/console list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML","default":false},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false},"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats","default":null}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}

src/Symfony/Component/Console/Tests/Fixtures/application_1.md

@@ -86,11 +86,11 @@ To display the list of available commands, please use the <info>list</info> comm
 **verbose:**
 
 * Name: `--verbose`
-* Shortcut: `-v`
+* Shortcut: `-v|-vv|-vvv`
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: Increase verbosity of messages.
+* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
 * Default: `false`
 
 **version:**

src/Symfony/Component/Console/Tests/Fixtures/application_1.txt

@@ -6,7 +6,7 @@
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message.
   <info>--quiet</info>          <info>-q</info> Do not output any message.
-  <info>--verbose</info>        <info>-v</info> Increase verbosity of messages.
+  <info>--verbose</info>        <info>-v|vv|vvv</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
   <info>--version</info>        <info>-V</info> Display this application version.
   <info>--ansi</info>              Force ANSI output.
   <info>--no-ansi</info>           Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/application_1.xml

@@ -39,8 +39,8 @@
         <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Do not output any message.</description>
         </option>
-        <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>Increase verbosity of messages.</description>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
         </option>
         <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this application version.</description>

src/Symfony/Component/Console/Tests/Fixtures/application_2.md

@@ -93,11 +93,11 @@ To display the list of available commands, please use the <info>list</info> comm
 **verbose:**
 
 * Name: `--verbose`
-* Shortcut: `-v`
+* Shortcut: `-v|-vv|-vvv`
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: Increase verbosity of messages.
+* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
 * Default: `false`
 
 **version:**
@@ -239,11 +239,11 @@ command 1 help
 **verbose:**
 
 * Name: `--verbose`
-* Shortcut: `-v`
+* Shortcut: `-v|-vv|-vvv`
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: Increase verbosity of messages.
+* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
 * Default: `false`
 
 **version:**
@@ -340,11 +340,11 @@ command 2 help
 **verbose:**
 
 * Name: `--verbose`
-* Shortcut: `-v`
+* Shortcut: `-v|-vv|-vvv`
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: Increase verbosity of messages.
+* Description: Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
 * Default: `false`
 
 **version:**

src/Symfony/Component/Console/Tests/Fixtures/application_2.txt

@@ -6,7 +6,7 @@
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message.
   <info>--quiet</info>          <info>-q</info> Do not output any message.
-  <info>--verbose</info>        <info>-v</info> Increase verbosity of messages.
+  <info>--verbose</info>        <info>-v|vv|vvv</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
   <info>--version</info>        <info>-V</info> Display this application version.
   <info>--ansi</info>              Force ANSI output.
   <info>--no-ansi</info>           Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/application_2.xml

@@ -39,8 +39,8 @@
         <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Do not output any message.</description>
         </option>
-        <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>Increase verbosity of messages.</description>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
         </option>
         <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this application version.</description>
@@ -110,8 +110,8 @@
         <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Do not output any message.</description>
         </option>
-        <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>Increase verbosity of messages.</description>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
         </option>
         <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this application version.</description>
@@ -148,8 +148,8 @@
         <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Do not output any message.</description>
         </option>
-        <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>Increase verbosity of messages.</description>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
         </option>
         <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this application version.</description>

src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt

@@ -6,7 +6,7 @@
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message.
   <info>--quiet</info>          <info>-q</info> Do not output any message.
-  <info>--verbose</info>        <info>-v</info> Increase verbosity of messages.
+  <info>--verbose</info>        <info>-v|vv|vvv</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
   <info>--version</info>        <info>-V</info> Display this application version.
   <info>--ansi</info>              Force ANSI output.
   <info>--no-ansi</info>           Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt

@@ -6,7 +6,7 @@
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message.
   <info>--quiet</info>          <info>-q</info> Do not output any message.
-  <info>--verbose</info>        <info>-v</info> Increase verbosity of messages.
+  <info>--verbose</info>        <info>-v|vv|vvv</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
   <info>--version</info>        <info>-V</info> Display this application version.
   <info>--ansi</info>              Force ANSI output.
   <info>--no-ansi</info>           Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt

@@ -39,8 +39,8 @@
     <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Do not output any message.</description>
     </option>
-    <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Increase verbosity of messages.</description>
+    <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
     </option>
     <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Display this application version.</description>
@@ -109,8 +109,8 @@
       <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
         <description>Do not output any message.</description>
       </option>
-      <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Increase verbosity of messages.</description>
+      <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
       </option>
       <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
         <description>Display this application version.</description>

src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt

@@ -16,8 +16,8 @@
       <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
         <description>Do not output any message.</description>
       </option>
-      <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Increase verbosity of messages.</description>
+      <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
       </option>
       <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
         <description>Display this application version.</description>

src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt

@@ -6,7 +6,7 @@
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message.
   <info>--quiet</info>          <info>-q</info> Do not output any message.
-  <info>--verbose</info>        <info>-v</info> Increase verbosity of messages.
+  <info>--verbose</info>        <info>-v|vv|vvv</info> Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
   <info>--version</info>        <info>-V</info> Display this application version.
   <info>--ansi</info>              Force ANSI output.
   <info>--no-ansi</info>           Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt

@@ -6,7 +6,7 @@ Usage:
 Options:
   --help           -h Display this help message.
   --quiet          -q Do not output any message.
-  --verbose        -v Increase verbosity of messages.
+  --verbose        -v|vv|vvv Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
   --version        -V Display this application version.
   --ansi              Force ANSI output.
   --no-ansi           Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt

@@ -11,7 +11,7 @@ Options:
  --raw                 To output raw command help
  --help (-h)           Display this help message.
  --quiet (-q)          Do not output any message.
- --verbose (-v)        Increase verbosity of messages.
+ --verbose (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
  --version (-V)        Display this application version.
  --ansi                Force ANSI output.
  --no-ansi             Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt

@@ -8,7 +8,7 @@
 <comment>Options:</comment>
  <info>--help</info> (-h)           Display this help message.
  <info>--quiet</info> (-q)          Do not output any message.
- <info>--verbose</info> (-v)        Increase verbosity of messages.
+ <info>--verbose</info> (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
  <info>--version</info> (-V)        Display this application version.
  <info>--ansi</info>                Force ANSI output.
  <info>--no-ansi</info>             Disable ANSI output.

src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt

@@ -19,8 +19,8 @@
     <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Do not output any message.</description>
     </option>
-    <option name="--verbose" shortcut="-v" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Increase verbosity of messages.</description>
+    <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
     </option>
     <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Display this application version.</description>