Fix tests

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/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/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 the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
+ <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,7 +19,7 @@
     <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">
+    <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">