From da67c121d314186f05d0c1e5c58b4f0a33393f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Fri, 22 Mar 2013 14:40:47 +0100
Subject: [PATCH 01/24] [Console] added descriptor & refactored description
 commands

---
 .../Command/AbstractDescriptorCommand.php     | 45 ++++++++++
 .../Component/Console/Command/HelpCommand.php | 24 ++---
 .../Component/Console/Command/ListCommand.php | 31 +++----
 .../Descriptor/DescriptorInterface.php        | 51 +++++++++++
 .../Console/Descriptor/DescriptorProvider.php | 89 +++++++++++++++++++
 .../Console/Helper/DescriptorHelper.php       | 54 +++++++++++
 6 files changed, 265 insertions(+), 29 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
 create mode 100644 src/Symfony/Component/Console/Helper/DescriptorHelper.php

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
new file mode 100644
index 0000000000000..3564b84e02d33
--- /dev/null
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Symfony\Component\Console\Command;
+
+use Symfony\Component\Console\Descriptor\DescriptorProvider;
+use Symfony\Component\Console\Helper\DescriptorHelper;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * Base class for descriptor commands.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractDescriptorCommand extends Command
+{
+    /**
+     * @var array
+     */
+    private $supportedFormats;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $descriptorProvider = new DescriptorProvider();
+        $this->supportedFormats = $descriptorProvider->getSupportedFormats();
+        $this->setDefinition($this->createDefinition());
+        $this->getHelperSet()->set(new DescriptorHelper($descriptorProvider));
+    }
+
+    /**
+     * Creates command definition.
+     *
+     * @return InputDefinition
+     */
+    protected function createDefinition()
+    {
+        return new InputDefinition(array(
+            new InputOption('format', null, InputOption::VALUE_OPTIONAL, 'Output format ('.implode(', ', $this->supportedFormats).')'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
+        ));
+    }
+}
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index ac4dd3d54d772..b467e710bc028 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -15,14 +15,13 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
 
 /**
  * HelpCommand displays the help for a given command.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class HelpCommand extends Command
+class HelpCommand extends AbstractDescriptorCommand
 {
     private $command;
 
@@ -35,10 +34,6 @@ protected function configure()
 
         $this
             ->setName('help')
-            ->setDefinition(array(
-                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
-                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'),
-            ))
             ->setDescription('Displays help for a command')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command displays help for a given command:
@@ -65,6 +60,17 @@ public function setCommand(Command $command)
         $this->command = $command;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function createDefinition()
+    {
+        $definition = parent::createDefinition();
+        $definition->addArgument(new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'));
+
+        return $definition;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -74,11 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->command = $this->getApplication()->find($input->getArgument('command_name'));
         }
 
-        if ($input->getOption('xml')) {
-            $output->writeln($this->command->asXml(), OutputInterface::OUTPUT_RAW);
-        } else {
-            $output->writeln($this->command->asText());
-        }
+        $this->getHelper('descriptor')->describe($output, $this->command, $input->getArgument('format'), $input->getOption('raw'));
 
         $this->command = null;
     }
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index ec5ea43e5b40e..e4c2f6025a63f 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -15,15 +15,13 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputDefinition;
 
 /**
  * ListCommand displays the list of all available commands for the application.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ListCommand extends Command
+class ListCommand extends AbstractDescriptorCommand
 {
     /**
      * {@inheritdoc}
@@ -32,7 +30,6 @@ protected function configure()
     {
         $this
             ->setName('list')
-            ->setDefinition($this->createDefinition())
             ->setDescription('Lists commands')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command lists all commands:
@@ -58,29 +55,27 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function getNativeDefinition()
+    protected function createDefinition()
     {
-        return $this->createDefinition();
+        $definition = parent::createDefinition();
+        $definition->addArgument(new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'));
+
+        return $definition;
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function getNativeDefinition()
     {
-        if ($input->getOption('xml')) {
-            $output->writeln($this->getApplication()->asXml($input->getArgument('namespace')), OutputInterface::OUTPUT_RAW);
-        } else {
-            $output->writeln($this->getApplication()->asText($input->getArgument('namespace'), $input->getOption('raw')));
-        }
+        return $this->createDefinition();
     }
 
-    private function createDefinition()
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
-        return new InputDefinition(array(
-            new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
-            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'),
-            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
-        ));
+        $this->getHelper('descriptor')->describe($output, $this->getApplication(), $input->getArgument('format'), $input->getOption('raw'));
     }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
new file mode 100644
index 0000000000000..39ffc8a805dcf
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+interface DescriptorInterface
+{
+    /**
+     * Returns given object's representation.
+     *
+     * @param object  $object The object to describe
+     * @param boolean $raw    No additional markers if true
+     *
+     * @return string The object formatted description
+     */
+    public function describe($object, $raw = false);
+
+    /**
+     * Tests if this descriptor supports given object.
+     *
+     * @param object $object The object to describe
+     *
+     * @return boolean
+     */
+    public function supports($object);
+
+    /**
+     * Returns descriptor's format name.
+     *
+     * @return string The format name
+     */
+    public function getFormat();
+
+    /**
+     * Returns true if output formatting is used.
+     *
+     * @return boolean
+     */
+    public function useFormatting();
+}
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
new file mode 100644
index 0000000000000..ce4d35f495e5d
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class DescriptorProvider
+{
+    /**
+     * @var DescriptorInterface[]
+     */
+    private $descriptors = array();
+
+    /**
+     * @var string
+     */
+    private $defaultFormat;
+
+    /**
+     * Constructor.
+     *
+     * @param string $defaultFormat
+     */
+    public function __construct($defaultFormat = 'txt')
+    {
+        $this->defaultFormat = $defaultFormat;
+    }
+
+    /**
+     * Adds a descriptor to the stack.
+     *
+     * @param DescriptorInterface $descriptor
+     *
+     * @return DescriptorProvider
+     */
+    public function add(DescriptorInterface $descriptor)
+    {
+        $this->descriptors[] = $descriptor;
+
+        return $this;
+    }
+
+    /**
+     * Provides a descriptor for given object and format.
+     *
+     * @param mixed  $object The object to describe
+     * @param string $format The description format
+     *
+     * @return DescriptorInterface The object descriptor
+     *
+     * @throws \InvalidArgumentException If no descriptors was found
+     */
+    public function get($object, $format)
+    {
+        foreach ($this->descriptors as $descriptor) {
+            if ($format === $descriptor->getFormat() && $descriptor->supports($object)) {
+                return $descriptor;
+            }
+        }
+
+        throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
+    }
+
+    /**
+     * Returns default format.
+     *
+     * @return string
+     */
+    public function getDefaultFormat()
+    {
+        return $this->defaultFormat;
+    }
+
+    /**
+     * Returns supported formats list.
+     *
+     * @return array
+     */
+    public function getSupportedFormats()
+    {
+        $supportedFormats = array();
+        foreach ($this->descriptors as $descriptor) {
+            $supportedFormats[] = $descriptor->getFormat();
+        }
+
+        return array_unique($supportedFormats);
+    }
+}
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
new file mode 100644
index 0000000000000..b3d1e93937cf1
--- /dev/null
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Symfony\Component\Console\Helper;
+
+use Symfony\Component\Console\Descriptor\DescriptorProvider;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * This class adds helper method to describe objects in various formats.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class DescriptorHelper extends Helper
+{
+    /**
+     * @var DescriptorProvider
+     */
+    private $provider;
+
+    /**
+     * Constructor.
+     *
+     * @param DescriptorProvider $provider
+     */
+    public function __construct(DescriptorProvider $provider)
+    {
+        $this->provider = $provider;
+    }
+
+    /**
+     * Describes an object if supported.
+     *
+     * @param OutputInterface $output
+     * @param object          $object
+     * @param string          $format
+     * @param boolean         $raw
+     */
+    public function describe(OutputInterface $output, $object, $format = null, $raw = false)
+    {
+        $format = $format ?: $this->provider->getDefaultFormat();
+        $descriptor = $this->provider->get($object, $format);
+        $type = $raw && $descriptor->useFormatting() ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
+
+        $output->writeln($descriptor->describe($object, $format, $raw), $type);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'descriptor';
+    }
+}

From f239b1c5c442b788b6c779ca110e34f97669f521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Mon, 1 Apr 2013 21:29:42 +0200
Subject: [PATCH 02/24] [Console] added JSON descriptors

---
 .../Descriptor/DescriptorInterface.php        |  9 ++
 .../Console/Descriptor/DescriptorProvider.php | 44 +++++++--
 .../Json/AbstractJsonDescriptor.php           | 81 +++++++++++++++++
 .../Json/ApplicationJsonDescriptor.php        | 90 +++++++++++++++++++
 .../Descriptor/Json/CommandJsonDescriptor.php | 37 ++++++++
 .../Json/InputArgumentJsonDescriptor.php      | 34 +++++++
 .../Json/InputDefinitionJsonDescriptor.php    | 40 +++++++++
 .../Json/InputOptionJsonDescriptor.php        | 36 ++++++++
 .../Descriptor/AbstractDescriptorTest.php     | 32 +++++++
 .../Json/ApplicationJsonDescriptorTest.php    | 20 +++++
 .../Json/CommandJsonDescriptorTest.php        | 20 +++++
 .../Json/InputArgumentJsonDescriptorTest.php  | 20 +++++
 .../InputDefinitionJsonDescriptorTest.php     | 20 +++++
 .../Json/InputOptionJsonDescriptorTest.php    | 20 +++++
 .../Tests/Descriptor/ObjectsProvider.php      | 66 ++++++++++++++
 .../Tests/Fixtures/DescriptorApplication1.php |  9 ++
 .../Tests/Fixtures/DescriptorApplication2.php | 15 ++++
 .../Tests/Fixtures/DescriptorCommand1.php     | 18 ++++
 .../Tests/Fixtures/DescriptorCommand2.php     | 21 +++++
 .../Console/Tests/Fixtures/application_1.json |  1 +
 .../Console/Tests/Fixtures/application_2.json |  1 +
 .../Console/Tests/Fixtures/command_1.json     |  1 +
 .../Console/Tests/Fixtures/command_2.json     |  1 +
 .../Tests/Fixtures/input_argument_1.json      |  1 +
 .../Tests/Fixtures/input_argument_2.json      |  1 +
 .../Tests/Fixtures/input_argument_3.json      |  1 +
 .../Tests/Fixtures/input_definition_1.json    |  1 +
 .../Tests/Fixtures/input_definition_2.json    |  1 +
 .../Tests/Fixtures/input_definition_3.json    |  1 +
 .../Tests/Fixtures/input_definition_4.json    |  1 +
 .../Tests/Fixtures/input_option_1.json        |  1 +
 .../Tests/Fixtures/input_option_2.json        |  1 +
 .../Tests/Fixtures/input_option_3.json        |  1 +
 .../Tests/Fixtures/input_option_4.json        |  1 +
 34 files changed, 641 insertions(+), 6 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_1.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_1.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_2.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_3.json
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_4.json

diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index 39ffc8a805dcf..fe9124f9243f5 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -16,6 +16,15 @@
  */
 interface DescriptorInterface
 {
+    /**
+     * Configures descriptor with description options.
+     *
+     * @param array $options Description options
+     *
+     * @return DescriptorInterface
+     */
+    public function configure(array $options);
+
     /**
      * Returns given object's representation.
      *
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index ce4d35f495e5d..f0cce3a3d696b 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -2,6 +2,8 @@
 
 namespace Symfony\Component\Console\Descriptor;
 
+use Symfony\Component\Console\Descriptor\Json;
+
 /**
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
  */
@@ -13,18 +15,29 @@ class DescriptorProvider
     private $descriptors = array();
 
     /**
-     * @var string
+     * @var array
      */
-    private $defaultFormat;
+    private $options = array(
+        'default_format' => 'txt',
+        'json_encoding'  => 0,
+        'namespace'      => null,
+    );
 
     /**
      * Constructor.
      *
-     * @param string $defaultFormat
+     * @param array $options
      */
-    public function __construct($defaultFormat = 'txt')
+    public function __construct(array $options = array())
     {
-        $this->defaultFormat = $defaultFormat;
+        $this
+            ->configure($options)
+            ->add(new Json\ApplicationJsonDescriptor())
+            ->add(new Json\CommandJsonDescriptor())
+            ->add(new Json\InputDefinitionJsonDescriptor())
+            ->add(new Json\InputArgumentJsonDescriptor())
+            ->add(new Json\InputOptionJsonDescriptor())
+        ;
     }
 
     /**
@@ -36,11 +49,30 @@ public function __construct($defaultFormat = 'txt')
      */
     public function add(DescriptorInterface $descriptor)
     {
+        $descriptor->configure($this->options);
         $this->descriptors[] = $descriptor;
 
         return $this;
     }
 
+    /**
+     * Configures provider with options.
+     *
+     * @param array $options
+     *
+     * @return DescriptorProvider
+     */
+    public function configure(array $options)
+    {
+        $this->options = array_replace($this->options, $options);
+
+        foreach ($this->descriptors as $descriptor) {
+            $descriptor->configure($this->options);
+        }
+
+        return $this;
+    }
+
     /**
      * Provides a descriptor for given object and format.
      *
@@ -69,7 +101,7 @@ public function get($object, $format)
      */
     public function getDefaultFormat()
     {
-        return $this->defaultFormat;
+        return $this->options['default_format'];
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
new file mode 100644
index 0000000000000..cd55ead08973c
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\DescriptorInterface;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractJsonDescriptor implements DescriptorInterface
+{
+    /**
+     * @var int
+     */
+    private $encodingOptions = 0;
+
+    /**
+     * @param int $encodingOptions
+     */
+    public function __construct($encodingOptions = 0)
+    {
+        $this->encodingOptions = $encodingOptions;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        $this->encodingOptions = $options['json_encoding'];
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describe($object, $raw = false)
+    {
+        return json_encode($this->getData($object), $this->encodingOptions);
+    }
+
+    /**
+     * Returns object data to encode.
+     *
+     * @param object $object
+     *
+     * @return array
+     */
+    abstract public function getData($object);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormat()
+    {
+        return 'json';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function useFormatting()
+    {
+        return false;
+    }
+
+    /**
+     * Builds a JSON descriptor.
+     *
+     * @param AbstractJsonDescriptor $descriptor
+     *
+     * @return AbstractJsonDescriptor
+     */
+    protected function build(AbstractJsonDescriptor $descriptor)
+    {
+        $descriptor->configure(array('json_encoding' => $this->encodingOptions));
+
+        return $descriptor;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
new file mode 100644
index 0000000000000..99168f31dec58
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Json;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class ApplicationJsonDescriptor extends AbstractJsonDescriptor
+{
+    /**
+     * @var string|null
+     */
+    private $namespace;
+
+    public function __construct($namespace = null, $encodingOptions = 0)
+    {
+        $this->namespace = $namespace;
+        parent::__construct($encodingOptions);
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        $this->namespace = $options['namespace'];
+
+        return parent::configure($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($object)
+    {
+        $commandDescriptor = $this->build(new CommandJsonDescriptor());
+
+        /** @var Application $object */
+        $commands = $object->all($this->namespace ? $object->findNamespace($this->namespace) : null);
+        $data = array('commands' => array(), 'namespaces' => array());
+
+        foreach ($this->sortCommands($object, $commands) as $space => $commands) {
+            $namespaceData = array('id' => $space, 'commands' => array());
+
+            /** @var Command $command */
+            foreach ($commands as $command) {
+                if (!$command->getName()) {
+                    continue;
+                }
+
+                $data['commands'][] = $commandDescriptor->getData($command);
+                $namespaceData['commands'][] = $command->getName();
+            }
+
+            $data['namespaces'][] = $namespaceData;
+        }
+
+        if ($this->namespace) {
+            $data['namespace'] = $this->namespace;
+        }
+
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Application;
+    }
+
+    /**
+     * @param Application $application
+     * @param Command[]   $commands
+     *
+     * @return array
+     */
+    private function sortCommands(Application $application, array $commands)
+    {
+        $method = new \ReflectionMethod($application, 'sortCommands');
+        $method->setAccessible(true);
+
+        return $method->invoke($application, $commands);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
new file mode 100644
index 0000000000000..6731945d19ae1
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Json;
+
+use Symfony\Component\Console\Command\Command;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class CommandJsonDescriptor extends AbstractJsonDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($object)
+    {
+        $definitionDescriptor = $this->build(new InputDefinitionJsonDescriptor());
+
+        /** @var Command $object */
+        return array(
+            'name'        => $object->getName(),
+            'usage'       => $object->getSynopsis(),
+            'description' => $object->getDescription(),
+            'help'        => $object->getProcessedHelp(),
+            'aliases'     => $object->getAliases(),
+            'definition'  => $definitionDescriptor->getData($object->getDefinition()),
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Command;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
new file mode 100644
index 0000000000000..f786cf7ea8029
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Json;
+
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputArgumentJsonDescriptor extends AbstractJsonDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($object)
+    {
+        /** @var InputArgument $object */
+        return array(
+            'name'        => $object->getName(),
+            'is_required' => $object->isRequired(),
+            'is_array'    => $object->isArray(),
+            'description' => $object->getDescription(),
+            'default'     => $object->getDefault(),
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputArgument;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
new file mode 100644
index 0000000000000..4eca287b09f6e
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Json;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputDefinitionJsonDescriptor extends AbstractJsonDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($object)
+    {
+        $argumentDescriptor = $this->build(new InputArgumentJsonDescriptor());
+        $optionDescriptor = $this->build(new InputOptionJsonDescriptor());
+
+        /** @var InputDefinition $object */
+        return array(
+            'arguments' => array_map(function (InputArgument $argument) use ($argumentDescriptor) {
+                return $argumentDescriptor->getData($argument);
+            }, $object->getArguments()),
+            'options' => array_map(function (InputOption $option) use ($optionDescriptor) {
+                return $optionDescriptor->getData($option);
+            }, $object->getOptions()),
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputDefinition;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
new file mode 100644
index 0000000000000..83893da151cd5
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Json;
+
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputOptionJsonDescriptor extends AbstractJsonDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getData($object)
+    {
+        /** @var InputOption $object */
+        return array(
+            'name'              => '--'.$object->getName(),
+            'shortcut'          => $object->getShortcut() ? '-'.$object->getShortcut() : '',
+            'accept_value'      => $object->acceptValue(),
+            'is_value_required' => $object->isValueRequired(),
+            'is_multiple'       => $object->isArray(),
+            'description'       => $object->getDescription(),
+            'default'           => $object->getDefault(),
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputOption;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
new file mode 100644
index 0000000000000..870d2408483b6
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
+{
+    /** @dataProvider getDescribeTestData */
+    public function testDescribe(DescriptorInterface $descriptor, $object, $description)
+    {
+        $this->assertTrue($descriptor->supports($object));
+        $this->assertEquals(trim($description), trim($descriptor->describe($object)));
+    }
+
+    public function getDescribeTestData()
+    {
+        $data = array();
+        $descriptor = $this->getDescriptor();
+
+        foreach ($this->getObjects() as $name => $object) {
+            $description = file_get_contents(sprintf('%s/../Fixtures/%s.%s', __DIR__, $name, $descriptor->getFormat()));
+            $data[] = array($descriptor, $object, $description);
+        }
+
+        return $data;
+    }
+
+    abstract protected function getDescriptor();
+    abstract protected function getObjects();
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
new file mode 100644
index 0000000000000..948867cba3285
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Json\ApplicationJsonDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class ApplicationJsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new ApplicationJsonDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getApplications();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
new file mode 100644
index 0000000000000..d73eb15e38484
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Json\CommandJsonDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class CommandJsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new CommandJsonDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getCommands();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
new file mode 100644
index 0000000000000..84926c5c6c4a7
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Json\InputArgumentJsonDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputArgumentJsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputArgumentJsonDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputArguments();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
new file mode 100644
index 0000000000000..7dd204ff6107c
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Json\InputDefinitionJsonDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputDefinitionJsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputDefinitionJsonDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputDefinitions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
new file mode 100644
index 0000000000000..256a8e84195ac
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Json\InputOptionJsonDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputOptionJsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputOptionJsonDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputOptions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
new file mode 100644
index 0000000000000..ee65da14c63fe
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplication1;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorApplication2;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommand1;
+use Symfony\Component\Console\Tests\Fixtures\DescriptorCommand2;
+use Symfony\Component\Finder\Shell\Command;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class ObjectsProvider
+{
+    public static function getInputArguments()
+    {
+        return array(
+            'input_argument_1' => new InputArgument('argument_name', InputArgument::REQUIRED),
+            'input_argument_2' => new InputArgument('argument_name', InputArgument::IS_ARRAY, 'argument description'),
+            'input_argument_3' => new InputArgument('argument_name', InputArgument::OPTIONAL, 'argument description', 'default_value'),
+        );
+    }
+
+    public static function getInputOptions()
+    {
+        return array(
+            'input_option_1' => new InputOption('option_name', 'o', InputOption::VALUE_NONE),
+            'input_option_2' => new InputOption('option_name', 'o', InputOption::VALUE_OPTIONAL, 'option description', 'default_value'),
+            'input_option_3' => new InputOption('option_name', 'o', InputOption::VALUE_REQUIRED, 'option description'),
+            'input_option_4' => new InputOption('option_name', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL, 'option description', array()),
+        );
+    }
+
+    public static function getInputDefinitions()
+    {
+        return array(
+            'input_definition_1' => new InputDefinition(),
+            'input_definition_2' => new InputDefinition(array(new InputArgument('argument_name', InputArgument::REQUIRED))),
+            'input_definition_3' => new InputDefinition(array(new InputOption('option_name', 'o', InputOption::VALUE_NONE))),
+            'input_definition_4' => new InputDefinition(array(
+                new InputArgument('argument_name', InputArgument::REQUIRED),
+                new InputOption('option_name', 'o', InputOption::VALUE_NONE),
+            )),
+        );
+    }
+
+    public static function getCommands()
+    {
+        return array(
+            'command_1' => new DescriptorCommand1(),
+            'command_2' => new DescriptorCommand2(),
+        );
+    }
+
+    public static function getApplications()
+    {
+        return array(
+            'application_1' => new DescriptorApplication1(),
+            'application_2' => new DescriptorApplication2(),
+        );
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php
new file mode 100644
index 0000000000000..6969b5806e567
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Application;
+
+class DescriptorApplication1 extends Application
+{
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
new file mode 100644
index 0000000000000..9652584f82e6f
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Application;
+
+class DescriptorApplication2 extends Application
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->add(new DescriptorCommand1());
+        $this->add(new DescriptorCommand2());
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
new file mode 100644
index 0000000000000..380a7229f9cf0
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+
+class DescriptorCommand1 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:command1')
+            ->setAliases(array('alias1', 'alias2'))
+            ->setDescription('command 1 description')
+            ->setHelp('command 1 help')
+        ;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
new file mode 100644
index 0000000000000..f4c87c2cd4437
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+class DescriptorCommand2 extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('descriptor:command2')
+            ->setDescription('command 2 description')
+            ->setHelp('command 2 help')
+            ->addArgument('argument_name', InputArgument::REQUIRED)
+            ->addOption('option_name', 'o', InputOption::VALUE_NONE)
+        ;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
new file mode 100644
index 0000000000000..888d127f7b7de
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -0,0 +1 @@
+{"commands":[{"name":"help","usage":"help","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"list","usage":"list","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":[],"options":[]}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
new file mode 100644
index 0000000000000..b51e723476120
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -0,0 +1 @@
+{"commands":[{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"help","usage":"help","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"list","usage":"list","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["descriptor:command1","descriptor:command1","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_1.json b/src/Symfony/Component/Console/Tests/Fixtures/command_1.json
new file mode 100644
index 0000000000000..0c1675dbcef42
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_1.json
@@ -0,0 +1 @@
+{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.json b/src/Symfony/Component/Console/Tests/Fixtures/command_2.json
new file mode 100644
index 0000000000000..493b584669ef9
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.json
@@ -0,0 +1 @@
+{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.json b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.json
new file mode 100644
index 0000000000000..b8173b6b3fca9
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.json
@@ -0,0 +1 @@
+{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.json b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.json
new file mode 100644
index 0000000000000..ef06b09a7550f
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.json
@@ -0,0 +1 @@
+{"name":"argument_name","is_required":false,"is_array":true,"description":"argument description","default":[]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.json b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.json
new file mode 100644
index 0000000000000..de8484e6a72ce
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.json
@@ -0,0 +1 @@
+{"name":"argument_name","is_required":false,"is_array":false,"description":"argument description","default":"default_value"}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.json b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.json
new file mode 100644
index 0000000000000..c7a7d838fd5ae
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.json
@@ -0,0 +1 @@
+{"arguments":[],"options":[]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.json b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.json
new file mode 100644
index 0000000000000..9964a55ae31ec
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.json
@@ -0,0 +1 @@
+{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":[]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.json b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.json
new file mode 100644
index 0000000000000..6a86056029784
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.json
@@ -0,0 +1 @@
+{"arguments":[],"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.json b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.json
new file mode 100644
index 0000000000000..c5a0019fe2a1f
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.json
@@ -0,0 +1 @@
+{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.json b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.json
new file mode 100644
index 0000000000000..60c5b56cb44ea
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.json
@@ -0,0 +1 @@
+{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.json b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.json
new file mode 100644
index 0000000000000..04e4228ec3164
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.json
@@ -0,0 +1 @@
+{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"option description","default":"default_value"}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.json b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.json
new file mode 100644
index 0000000000000..c1ea120c7a24a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.json
@@ -0,0 +1 @@
+{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"option description","default":null}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.json b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.json
new file mode 100644
index 0000000000000..1b671d80651ef
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.json
@@ -0,0 +1 @@
+{"name":"--option_name","shortcut":"-o","accept_value":true,"is_value_required":false,"is_multiple":true,"description":"option description","default":[]}

From bebf1ebb2882b330bf7c9e17bb2be7045eb66f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Wed, 3 Apr 2013 07:04:52 +0200
Subject: [PATCH 03/24] [Console] added markdown descriptors

---
 .../Descriptor/ApplicationDescription.php     | 78 ++++++++++++++++
 .../Json/AbstractJsonDescriptor.php           |  2 +-
 .../Json/ApplicationJsonDescriptor.php        | 52 +++--------
 .../Markdown/AbstractMarkdownDescriptor.php   | 67 ++++++++++++++
 .../ApplicationMarkdownDescriptor.php         | 70 ++++++++++++++
 .../Markdown/CommandMarkdownDescriptor.php    | 41 +++++++++
 .../Markdown/Document/BlockInterface.php      | 25 +++++
 .../Descriptor/Markdown/Document/Document.php | 56 +++++++++++
 .../Markdown/Document/Formatter.php           | 55 +++++++++++
 .../Markdown/Document/Paragraph.php           | 40 ++++++++
 .../Descriptor/Markdown/Document/Title.php    | 71 ++++++++++++++
 .../Markdown/Document/UnorderedList.php       | 59 ++++++++++++
 .../InputArgumentMarkdownDescriptor.php       | 37 ++++++++
 .../InputDefinitionMarkdownDescriptor.php     | 47 ++++++++++
 .../InputOptionMarkdownDescriptor.php         | 39 ++++++++
 .../ApplicationMarkdownDescriptorTest.php     | 20 ++++
 .../CommandMarkdownDescriptorTest.php         | 20 ++++
 .../Markdown/Document/FormatterTest.php       | 27 ++++++
 .../InputArgumentMarkdownDescriptorTest.php   | 20 ++++
 .../InputDefinitionMarkdownDescriptorTest.php | 20 ++++
 .../InputOptionMarkdownDescriptorTest.php     | 20 ++++
 .../Tests/Fixtures/DescriptorApplication2.php |  2 +-
 .../Console/Tests/Fixtures/application_1.md   | 45 +++++++++
 .../Console/Tests/Fixtures/application_2.json |  2 +-
 .../Console/Tests/Fixtures/application_2.md   | 92 +++++++++++++++++++
 .../Console/Tests/Fixtures/command_1.md       |  8 ++
 .../Console/Tests/Fixtures/command_2.md       | 30 ++++++
 .../Tests/Fixtures/input_argument_1.md        |  7 ++
 .../Tests/Fixtures/input_argument_2.md        |  7 ++
 .../Tests/Fixtures/input_argument_3.md        |  7 ++
 .../Tests/Fixtures/input_definition_1.md      |  0
 .../Tests/Fixtures/input_definition_2.md      |  9 ++
 .../Tests/Fixtures/input_definition_3.md      | 11 +++
 .../Tests/Fixtures/input_definition_4.md      | 21 +++++
 .../Console/Tests/Fixtures/input_option_1.md  |  9 ++
 .../Console/Tests/Fixtures/input_option_2.md  |  9 ++
 .../Console/Tests/Fixtures/input_option_3.md  |  9 ++
 .../Console/Tests/Fixtures/input_option_4.md  |  9 ++
 38 files changed, 1099 insertions(+), 44 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_1.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_1.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_2.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_3.md
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_4.md

diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
new file mode 100644
index 0000000000000..be5d9a4a5537d
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class ApplicationDescription
+{
+    const GLOBAL_NAMESPACE = '_global';
+
+    private $application;
+    private $namespace;
+    private $namespaces;
+    private $commands;
+
+    public function __construct(Application $application, $namespace = null)
+    {
+        $this->application = $application;
+        $this->namespace = $namespace;
+    }
+
+    public function getNamespaces()
+    {
+        if (null === $this->namespaces) {
+            $this->inspectApplication();
+        }
+
+        return $this->namespaces;
+    }
+
+    public function getCommands()
+    {
+        if (null === $this->commands) {
+            $this->inspectApplication();
+        }
+
+        return $this->commands;
+    }
+
+    private function inspectApplication()
+    {
+        $this->commands = array();
+        $this->namespaces = array();
+
+        $all = $this->application->all($this->namespace ? $this->application->findNamespace($this->namespace) : null);
+        foreach ($this->sortCommands($all) as $namespace => $commands) {
+            $names = array();
+
+            /** @var Command $command */
+            foreach ($commands as $name => $command) {
+                if (!$command->getName()) {
+                    continue;
+                }
+
+                // aliases must be skipped in commands list
+                if ($name === $command->getName()) {
+                    $this->commands[] = $command;
+                }
+
+                $names[] = $name;
+            }
+
+            $this->namespaces[] = array('id' => $namespace, 'commands' => $names);
+        }
+    }
+
+    private function sortCommands(array $commands)
+    {
+        $method = new \ReflectionMethod($this->application, 'sortCommands');
+        $method->setAccessible(true);
+
+        return $method->invoke($this->application, $commands);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
index cd55ead08973c..a37f079707645 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
@@ -12,7 +12,7 @@ abstract class AbstractJsonDescriptor implements DescriptorInterface
     /**
      * @var int
      */
-    private $encodingOptions = 0;
+    private $encodingOptions;
 
     /**
      * @param int $encodingOptions
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
index 99168f31dec58..6d2fe49ffeb3d 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -3,7 +3,7 @@
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -15,13 +15,16 @@ class ApplicationJsonDescriptor extends AbstractJsonDescriptor
      */
     private $namespace;
 
+    /**
+     * @param string|null $namespace
+     * @param int         $encodingOptions
+     */
     public function __construct($namespace = null, $encodingOptions = 0)
     {
         $this->namespace = $namespace;
         parent::__construct($encodingOptions);
     }
 
-
     /**
      * {@inheritdoc}
      */
@@ -37,33 +40,14 @@ public function configure(array $options)
      */
     public function getData($object)
     {
-        $commandDescriptor = $this->build(new CommandJsonDescriptor());
-
         /** @var Application $object */
-        $commands = $object->all($this->namespace ? $object->findNamespace($this->namespace) : null);
-        $data = array('commands' => array(), 'namespaces' => array());
-
-        foreach ($this->sortCommands($object, $commands) as $space => $commands) {
-            $namespaceData = array('id' => $space, 'commands' => array());
-
-            /** @var Command $command */
-            foreach ($commands as $command) {
-                if (!$command->getName()) {
-                    continue;
-                }
-
-                $data['commands'][] = $commandDescriptor->getData($command);
-                $namespaceData['commands'][] = $command->getName();
-            }
-
-            $data['namespaces'][] = $namespaceData;
-        }
+        $description = new ApplicationDescription($object, $this->namespace);
+        $descriptor = $this->build(new CommandJsonDescriptor());
+        $commands = array_map(array($descriptor, 'getData'), $description->getCommands());
 
-        if ($this->namespace) {
-            $data['namespace'] = $this->namespace;
-        }
-
-        return $data;
+        return null === $this->namespace
+            ? array('commands' => $commands, 'namespaces' => $description->getNamespaces())
+            : array('commands' => $commands, 'namespace' => $this->namespace);
     }
 
     /**
@@ -73,18 +57,4 @@ public function supports($object)
     {
         return $object instanceof Application;
     }
-
-    /**
-     * @param Application $application
-     * @param Command[]   $commands
-     *
-     * @return array
-     */
-    private function sortCommands(Application $application, array $commands)
-    {
-        $method = new \ReflectionMethod($application, 'sortCommands');
-        $method->setAccessible(true);
-
-        return $method->invoke($application, $commands);
-    }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
new file mode 100644
index 0000000000000..c4c1f5470d881
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown;
+
+use Symfony\Component\Console\Descriptor\DescriptorInterface;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractMarkdownDescriptor implements DescriptorInterface
+{
+    /**
+     * @var int
+     */
+    private $maxWidth;
+
+    /**
+     * @param int $maxWidth
+     */
+    public function __construct($maxWidth = 120)
+    {
+        $this->maxWidth = $maxWidth;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        $this->maxWidth = $options['markdown_width'];
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describe($object, $raw = false)
+    {
+        return $this->getDocument($object)->format(new Document\Formatter($this->maxWidth));
+    }
+
+    /**
+     * Returns object document to format.
+     *
+     * @param object $object
+     *
+     * @return Document\Document
+     */
+    abstract public function getDocument($object);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormat()
+    {
+        return 'md';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function useFormatting()
+    {
+        return false;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
new file mode 100644
index 0000000000000..af22d5f0fa10a
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class ApplicationMarkdownDescriptor extends AbstractMarkdownDescriptor
+{
+    /**
+     * @var string|null
+     */
+    private $namespace;
+
+    /**
+     * @param string|null $namespace
+     * @param int         $maxWidth
+     */
+    public function __construct($namespace = null, $maxWidth = 120)
+    {
+        $this->namespace = $namespace;
+        parent::__construct($maxWidth);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        $this->namespace = $options['namespace'];
+
+        return parent::configure($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDocument($object)
+    {
+        /** @var Application $object */
+        $description = new ApplicationDescription($object, $this->namespace);
+        $descriptor = new CommandMarkdownDescriptor();
+        $document = new Document\Document(array(new Document\Title($object->getName(), 1)));
+
+        foreach ($description->getNamespaces() as $namespace) {
+            if (ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
+                $document->add(new Document\Paragraph('**'.$namespace['id'].':**'));
+            }
+
+            $document->add(new Document\UnorderedList($namespace['commands']));
+        }
+
+        foreach ($description->getCommands() as $command) {
+            $document->add($descriptor->getDocument($command));
+        }
+
+        return $document;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Application;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
new file mode 100644
index 0000000000000..48688e3f122d9
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown;
+
+use Symfony\Component\Console\Command\Command;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class CommandMarkdownDescriptor extends AbstractMarkdownDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDocument($object)
+    {
+        $definitionDescriptor = new InputDefinitionMarkdownDescriptor();
+
+        $object->getProcessedHelp();
+
+        /** @var Command $object */
+        return new Document\Document(array(
+            new Document\Title($object->getName(), 2),
+            new Document\UnorderedList(array(
+                'Description: '.($object->getDescription() ?: '<none>'),
+                'Usage: `'.$object->getSynopsis().'`',
+                'Aliases: '.(count($object->getAliases()) ? '`'.implode('`, `', $object->getAliases()).'`' : '<none>'),
+            )),
+            new Document\Paragraph($object->getProcessedHelp()),
+            $definitionDescriptor->getDocument($object->getDefinition()),
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Command;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
new file mode 100644
index 0000000000000..d4f3845e447b0
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown\Document;
+
+/**
+ * Document block interface.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+interface BlockInterface
+{
+    /**
+     * @return boolean
+     */
+    public function isEmpty();
+
+    /**
+     * Formats block output.
+     *
+     * @param Formatter $formatter
+     *
+     * @return string
+     */
+    public function format(Formatter $formatter);
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
new file mode 100644
index 0000000000000..67ac4c63f1746
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown\Document;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class Document implements BlockInterface
+{
+    /**
+     * @var BlockInterface[]
+     */
+    private $blocks = array();
+
+    /**
+     * @param BlockInterface[] $blocks
+     */
+    public function __construct(array $blocks = array())
+    {
+        foreach ($blocks as $block) {
+            $this->add($block);
+        }
+    }
+
+    /**
+     * @param BlockInterface $block
+     *
+     * @return Document
+     */
+    public function add(BlockInterface $block)
+    {
+        $this->blocks[] = $block;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEmpty()
+    {
+        return empty($this->blocks);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(Formatter $formatter)
+    {
+        return implode("\n\n", array_map(function (BlockInterface $block) use ($formatter) {
+            return $block->format($formatter);
+        }, array_filter($this->blocks, function (BlockInterface $block) {
+            return !$block->isEmpty();
+        })));
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
new file mode 100644
index 0000000000000..7cbff31516744
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown\Document;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class Formatter
+{
+    /**
+     * @var int
+     */
+    private $maxWidth;
+
+    /**
+     * @param int $maxWidth
+     */
+    public function __construct($maxWidth = 120)
+    {
+        $this->maxWidth = $maxWidth;
+    }
+
+    /**
+     * Clips content on words.
+     *
+     * @param string $content   Content to clip
+     * @param int    $freeSpace Free space to keep
+     *
+     * @return array
+     */
+    public function clip($content, $freeSpace = 0)
+    {
+        $lines = array();
+        $maxWidth = $this->maxWidth - $freeSpace;
+
+        foreach (explode("\n", $content) as $text) {
+            $line = '';
+            foreach (explode(' ', $text) as $word) {
+                if (strlen($line.$word) <= $maxWidth) {
+                    $line .= $word.' ';
+                    continue;
+                }
+
+                $lines[] = substr($line, 0, -1);
+                $line = $word.' ';
+            }
+
+            if (!empty($line)) {
+                $lines[] = substr($line, 0, -1);
+            }
+        }
+
+        return $lines;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
new file mode 100644
index 0000000000000..39ac2239783a6
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown\Document;
+
+/**
+ * Document paragraph.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class Paragraph implements BlockInterface
+{
+    /**
+     * @var string
+     */
+    private $content;
+
+    /**
+     * @param $content
+     */
+    public function __construct($content)
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEmpty()
+    {
+        return empty($this->content);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(Formatter $formatter)
+    {
+        return implode("\n", $formatter->clip($this->content));
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
new file mode 100644
index 0000000000000..45818c895c471
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown\Document;
+
+/**
+ * Document paragraph.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class Title implements BlockInterface
+{
+    /**
+     * @var string
+     */
+    private $content;
+
+    /**
+     * @var int
+     */
+    private $level;
+
+    /**
+     * @param string $content
+     * @param int    $level
+     */
+    public function __construct($content, $level = 1)
+    {
+        $this->content = $content;
+        $this->level = $level;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEmpty()
+    {
+        return empty($this->content);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(Formatter $formatter)
+    {
+        if (empty($this->content)) {
+            return '';
+        }
+
+        switch ($this->level) {
+            case 1: return $this->entitle('=');
+            case 2: return $this->entitle('-');
+        }
+
+        $lines = array();
+        foreach ($formatter->clip($this->content, $this->level + 1) as $index => $line) {
+            $lines[] = (0 === $index ? str_repeat('#', $this->level).' ' : str_repeat(' ', $this->level + 1)).$line;
+        }
+
+        return implode("\n", $lines);
+    }
+
+    /**
+     * @param string $char
+     *
+     * @return string
+     */
+    private function entitle($char)
+    {
+        return $this->content."\n".str_repeat($char, strlen($this->content));
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
new file mode 100644
index 0000000000000..0953933adaddf
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown\Document;
+
+/**
+ * Document unordered list.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class UnorderedList implements BlockInterface
+{
+    /**
+     * @var array
+     */
+    private $items;
+
+    /**
+     * @param array $items
+     */
+    public function __construct(array $items = array())
+    {
+        $this->items = $items;
+    }
+
+    /**
+     * @param $item
+     *
+     * @return UnorderedList
+     */
+    public function push($item)
+    {
+        $this->items[] = $item;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isEmpty()
+    {
+        return empty($this->items);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function format(Formatter $formatter)
+    {
+        $content = array();
+        foreach ($this->items as $item) {
+            foreach ($formatter->clip($item, 2) as $index => $line) {
+                $content[] = (0 === $index ? '* ' : '  ').$line;
+            }
+        }
+
+        return implode("\n", $content);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
new file mode 100644
index 0000000000000..cac884376db1e
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown;
+
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputArgumentMarkdownDescriptor extends AbstractMarkdownDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDocument($object)
+    {
+        /** @var InputArgument $object */
+        return new Document\Document(array(
+            new Document\Paragraph('**'.$object->getName().':**'),
+            new Document\UnorderedList(array(
+                'Name: '.($object->getName() ?: '<none>'),
+                'Is required: '.($object->isRequired() ? 'yes' : 'no'),
+                'Is array: '.($object->isArray() ? 'yes' : 'no'),
+                'Description: '.($object->getDescription() ?: '<none>'),
+                'Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`',
+            )),
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputArgument;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
new file mode 100644
index 0000000000000..36b3691ad359b
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown;
+
+use Symfony\Component\Console\Input\InputDefinition;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputDefinitionMarkdownDescriptor extends AbstractMarkdownDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDocument($object)
+    {
+        $document = new Document\Document();
+        $argumentDescriptor = new InputArgumentMarkdownDescriptor();
+        $optionDescriptor = new InputOptionMarkdownDescriptor();
+
+        /** @var InputDefinition $object */
+
+        if (count($object->getArguments()) > 0) {
+            $document->add(new Document\Title('Arguments:', 3));
+            foreach ($object->getArguments() as $argument) {
+                $document->add($argumentDescriptor->getDocument($argument));
+            }
+        }
+
+        if (count($object->getOptions()) > 0) {
+            $document->add(new Document\Title('Options:', 3));
+            foreach ($object->getOptions() as $option) {
+                $document->add($optionDescriptor->getDocument($option));
+            }
+        }
+
+        return $document;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputDefinition;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
new file mode 100644
index 0000000000000..84e2b751638c7
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor\Markdown;
+
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputOptionMarkdownDescriptor extends AbstractMarkdownDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getDocument($object)
+    {
+        /** @var InputOption $object */
+        return new Document\Document(array(
+            new Document\Paragraph('**'.$object->getName().':**'),
+            new Document\UnorderedList(array(
+                'Name: `--'.$object->getName().'`',
+                'Shortcut: '.($object->getShortcut() ? '`-'.$object->getShortcut().'`' : '<none>'),
+                'Accept value: '.($object->acceptValue() ? 'yes' : 'no'),
+                'Is value required: '.($object->isValueRequired() ? 'yes' : 'no'),
+                'Is multiple: '.($object->isArray() ? 'yes' : 'no'),
+                'Description: '.($object->getDescription() ?: '<none>'),
+                'Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`',
+            )),
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputOption;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
new file mode 100644
index 0000000000000..3864547be425f
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Markdown\ApplicationMarkdownDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class ApplicationMarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new ApplicationMarkdownDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getApplications();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
new file mode 100644
index 0000000000000..41e69ba452331
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Markdown\CommandMarkdownDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class CommandMarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new CommandMarkdownDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getCommands();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
new file mode 100644
index 0000000000000..f6b7910f59482
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json\Document;
+
+use Symfony\Component\Console\Descriptor\Markdown\Document\Formatter;
+
+class FormatterTest extends \PHPUnit_Framework_TestCase
+{
+    /** @dataProvider getClipTestData */
+    public function testClip($content, $maxLength, $expectedLines)
+    {
+        $formatter = new Formatter($maxLength);
+        $this->assertEquals($expectedLines, $formatter->clip($content));
+    }
+
+    public function getClipTestData()
+    {
+        $lorem = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit.';
+
+        return array(
+            array('a b c d e', 3, array('a b', 'c d', 'e')),
+            array($lorem, 20, array('Lorem ipsum dolor', 'sit amet,', 'consectetur', 'adipisicing elit.')),
+            array($lorem, 30, array('Lorem ipsum dolor sit amet,', 'consectetur adipisicing elit.')),
+            array($lorem, 60, array($lorem)),
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
new file mode 100644
index 0000000000000..03d4fb4153600
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Markdown\InputArgumentMarkdownDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputArgumentMarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputArgumentMarkdownDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputArguments();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
new file mode 100644
index 0000000000000..28e00c1d5ab9a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Markdown\InputDefinitionMarkdownDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputDefinitionMarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputDefinitionMarkdownDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputDefinitions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
new file mode 100644
index 0000000000000..272782f4d2ff4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Markdown\InputOptionMarkdownDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputOptionMarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputOptionMarkdownDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputOptions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
index 9652584f82e6f..2f3f05ea80ffa 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
@@ -8,7 +8,7 @@ class DescriptorApplication2 extends Application
 {
     public function __construct()
     {
-        parent::__construct();
+        parent::__construct('My Symfony application', 'v1.0');
         $this->add(new DescriptorCommand1());
         $this->add(new DescriptorCommand2());
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
new file mode 100644
index 0000000000000..8a66309fd4fb4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -0,0 +1,45 @@
+UNKNOWN
+=======
+
+* help
+* list
+
+help
+----
+
+* Description: Displays help for a command
+* Usage: `help`
+* Aliases: <none>
+
+The <info>help</info> command displays help for a given command:
+
+  <info>php /usr/bin/phpunit help list</info>
+
+You can also output the help as XML by using the <comment>--xml</comment> option:
+
+  <info>php /usr/bin/phpunit help --xml list</info>
+
+To display the list of available commands, please use the <info>list</info> command.
+
+list
+----
+
+* Description: Lists commands
+* Usage: `list`
+* Aliases: <none>
+
+The <info>list</info> command lists all commands:
+
+  <info>php /usr/bin/phpunit list</info>
+
+You can also display the commands for a specific namespace:
+
+  <info>php /usr/bin/phpunit list test</info>
+
+You can also output the information as XML by using the <comment>--xml</comment> option:
+
+  <info>php /usr/bin/phpunit list --xml</info>
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  <info>php /usr/bin/phpunit list --raw</info>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index b51e723476120..0176a6221140b 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"help","usage":"help","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"list","usage":"list","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["descriptor:command1","descriptor:command1","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
+{"commands":[{"name":"help","usage":"help","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"list","usage":"list","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
new file mode 100644
index 0000000000000..baa59dfcdc867
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -0,0 +1,92 @@
+My Symfony application
+======================
+
+* alias1
+* alias2
+* help
+* list
+
+**descriptor:**
+
+* descriptor:command1
+* descriptor:command2
+
+help
+----
+
+* Description: Displays help for a command
+* Usage: `help`
+* Aliases: <none>
+
+The <info>help</info> command displays help for a given command:
+
+  <info>php /usr/bin/phpunit help list</info>
+
+You can also output the help as XML by using the <comment>--xml</comment> option:
+
+  <info>php /usr/bin/phpunit help --xml list</info>
+
+To display the list of available commands, please use the <info>list</info> command.
+
+list
+----
+
+* Description: Lists commands
+* Usage: `list`
+* Aliases: <none>
+
+The <info>list</info> command lists all commands:
+
+  <info>php /usr/bin/phpunit list</info>
+
+You can also display the commands for a specific namespace:
+
+  <info>php /usr/bin/phpunit list test</info>
+
+You can also output the information as XML by using the <comment>--xml</comment> option:
+
+  <info>php /usr/bin/phpunit list --xml</info>
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  <info>php /usr/bin/phpunit list --raw</info>
+
+descriptor:command1
+-------------------
+
+* Description: command 1 description
+* Usage: `descriptor:command1`
+* Aliases: `alias1`, `alias2`
+
+command 1 help
+
+descriptor:command2
+-------------------
+
+* Description: command 2 description
+* Usage: `descriptor:command2 [-o|--option_name] argument_name`
+* Aliases: <none>
+
+command 2 help
+
+### Arguments:
+
+**argument_name:**
+
+* Name: argument_name
+* Is required: yes
+* Is array: no
+* Description: <none>
+* Default: `NULL`
+
+### Options:
+
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: <none>
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_1.md b/src/Symfony/Component/Console/Tests/Fixtures/command_1.md
new file mode 100644
index 0000000000000..2cef9a2d781ed
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_1.md
@@ -0,0 +1,8 @@
+descriptor:command1
+-------------------
+
+* Description: command 1 description
+* Usage: `descriptor:command1`
+* Aliases: `alias1`, `alias2`
+
+command 1 help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.md b/src/Symfony/Component/Console/Tests/Fixtures/command_2.md
new file mode 100644
index 0000000000000..5257c0d3f2cfc
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.md
@@ -0,0 +1,30 @@
+descriptor:command2
+-------------------
+
+* Description: command 2 description
+* Usage: `descriptor:command2 [-o|--option_name] argument_name`
+* Aliases: <none>
+
+command 2 help
+
+### Arguments:
+
+**argument_name:**
+
+* Name: argument_name
+* Is required: yes
+* Is array: no
+* Description: <none>
+* Default: `NULL`
+
+### Options:
+
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: <none>
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.md b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.md
new file mode 100644
index 0000000000000..88f311ab534b1
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.md
@@ -0,0 +1,7 @@
+**argument_name:**
+
+* Name: argument_name
+* Is required: yes
+* Is array: no
+* Description: <none>
+* Default: `NULL`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.md b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.md
new file mode 100644
index 0000000000000..3cdb00cc81867
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.md
@@ -0,0 +1,7 @@
+**argument_name:**
+
+* Name: argument_name
+* Is required: no
+* Is array: yes
+* Description: argument description
+* Default: `array ()`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.md b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.md
new file mode 100644
index 0000000000000..be1c443ae0dcf
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.md
@@ -0,0 +1,7 @@
+**argument_name:**
+
+* Name: argument_name
+* Is required: no
+* Is array: no
+* Description: argument description
+* Default: `'default_value'`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.md b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.md
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.md b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.md
new file mode 100644
index 0000000000000..923191cdcf9f2
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.md
@@ -0,0 +1,9 @@
+### Arguments:
+
+**argument_name:**
+
+* Name: argument_name
+* Is required: yes
+* Is array: no
+* Description: <none>
+* Default: `NULL`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.md b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.md
new file mode 100644
index 0000000000000..40fd7b0a973cb
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.md
@@ -0,0 +1,11 @@
+### Options:
+
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: <none>
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.md b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.md
new file mode 100644
index 0000000000000..a31feea477cd9
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.md
@@ -0,0 +1,21 @@
+### Arguments:
+
+**argument_name:**
+
+* Name: argument_name
+* Is required: yes
+* Is array: no
+* Description: <none>
+* Default: `NULL`
+
+### Options:
+
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: <none>
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.md b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.md
new file mode 100644
index 0000000000000..6f9e9a7e074c6
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: <none>
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.md b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.md
new file mode 100644
index 0000000000000..634ac0b03c02c
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Description: option description
+* Default: `'default_value'`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.md b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.md
new file mode 100644
index 0000000000000..34282896ba39a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: yes
+* Is value required: yes
+* Is multiple: no
+* Description: option description
+* Default: `NULL`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.md b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.md
new file mode 100644
index 0000000000000..8ffba56e73265
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.md
@@ -0,0 +1,9 @@
+**option_name:**
+
+* Name: `--option_name`
+* Shortcut: `-o`
+* Accept value: yes
+* Is value required: no
+* Is multiple: yes
+* Description: option description
+* Default: `array ()`

From 43b5e5c2f98ae276057910d44111a9ecd038c2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Wed, 3 Apr 2013 07:06:30 +0200
Subject: [PATCH 04/24] [Console] added forgotten headers

---
 .../Console/Command/AbstractDescriptorCommand.php     |  9 +++++++++
 .../Console/Descriptor/ApplicationDescription.php     |  9 +++++++++
 .../Console/Descriptor/DescriptorProvider.php         |  9 +++++++++
 .../Descriptor/Json/AbstractJsonDescriptor.php        |  9 +++++++++
 .../Descriptor/Json/ApplicationJsonDescriptor.php     |  9 +++++++++
 .../Console/Descriptor/Json/CommandJsonDescriptor.php |  9 +++++++++
 .../Descriptor/Json/InputArgumentJsonDescriptor.php   |  9 +++++++++
 .../Descriptor/Json/InputDefinitionJsonDescriptor.php |  9 +++++++++
 .../Descriptor/Json/InputOptionJsonDescriptor.php     |  9 +++++++++
 .../Markdown/AbstractMarkdownDescriptor.php           |  9 +++++++++
 .../Markdown/ApplicationMarkdownDescriptor.php        |  9 +++++++++
 .../Descriptor/Markdown/CommandMarkdownDescriptor.php |  9 +++++++++
 .../Descriptor/Markdown/Document/BlockInterface.php   |  9 +++++++++
 .../Console/Descriptor/Markdown/Document/Document.php |  9 +++++++++
 .../Descriptor/Markdown/Document/Formatter.php        |  9 +++++++++
 .../Descriptor/Markdown/Document/Paragraph.php        |  9 +++++++++
 .../Console/Descriptor/Markdown/Document/Title.php    |  9 +++++++++
 .../Descriptor/Markdown/Document/UnorderedList.php    |  9 +++++++++
 .../Markdown/InputArgumentMarkdownDescriptor.php      |  9 +++++++++
 .../Markdown/InputDefinitionMarkdownDescriptor.php    |  9 +++++++++
 .../Markdown/InputOptionMarkdownDescriptor.php        |  9 +++++++++
 .../Component/Console/Helper/DescriptorHelper.php     |  9 +++++++++
 .../Tests/Descriptor/AbstractDescriptorTest.php       |  9 +++++++++
 .../Descriptor/Json/ApplicationJsonDescriptorTest.php |  9 +++++++++
 .../Descriptor/Json/CommandJsonDescriptorTest.php     |  9 +++++++++
 .../Json/InputArgumentJsonDescriptorTest.php          |  9 +++++++++
 .../Json/InputDefinitionJsonDescriptorTest.php        |  9 +++++++++
 .../Descriptor/Json/InputOptionJsonDescriptorTest.php |  9 +++++++++
 .../Markdown/ApplicationMarkdownDescriptorTest.php    |  9 +++++++++
 .../Markdown/CommandMarkdownDescriptorTest.php        |  9 +++++++++
 .../Descriptor/Markdown/Document/FormatterTest.php    | 11 ++++++++++-
 .../Markdown/InputArgumentMarkdownDescriptorTest.php  |  9 +++++++++
 .../InputDefinitionMarkdownDescriptorTest.php         |  9 +++++++++
 .../Markdown/InputOptionMarkdownDescriptorTest.php    |  9 +++++++++
 .../Console/Tests/Descriptor/ObjectsProvider.php      |  9 +++++++++
 .../Console/Tests/Fixtures/DescriptorApplication1.php |  9 +++++++++
 .../Console/Tests/Fixtures/DescriptorApplication2.php |  9 +++++++++
 .../Console/Tests/Fixtures/DescriptorCommand1.php     |  9 +++++++++
 .../Console/Tests/Fixtures/DescriptorCommand2.php     |  9 +++++++++
 39 files changed, 352 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
index 3564b84e02d33..c3ccdf6e3bc78 100644
--- a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Command;
 
 use Symfony\Component\Console\Descriptor\DescriptorProvider;
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index be5d9a4a5537d..775be0fbbc9bc 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index f0cce3a3d696b..ca8b835ac51b6 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Descriptor\Json;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
index a37f079707645..39603108086a2 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
index 6d2fe49ffeb3d..356b4ed71e3d4 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
index 6731945d19ae1..d4bd698180a3b 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
index f786cf7ea8029..fe9b9ca63fb71 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
index 4eca287b09f6e..4755b0980bc53 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
index 83893da151cd5..329c813d48b6b 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
index c4c1f5470d881..2c00b30067ee4 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
index af22d5f0fa10a..64b61a4488459 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
index 48688e3f122d9..4e8a509ccf9a0 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
index d4f3845e447b0..ce39fac8a43d8 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown\Document;
 
 /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
index 67ac4c63f1746..6cf2ef7e77cc4 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown\Document;
 
 /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
index 7cbff31516744..2669a0353939c 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown\Document;
 
 /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
index 39ac2239783a6..4fe3beeb360b0 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown\Document;
 
 /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
index 45818c895c471..45cfc3d14092b 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown\Document;
 
 /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
index 0953933adaddf..a228ed6185728 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown\Document;
 
 /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
index cac884376db1e..f3f2917874427 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
index 36b3691ad359b..fe57f9c000f13 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Input\InputDefinition;
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
index 84e2b751638c7..411c3e84e032f 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index b3d1e93937cf1..e8fc7926fdee5 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Helper;
 
 use Symfony\Component\Console\Descriptor\DescriptorProvider;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index 870d2408483b6..45769a429b9ff 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
index 948867cba3285..fc23056c8efb8 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Json\ApplicationJsonDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
index d73eb15e38484..5ad11e3209fae 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Json\CommandJsonDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
index 84926c5c6c4a7..7c44b844d2a7e 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Json\InputArgumentJsonDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
index 7dd204ff6107c..24b93ebcdba4e 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Json\InputDefinitionJsonDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
index 256a8e84195ac..d23ffc85e0534 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Json\InputOptionJsonDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
index 3864547be425f..d2a0144293d69 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Markdown\ApplicationMarkdownDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
index 41e69ba452331..e535df50e0d99 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Markdown\CommandMarkdownDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
index f6b7910f59482..d2bd8a69f2206 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json\Document;
 
 use Symfony\Component\Console\Descriptor\Markdown\Document\Formatter;
@@ -24,4 +33,4 @@ public function getClipTestData()
             array($lorem, 60, array($lorem)),
         );
     }
-}
\ No newline at end of file
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
index 03d4fb4153600..7e762f7807b5f 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Markdown\InputArgumentMarkdownDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
index 28e00c1d5ab9a..0faa4f56fd32a 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Markdown\InputDefinitionMarkdownDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
index 272782f4d2ff4..216496c1a5a13 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor\Json;
 
 use Symfony\Component\Console\Descriptor\Markdown\InputOptionMarkdownDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
index ee65da14c63fe..a36732174691a 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ObjectsProvider.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php
index 6969b5806e567..132b6d57ddaa2 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication1.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Fixtures;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
index 2f3f05ea80ffa..ff5513580041b 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorApplication2.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Fixtures;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
index 380a7229f9cf0..ede05d7a73c0f 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand1.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Fixtures;
 
 use Symfony\Component\Console\Command\Command;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
index f4c87c2cd4437..bc04ca9141272 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
+++ b/src/Symfony/Component/Console/Tests/Fixtures/DescriptorCommand2.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Fixtures;
 
 use Symfony\Component\Console\Command\Command;

From acc74140aa0366abbce18d0ebf231c6337a6357e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Wed, 3 Apr 2013 07:24:31 +0200
Subject: [PATCH 05/24] [Console] removed unused methods (tests broken)

---
 src/Symfony/Component/Console/Application.php | 104 --------------
 .../Command/AbstractDescriptorCommand.php     |  25 ++--
 .../Component/Console/Command/Command.php     |  74 ----------
 .../Component/Console/Command/HelpCommand.php |   5 +
 .../Component/Console/Command/ListCommand.php |   4 +
 .../Console/Input/InputDefinition.php         | 133 ------------------
 .../Console/Tests/ApplicationTest.php         |  18 ---
 .../Console/Tests/Command/CommandTest.php     |  18 ---
 .../Tests/Fixtures/application_astext1.txt    |  20 ---
 .../Tests/Fixtures/application_astext2.txt    |  16 ---
 .../Tests/Fixtures/application_asxml1.txt     | 128 -----------------
 .../Tests/Fixtures/application_asxml2.txt     |  37 -----
 .../Console/Tests/Fixtures/command_astext.txt |  18 ---
 .../Console/Tests/Fixtures/command_asxml.txt  |  38 -----
 .../Tests/Fixtures/definition_astext.txt      |  11 --
 .../Tests/Fixtures/definition_asxml.txt       |  39 -----
 .../Tests/Input/InputDefinitionTest.php       |  28 ----
 17 files changed, 22 insertions(+), 694 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 4aec01637f883..245bf254878a7 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -680,110 +680,6 @@ public static function getAbbreviations($names)
         return $abbrevs;
     }
 
-    /**
-     * Returns a text representation of the Application.
-     *
-     * @param string  $namespace An optional namespace name
-     * @param boolean $raw       Whether to return raw command list
-     *
-     * @return string A string representing the Application
-     */
-    public function asText($namespace = null, $raw = false)
-    {
-        $commands = $namespace ? $this->all($this->findNamespace($namespace)) : $this->commands;
-
-        $width = 0;
-        foreach ($commands as $command) {
-            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
-        }
-        $width += 2;
-
-        if ($raw) {
-            $messages = array();
-            foreach ($this->sortCommands($commands) as $space => $commands) {
-                foreach ($commands as $name => $command) {
-                    $messages[] = sprintf("%-${width}s %s", $name, $command->getDescription());
-                }
-            }
-
-            return implode(PHP_EOL, $messages);
-        }
-
-        $messages = array($this->getHelp(), '');
-        if ($namespace) {
-            $messages[] = sprintf("<comment>Available commands for the \"%s\" namespace:</comment>", $namespace);
-        } else {
-            $messages[] = '<comment>Available commands:</comment>';
-        }
-
-        // add commands by namespace
-        foreach ($this->sortCommands($commands) as $space => $commands) {
-            if (!$namespace && '_global' !== $space) {
-                $messages[] = '<comment>'.$space.'</comment>';
-            }
-
-            foreach ($commands as $name => $command) {
-                $messages[] = sprintf("  <info>%-${width}s</info> %s", $name, $command->getDescription());
-            }
-        }
-
-        return implode(PHP_EOL, $messages);
-    }
-
-    /**
-     * Returns an XML representation of the Application.
-     *
-     * @param string  $namespace An optional namespace name
-     * @param Boolean $asDom     Whether to return a DOM or an XML string
-     *
-     * @return string|DOMDocument An XML string representing the Application
-     */
-    public function asXml($namespace = null, $asDom = false)
-    {
-        $commands = $namespace ? $this->all($this->findNamespace($namespace)) : $this->commands;
-
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($xml = $dom->createElement('symfony'));
-
-        $xml->appendChild($commandsXML = $dom->createElement('commands'));
-
-        if ($namespace) {
-            $commandsXML->setAttribute('namespace', $namespace);
-        } else {
-            $namespacesXML = $dom->createElement('namespaces');
-            $xml->appendChild($namespacesXML);
-        }
-
-        // add commands by namespace
-        foreach ($this->sortCommands($commands) as $space => $commands) {
-            if (!$namespace) {
-                $namespaceArrayXML = $dom->createElement('namespace');
-                $namespacesXML->appendChild($namespaceArrayXML);
-                $namespaceArrayXML->setAttribute('id', $space);
-            }
-
-            foreach ($commands as $name => $command) {
-                if ($name !== $command->getName()) {
-                    continue;
-                }
-
-                if (!$namespace) {
-                    $commandXML = $dom->createElement('command');
-                    $namespaceArrayXML->appendChild($commandXML);
-                    $commandXML->appendChild($dom->createTextNode($name));
-                }
-
-                $node = $command->asXml(true)->getElementsByTagName('command')->item(0);
-                $node = $dom->importNode($node, true);
-
-                $commandsXML->appendChild($node);
-            }
-        }
-
-        return $asDom ? $dom : $dom->saveXml();
-    }
-
     /**
      * Renders a caught exception.
      *
diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
index c3ccdf6e3bc78..d75a56e10ab5c 100644
--- a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
@@ -1,20 +1,13 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 namespace Symfony\Component\Console\Command;
 
 use Symfony\Component\Console\Descriptor\DescriptorProvider;
 use Symfony\Component\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Base class for descriptor commands.
@@ -33,10 +26,7 @@ abstract class AbstractDescriptorCommand extends Command
      */
     protected function configure()
     {
-        $descriptorProvider = new DescriptorProvider();
-        $this->supportedFormats = $descriptorProvider->getSupportedFormats();
         $this->setDefinition($this->createDefinition());
-        $this->getHelperSet()->set(new DescriptorHelper($descriptorProvider));
     }
 
     /**
@@ -51,4 +41,15 @@ protected function createDefinition()
             new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
         ));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $descriptorProvider = new DescriptorProvider();
+        $this->supportedFormats = $descriptorProvider->getSupportedFormats();
+        $this->setDefinition($this->createDefinition());
+        $this->getHelperSet()->set(new DescriptorHelper($descriptorProvider));
+    }
 }
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index f475ad53632ab..870a65b548aff 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -555,80 +555,6 @@ public function getHelper($name)
         return $this->helperSet->get($name);
     }
 
-    /**
-     * Returns a text representation of the command.
-     *
-     * @return string A string representing the command
-     */
-    public function asText()
-    {
-        if ($this->application && !$this->applicationDefinitionMerged) {
-            $this->getSynopsis();
-            $this->mergeApplicationDefinition(false);
-        }
-
-        $messages = array(
-            '<comment>Usage:</comment>',
-            ' '.$this->getSynopsis(),
-            '',
-        );
-
-        if ($this->getAliases()) {
-            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $this->getAliases()).'</info>';
-        }
-
-        $messages[] = $this->getNativeDefinition()->asText();
-
-        if ($help = $this->getProcessedHelp()) {
-            $messages[] = '<comment>Help:</comment>';
-            $messages[] = ' '.str_replace("\n", "\n ", $help)."\n";
-        }
-
-        return implode("\n", $messages);
-    }
-
-    /**
-     * Returns an XML representation of the command.
-     *
-     * @param Boolean $asDom Whether to return a DOM or an XML string
-     *
-     * @return string|DOMDocument An XML string representing the command
-     */
-    public function asXml($asDom = false)
-    {
-        if ($this->application && !$this->applicationDefinitionMerged) {
-            $this->getSynopsis();
-            $this->mergeApplicationDefinition(false);
-        }
-
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($commandXML = $dom->createElement('command'));
-        $commandXML->setAttribute('id', $this->name);
-        $commandXML->setAttribute('name', $this->name);
-
-        $commandXML->appendChild($usageXML = $dom->createElement('usage'));
-        $usageXML->appendChild($dom->createTextNode(sprintf($this->getSynopsis(), '')));
-
-        $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $this->getDescription())));
-
-        $commandXML->appendChild($helpXML = $dom->createElement('help'));
-        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $this->getProcessedHelp())));
-
-        $commandXML->appendChild($aliasesXML = $dom->createElement('aliases'));
-        foreach ($this->getAliases() as $alias) {
-            $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
-            $aliasXML->appendChild($dom->createTextNode($alias));
-        }
-
-        $definition = $this->getNativeDefinition()->asXml(true);
-        $commandXML->appendChild($dom->importNode($definition->getElementsByTagName('arguments')->item(0), true));
-        $commandXML->appendChild($dom->importNode($definition->getElementsByTagName('options')->item(0), true));
-
-        return $asDom ? $dom : $dom->saveXml();
-    }
-
     private function validateName($name)
     {
         if (!preg_match('/^[^\:]+(\:[^\:]+)*$/', $name)) {
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index b467e710bc028..748ed293180a7 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -30,6 +30,8 @@ class HelpCommand extends AbstractDescriptorCommand
      */
     protected function configure()
     {
+        parent::configure();
+
         $this->ignoreValidationErrors();
 
         $this
@@ -66,6 +68,7 @@ public function setCommand(Command $command)
     protected function createDefinition()
     {
         $definition = parent::createDefinition();
+        
         $definition->addArgument(new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'));
 
         return $definition;
@@ -76,6 +79,8 @@ protected function createDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        parent::execute($input, $output);
+
         if (null === $this->command) {
             $this->command = $this->getApplication()->find($input->getArgument('command_name'));
         }
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index e4c2f6025a63f..4b3bff7ce096e 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -28,6 +28,8 @@ class ListCommand extends AbstractDescriptorCommand
      */
     protected function configure()
     {
+        parent::configure();
+
         $this
             ->setName('list')
             ->setDescription('Lists commands')
@@ -76,6 +78,8 @@ protected function getNativeDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        parent::execute($input, $output);
+
         $this->getHelper('descriptor')->describe($output, $this->getApplication(), $input->getArgument('format'), $input->getOption('raw'));
     }
 }
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index 69d2f1efe125b..4c5dcf3b574dd 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -399,137 +399,4 @@ public function getSynopsis()
 
         return implode(' ', $elements);
     }
-
-    /**
-     * Returns a textual representation of the InputDefinition.
-     *
-     * @return string A string representing the InputDefinition
-     */
-    public function asText()
-    {
-        // find the largest option or argument name
-        $max = 0;
-        foreach ($this->getOptions() as $option) {
-            $nameLength = strlen($option->getName()) + 2;
-            if ($option->getShortcut()) {
-                $nameLength += strlen($option->getShortcut()) + 3;
-            }
-
-            $max = max($max, $nameLength);
-        }
-        foreach ($this->getArguments() as $argument) {
-            $max = max($max, strlen($argument->getName()));
-        }
-        ++$max;
-
-        $text = array();
-
-        if ($this->getArguments()) {
-            $text[] = '<comment>Arguments:</comment>';
-            foreach ($this->getArguments() as $argument) {
-                if (null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault()))) {
-                    $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($argument->getDefault()));
-                } else {
-                    $default = '';
-                }
-
-                $description = str_replace("\n", "\n".str_repeat(' ', $max + 2), $argument->getDescription());
-
-                $text[] = sprintf(" <info>%-${max}s</info> %s%s", $argument->getName(), $description, $default);
-            }
-
-            $text[] = '';
-        }
-
-        if ($this->getOptions()) {
-            $text[] = '<comment>Options:</comment>';
-
-            foreach ($this->getOptions() as $option) {
-                if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) {
-                    $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($option->getDefault()));
-                } else {
-                    $default = '';
-                }
-
-                $multiple = $option->isArray() ? '<comment> (multiple values allowed)</comment>' : '';
-                $description = str_replace("\n", "\n".str_repeat(' ', $max + 2), $option->getDescription());
-
-                $optionMax = $max - strlen($option->getName()) - 2;
-                $text[] = sprintf(" <info>%s</info> %-${optionMax}s%s%s%s",
-                    '--'.$option->getName(),
-                    $option->getShortcut() ? sprintf('(-%s) ', $option->getShortcut()) : '',
-                    $description,
-                    $default,
-                    $multiple
-                );
-            }
-
-            $text[] = '';
-        }
-
-        return implode("\n", $text);
-    }
-
-    /**
-     * Returns an XML representation of the InputDefinition.
-     *
-     * @param Boolean $asDom Whether to return a DOM or an XML string
-     *
-     * @return string|DOMDocument An XML string representing the InputDefinition
-     */
-    public function asXml($asDom = false)
-    {
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($definitionXML = $dom->createElement('definition'));
-
-        $definitionXML->appendChild($argumentsXML = $dom->createElement('arguments'));
-        foreach ($this->getArguments() as $argument) {
-            $argumentsXML->appendChild($argumentXML = $dom->createElement('argument'));
-            $argumentXML->setAttribute('name', $argument->getName());
-            $argumentXML->setAttribute('is_required', $argument->isRequired() ? 1 : 0);
-            $argumentXML->setAttribute('is_array', $argument->isArray() ? 1 : 0);
-            $argumentXML->appendChild($descriptionXML = $dom->createElement('description'));
-            $descriptionXML->appendChild($dom->createTextNode($argument->getDescription()));
-
-            $argumentXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-            $defaults = is_array($argument->getDefault()) ? $argument->getDefault() : (is_bool($argument->getDefault()) ? array(var_export($argument->getDefault(), true)) : ($argument->getDefault() ? array($argument->getDefault()) : array()));
-            foreach ($defaults as $default) {
-                $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-                $defaultXML->appendChild($dom->createTextNode($default));
-            }
-        }
-
-        $definitionXML->appendChild($optionsXML = $dom->createElement('options'));
-        foreach ($this->getOptions() as $option) {
-            $optionsXML->appendChild($optionXML = $dom->createElement('option'));
-            $optionXML->setAttribute('name', '--'.$option->getName());
-            $optionXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
-            $optionXML->setAttribute('accept_value', $option->acceptValue() ? 1 : 0);
-            $optionXML->setAttribute('is_value_required', $option->isValueRequired() ? 1 : 0);
-            $optionXML->setAttribute('is_multiple', $option->isArray() ? 1 : 0);
-            $optionXML->appendChild($descriptionXML = $dom->createElement('description'));
-            $descriptionXML->appendChild($dom->createTextNode($option->getDescription()));
-
-            if ($option->acceptValue()) {
-                $optionXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-                $defaults = is_array($option->getDefault()) ? $option->getDefault() : (is_bool($option->getDefault()) ? array(var_export($option->getDefault(), true)) : ($option->getDefault() ? array($option->getDefault()) : array()));
-                foreach ($defaults as $default) {
-                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-                    $defaultXML->appendChild($dom->createTextNode($default));
-                }
-            }
-        }
-
-        return $asDom ? $dom : $dom->saveXml();
-    }
-
-    private function formatDefaultValue($default)
-    {
-        if (version_compare(PHP_VERSION, '5.4', '<')) {
-            return str_replace('\/', '/', json_encode($default));
-        }
-
-        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-    }
 }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index f2614bfa37e26..783d364dc1d1a 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -392,24 +392,6 @@ public function testSetCatchExceptions()
         }
     }
 
-    public function testAsText()
-    {
-        $application = new Application();
-        $application->add(new \FooCommand);
-        $this->ensureStaticCommandHelp($application);
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_astext1.txt', $this->normalizeLineBreaks($application->asText()), '->asText() returns a text representation of the application');
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_astext2.txt', $this->normalizeLineBreaks($application->asText('foo')), '->asText() returns a text representation of the application');
-    }
-
-    public function testAsXml()
-    {
-        $application = new Application();
-        $application->add(new \FooCommand);
-        $this->ensureStaticCommandHelp($application);
-        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/application_asxml1.txt', $application->asXml(), '->asXml() returns an XML representation of the application');
-        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/application_asxml2.txt', $application->asXml('foo'), '->asXml() returns an XML representation of the application');
-    }
-
     public function testRenderException()
     {
         $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index acbe2ea10ce38..3aa990f9be083 100644
--- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -280,22 +280,4 @@ public function callableMethodCommand(InputInterface $input, OutputInterface $ou
     {
         $output->writeln('from the code...');
     }
-
-    public function testAsText()
-    {
-        $command = new \TestCommand();
-        $command->setApplication(new Application());
-        $tester = new CommandTester($command);
-        $tester->execute(array('command' => $command->getName()));
-        $this->assertStringEqualsFile(self::$fixturesPath.'/command_astext.txt', $command->asText(), '->asText() returns a text representation of the command');
-    }
-
-    public function testAsXml()
-    {
-        $command = new \TestCommand();
-        $command->setApplication(new Application());
-        $tester = new CommandTester($command);
-        $tester->execute(array('command' => $command->getName()));
-        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/command_asxml.txt', $command->asXml(), '->asXml() returns an XML representation of the command');
-    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
deleted file mode 100644
index 2f692c07e0a8f..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-<info>Console Tool</info>
-
-<comment>Usage:</comment>
-  [options] command [arguments]
-
-<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>--version</info>        <info>-V</info> Display this application version.
-  <info>--ansi</info>              Force ANSI output.
-  <info>--no-ansi</info>           Disable ANSI output.
-  <info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.
-
-<comment>Available commands:</comment>
-  <info>afoobar  </info> The foo:bar command
-  <info>help     </info> Displays help for a command
-  <info>list     </info> Lists commands
-<comment>foo</comment>
-  <info>foo:bar  </info> The foo:bar command
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
deleted file mode 100644
index 1457bf793d6c1..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-<info>Console Tool</info>
-
-<comment>Usage:</comment>
-  [options] command [arguments]
-
-<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>--version</info>        <info>-V</info> Display this application version.
-  <info>--ansi</info>              Force ANSI output.
-  <info>--no-ansi</info>           Disable ANSI output.
-  <info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.
-
-<comment>Available commands for the "foo" namespace:</comment>
-  <info>foo:bar  </info> The foo:bar command
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
deleted file mode 100644
index ed168f25cbcda..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<symfony>
-  <commands>
-    <command id="help" name="help">
-  <usage>help [--xml] [command_name]</usage>
-  <description>Displays help for a command</description>
-  <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
- 
-   &lt;info&gt;php app/console help list&lt;/info&gt;
- 
- You can also output the help as XML by using the &lt;comment&gt;--xml&lt;/comment&gt; option:
- 
-   &lt;info&gt;php app/console help --xml list&lt;/info&gt;
- 
- To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
-  <aliases />
-  <arguments>
-    <argument name="command_name" is_required="0" is_array="0">
-      <description>The command name</description>
-      <defaults>
-        <default>help</default>
-      </defaults>
-    </argument>
-  </arguments>
-  <options>
-    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output help as XML</description>
-    </option>
-    <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Display this help message.</description>
-    </option>
-    <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>
-    <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Display this application version.</description>
-    </option>
-    <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Force ANSI output.</description>
-    </option>
-    <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Disable ANSI output.</description>
-    </option>
-    <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Do not ask any interactive question.</description>
-    </option>
-  </options>
-</command>
-    <command id="list" name="list">
-  <usage>list [--xml] [--raw] [namespace]</usage>
-  <description>Lists commands</description>
-  <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
- 
-   &lt;info&gt;php app/console list&lt;/info&gt;
- 
- You can also display the commands for a specific namespace:
- 
-   &lt;info&gt;php app/console list test&lt;/info&gt;
- 
- You can also output the information as XML by using the &lt;comment&gt;--xml&lt;/comment&gt; option:
- 
-   &lt;info&gt;php app/console list --xml&lt;/info&gt;
- 
- It's also possible to get raw list of commands (useful for embedding command runner):
- 
-   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
-  <aliases/>
-  <arguments>
-    <argument name="namespace" is_required="0" is_array="0">
-      <description>The namespace name</description>
-      <defaults/>
-    </argument>
-  </arguments>
-  <options>
-    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output help as XML</description>
-    </option>
-    <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output raw command list</description>
-    </option>
-  </options>
-</command>
-    <command id="foo:bar" name="foo:bar">
-  <usage>foo:bar</usage>
-  <description>The foo:bar command</description>
-  <help/>
-  <aliases>
-    <alias>afoobar</alias>
-  </aliases>
-  <arguments/>
-    <options>
-      <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this help message.</description>
-      </option>
-      <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>
-      <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this application version.</description>
-      </option>
-      <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Force ANSI output.</description>
-      </option>
-      <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Disable ANSI output.</description>
-      </option>
-      <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Do not ask any interactive question.</description>
-      </option>
-    </options>
-</command>
-  </commands>
-  <namespaces>
-    <namespace id="_global">
-      <command>help</command>
-      <command>list</command>
-    </namespace>
-    <namespace id="foo">
-      <command>foo:bar</command>
-    </namespace>
-  </namespaces>
-</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
deleted file mode 100644
index ef92f85cbfe07..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<symfony>
-  <commands namespace="foo">
-    <command id="foo:bar" name="foo:bar">
-  <usage>foo:bar</usage>
-  <description>The foo:bar command</description>
-  <help/>
-  <aliases>
-    <alias>afoobar</alias>
-  </aliases>
-  <arguments/>
-    <options>
-      <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this help message.</description>
-      </option>
-      <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>
-      <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this application version.</description>
-      </option>
-      <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Force ANSI output.</description>
-      </option>
-      <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Disable ANSI output.</description>
-      </option>
-      <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Do not ask any interactive question.</description>
-      </option>
-    </options>
-</command>
-  </commands>
-</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
deleted file mode 100644
index e5999030e3679..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-<comment>Usage:</comment>
- namespace:name
-
-<comment>Aliases:</comment> <info>name</info>
-<comment>Arguments:</comment>
- <info>command              </info> The command to execute
-
-<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>--version</info> (-V)        Display this application version.
- <info>--ansi</info>                Force ANSI output.
- <info>--no-ansi</info>             Disable ANSI output.
- <info>--no-interaction</info> (-n) Do not ask any interactive question.
-
-<comment>Help:</comment>
- help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
deleted file mode 100644
index 806c5a567089a..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<command id="namespace:name" name="namespace:name">
-  <usage>namespace:name</usage>
-  <description>description</description>
-  <help>help</help>
-  <aliases>
-    <alias>name</alias>
-  </aliases>
-  <arguments>
-    <argument name="command" is_required="1" is_array="0">
-      <description>The command to execute</description>
-      <defaults/>
-    </argument>
-  </arguments>
-  <options>
-    <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Display this help message.</description>
-    </option>
-    <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>
-    <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Display this application version.</description>
-    </option>
-    <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Force ANSI output.</description>
-    </option>
-    <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Disable ANSI output.</description>
-    </option>
-    <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Do not ask any interactive question.</description>
-    </option>
-  </options>
-</command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt b/src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt
deleted file mode 100644
index a7d7e0d5134ec..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-<comment>Arguments:</comment>
- <info>foo       </info> The foo argument
- <info>baz       </info> The baz argument<comment> (default: true)</comment>
- <info>bar       </info> The bar argument<comment> (default: ["http://foo.com/"])</comment>
-
-<comment>Options:</comment>
- <info>--foo</info> (-f) The foo option
- <info>--baz</info>      The baz option<comment> (default: false)</comment>
- <info>--bar</info> (-b) The bar option<comment> (default: "bar")</comment>
- <info>--qux</info>      The qux option<comment> (default: ["http://foo.com/","bar"])</comment><comment> (multiple values allowed)</comment>
- <info>--qux2</info>     The qux2 option<comment> (default: {"foo":"bar"})</comment><comment> (multiple values allowed)</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt b/src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt
deleted file mode 100644
index eec8c079ee3ee..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definition>
-  <arguments>
-    <argument name="foo" is_required="0" is_array="0">
-      <description>The foo argument</description>
-      <defaults/>
-    </argument>
-    <argument name="baz" is_required="0" is_array="0">
-      <description>The baz argument</description>
-      <defaults>
-        <default>true</default>
-      </defaults>
-    </argument>
-    <argument name="bar" is_required="0" is_array="1">
-      <description>The bar argument</description>
-      <defaults>
-        <default>bar</default>
-      </defaults>
-    </argument>
-  </arguments>
-  <options>
-    <option name="--foo" shortcut="-f" accept_value="1" is_value_required="1" is_multiple="0">
-      <description>The foo option</description>
-      <defaults/>
-    </option>
-    <option name="--baz" shortcut="" accept_value="1" is_value_required="0" is_multiple="0">
-      <description>The baz option</description>
-      <defaults>
-        <default>false</default>
-      </defaults>
-    </option>
-    <option name="--bar" shortcut="-b" accept_value="1" is_value_required="0" is_multiple="0">
-      <description>The bar option</description>
-      <defaults>
-        <default>bar</default>
-      </defaults>
-    </option>
-  </options>
-</definition>
diff --git a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
index 76316bd863f68..dd4a57ba847c8 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
@@ -364,34 +364,6 @@ public function testGetSynopsis()
         $this->assertEquals('foo1 ... [fooN]', $definition->getSynopsis(), '->getSynopsis() returns a synopsis of arguments and options');
     }
 
-    public function testAsText()
-    {
-        $definition = new InputDefinition(array(
-            new InputArgument('foo', InputArgument::OPTIONAL, 'The foo argument'),
-            new InputArgument('baz', InputArgument::OPTIONAL, 'The baz argument', true),
-            new InputArgument('bar', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'The bar argument', array('http://foo.com/')),
-            new InputOption('foo', 'f', InputOption::VALUE_REQUIRED, 'The foo option'),
-            new InputOption('baz', null, InputOption::VALUE_OPTIONAL, 'The baz option', false),
-            new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL, 'The bar option', 'bar'),
-            new InputOption('qux', '', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The qux option', array('http://foo.com/', 'bar')),
-            new InputOption('qux2', '', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The qux2 option', array('foo' => 'bar')),
-        ));
-        $this->assertStringEqualsFile(self::$fixtures.'/definition_astext.txt', $definition->asText(), '->asText() returns a textual representation of the InputDefinition');
-    }
-
-    public function testAsXml()
-    {
-        $definition = new InputDefinition(array(
-            new InputArgument('foo', InputArgument::OPTIONAL, 'The foo argument'),
-            new InputArgument('baz', InputArgument::OPTIONAL, 'The baz argument', true),
-            new InputArgument('bar', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'The bar argument', array('bar')),
-            new InputOption('foo', 'f', InputOption::VALUE_REQUIRED, 'The foo option'),
-            new InputOption('baz', null, InputOption::VALUE_OPTIONAL, 'The baz option', false),
-            new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL, 'The bar option', 'bar'),
-        ));
-        $this->assertXmlStringEqualsXmlFile(self::$fixtures.'/definition_asxml.txt', $definition->asXml(), '->asText() returns a textual representation of the InputDefinition');
-    }
-
     protected function initializeArguments()
     {
         $this->foo = new InputArgument('foo');

From 774794c6ae08a86ef6af19bb35220d5245517349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Wed, 3 Apr 2013 16:39:53 +0200
Subject: [PATCH 06/24] [Console] fixed tests

---
 .../Command/AbstractDescriptorCommand.php     | 12 ++--
 .../Component/Console/Command/HelpCommand.php |  4 +-
 .../Component/Console/Command/ListCommand.php |  2 +-
 .../Console/Descriptor/DescriptorProvider.php | 13 +++-
 .../Console/Tests/Command/HelpCommandTest.php | 16 ++---
 .../Console/Tests/Command/ListCommandTest.php |  3 +-
 .../Console/Tests/Fixtures/application_1.json |  2 +-
 .../Console/Tests/Fixtures/application_1.md   | 68 ++++++++++++++++++-
 .../Console/Tests/Fixtures/application_2.json |  2 +-
 .../Console/Tests/Fixtures/application_2.md   | 68 ++++++++++++++++++-
 .../Fixtures/application_renderexception2.txt |  2 +-
 11 files changed, 160 insertions(+), 32 deletions(-)

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
index d75a56e10ab5c..2df8133d630c2 100644
--- a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
@@ -17,15 +17,16 @@
 abstract class AbstractDescriptorCommand extends Command
 {
     /**
-     * @var array
+     * @var DescriptorProvider
      */
-    private $supportedFormats;
+    private $provider;
 
     /**
      * {@inheritdoc}
      */
     protected function configure()
     {
+        $this->provider = new DescriptorProvider();
         $this->setDefinition($this->createDefinition());
     }
 
@@ -37,7 +38,7 @@ protected function configure()
     protected function createDefinition()
     {
         return new InputDefinition(array(
-            new InputOption('format', null, InputOption::VALUE_OPTIONAL, 'Output format ('.implode(', ', $this->supportedFormats).')'),
+            new InputOption('format', null, InputOption::VALUE_OPTIONAL, 'Output format ('.implode(', ', $this->provider->getSupportedFormats()).')'),
             new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
         ));
     }
@@ -47,9 +48,6 @@ protected function createDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $descriptorProvider = new DescriptorProvider();
-        $this->supportedFormats = $descriptorProvider->getSupportedFormats();
-        $this->setDefinition($this->createDefinition());
-        $this->getHelperSet()->set(new DescriptorHelper($descriptorProvider));
+        $this->getHelperSet()->set(new DescriptorHelper($this->provider));
     }
 }
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 748ed293180a7..94a70721cc74d 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -31,7 +31,6 @@ class HelpCommand extends AbstractDescriptorCommand
     protected function configure()
     {
         parent::configure();
-
         $this->ignoreValidationErrors();
 
         $this
@@ -68,7 +67,6 @@ public function setCommand(Command $command)
     protected function createDefinition()
     {
         $definition = parent::createDefinition();
-        
         $definition->addArgument(new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'));
 
         return $definition;
@@ -85,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->command = $this->getApplication()->find($input->getArgument('command_name'));
         }
 
-        $this->getHelper('descriptor')->describe($output, $this->command, $input->getArgument('format'), $input->getOption('raw'));
+        $this->getHelper('descriptor')->describe($output, $this->command, $input->getOption('format'), $input->getOption('raw'));
 
         $this->command = null;
     }
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 4b3bff7ce096e..8b75dd05ae289 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -80,6 +80,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         parent::execute($input, $output);
 
-        $this->getHelper('descriptor')->describe($output, $this->getApplication(), $input->getArgument('format'), $input->getOption('raw'));
+        $this->getHelper('descriptor')->describe($output, $this->getApplication(), $input->getOption('format'), $input->getOption('raw'));
     }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index ca8b835ac51b6..73d2228ea1ed9 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -28,8 +28,9 @@ class DescriptorProvider
      */
     private $options = array(
         'default_format' => 'txt',
-        'json_encoding'  => 0,
         'namespace'      => null,
+        'json_encoding'  => 0,
+        'markdown_width' => 120,
     );
 
     /**
@@ -46,6 +47,11 @@ public function __construct(array $options = array())
             ->add(new Json\InputDefinitionJsonDescriptor())
             ->add(new Json\InputArgumentJsonDescriptor())
             ->add(new Json\InputOptionJsonDescriptor())
+            ->add(new Markdown\ApplicationMarkdownDescriptor())
+            ->add(new Markdown\CommandMarkdownDescriptor())
+            ->add(new Markdown\InputDefinitionMarkdownDescriptor())
+            ->add(new Markdown\InputArgumentMarkdownDescriptor())
+            ->add(new Markdown\InputOptionMarkdownDescriptor())
         ;
     }
 
@@ -125,6 +131,9 @@ public function getSupportedFormats()
             $supportedFormats[] = $descriptor->getFormat();
         }
 
-        return array_unique($supportedFormats);
+        $supportedFormats = array_unique($supportedFormats);
+        sort($supportedFormats);
+
+        return $supportedFormats;
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
index f9b72e6ae385e..c55c4ca03dbd0 100644
--- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -24,8 +24,7 @@ public function testExecuteForCommandAlias()
         $command->setApplication(new Application());
         $commandTester = new CommandTester($command);
         $commandTester->execute(array('command_name' => 'li'));
-
-        $this->assertRegExp('/list \[--xml\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
     }
 
     public function testExecuteForCommand()
@@ -34,8 +33,7 @@ public function testExecuteForCommand()
         $commandTester = new CommandTester($command);
         $command->setCommand(new ListCommand());
         $commandTester->execute(array());
-
-        $this->assertRegExp('/list \[--xml\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
     public function testExecuteForCommandWithXmlOption()
@@ -43,8 +41,7 @@ public function testExecuteForCommandWithXmlOption()
         $command = new HelpCommand();
         $commandTester = new CommandTester($command);
         $command->setCommand(new ListCommand());
-        $commandTester->execute(array('--xml' => true));
-
+        $commandTester->execute(array('--format' => 'xml'));
         $this->assertRegExp('/<command/', $commandTester->getDisplay(), '->execute() returns an XML help text if --xml is passed');
     }
 
@@ -53,16 +50,15 @@ public function testExecuteForApplicationCommand()
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
         $commandTester->execute(array('command_name' => 'list'));
-
-        $this->assertRegExp('/list \[--xml\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
     public function testExecuteForApplicationCommandWithXmlOption()
     {
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
-        $commandTester->execute(array('command_name' => 'list', '--xml' => true));
-
+        $commandTester->execute(array('command_name' => 'list', 'format' => 'xml'));
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertRegExp('/<command/', $commandTester->getDisplay(), '->execute() returns an XML help text if --xml is passed');
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
index cad313652c0aa..156e21db470d8 100644
--- a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
@@ -29,8 +29,7 @@ public function testExecuteListsCommandsWithXmlOption()
     {
         $application = new Application();
         $commandTester = new CommandTester($command = $application->get('list'));
-        $commandTester->execute(array('command' => $command->getName(), '--xml' => true));
-
+        $commandTester->execute(array('command' => $command->getName(), '--format' => 'xml'));
         $this->assertRegExp('/<command id="list" name="list">/', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed');
     }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index 888d127f7b7de..9f3d2820cd2b4 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"list","usage":"list","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":[],"options":[]}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
+{"commands":[{"name":"help","usage":"help [--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 \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}},{"name":"list","usage":"list [--format[=\"...\"]] [--raw] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index 8a66309fd4fb4..bb0ce0371d7d4 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -8,7 +8,7 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help`
+* Usage: `help [--format[="..."]] [--raw] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
@@ -21,11 +21,43 @@ You can also output the help as XML by using the <comment>--xml</comment> option
 
 To display the list of available commands, please use the <info>list</info> command.
 
+### Arguments:
+
+**command_name:**
+
+* Name: command_name
+* Is required: no
+* Is array: no
+* Description: The command name
+* Default: `'help'`
+
+### Options:
+
+**format:**
+
+* Name: `--format`
+* Shortcut: <none>
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Description: Output format (json, md)
+* Default: `NULL`
+
+**raw:**
+
+* Name: `--raw`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output raw command list
+* Default: `false`
+
 list
 ----
 
 * Description: Lists commands
-* Usage: `list`
+* Usage: `list [--format[="..."]] [--raw] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
@@ -43,3 +75,35 @@ You can also output the information as XML by using the <comment>--xml</comment>
 It's also possible to get raw list of commands (useful for embedding command runner):
 
   <info>php /usr/bin/phpunit list --raw</info>
+
+### Arguments:
+
+**namespace:**
+
+* Name: namespace
+* Is required: no
+* Is array: no
+* Description: The namespace name
+* Default: `NULL`
+
+### Options:
+
+**format:**
+
+* Name: `--format`
+* Shortcut: <none>
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Description: Output format (json, md)
+* Default: `NULL`
+
+**raw:**
+
+* Name: `--raw`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output raw command list
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index 0176a6221140b..5871aef56d84a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help","description":"Displays help for a command","help":"The <info>help<\/info> command displays help for a given command:\n\n  <info>php \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --xml list<\/info>\n\nTo display the list of available commands, please use the <info>list<\/info> command.","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"list","usage":"list","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
+{"commands":[{"name":"help","usage":"help [--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 \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}},{"name":"list","usage":"list [--format[=\"...\"]] [--raw] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index baa59dfcdc867..d06a11c842979 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -15,7 +15,7 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help`
+* Usage: `help [--format[="..."]] [--raw] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
@@ -28,11 +28,43 @@ You can also output the help as XML by using the <comment>--xml</comment> option
 
 To display the list of available commands, please use the <info>list</info> command.
 
+### Arguments:
+
+**command_name:**
+
+* Name: command_name
+* Is required: no
+* Is array: no
+* Description: The command name
+* Default: `'help'`
+
+### Options:
+
+**format:**
+
+* Name: `--format`
+* Shortcut: <none>
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Description: Output format (json, md)
+* Default: `NULL`
+
+**raw:**
+
+* Name: `--raw`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output raw command list
+* Default: `false`
+
 list
 ----
 
 * Description: Lists commands
-* Usage: `list`
+* Usage: `list [--format[="..."]] [--raw] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
@@ -51,6 +83,38 @@ It's also possible to get raw list of commands (useful for embedding command run
 
   <info>php /usr/bin/phpunit list --raw</info>
 
+### Arguments:
+
+**namespace:**
+
+* Name: namespace
+* Is required: no
+* Is array: no
+* Description: The namespace name
+* Default: `NULL`
+
+### Options:
+
+**format:**
+
+* Name: `--format`
+* Shortcut: <none>
+* Accept value: yes
+* Is value required: no
+* Is multiple: no
+* Description: Output format (json, md)
+* Default: `NULL`
+
+**raw:**
+
+* Name: `--raw`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output raw command list
+* Default: `false`
+
 descriptor:command1
 -------------------
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
index 56dd52ecbe8f3..068306a24fd3c 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -6,6 +6,6 @@
                                       
 
 
-list [--xml] [--raw] [namespace]
+list [--format[="..."]] [--raw] [namespace]
 
 

From 2066a9be21d70788100c8b2d4cf05250953bcfab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sat, 6 Apr 2013 09:47:49 +0200
Subject: [PATCH 07/24] [Console] added XML descriptors

---
 ...and.php => AbstractDescriptionCommand.php} |   6 +-
 .../Component/Console/Command/HelpCommand.php |  10 +-
 .../Component/Console/Command/ListCommand.php |   6 +-
 .../Json/AbstractJsonDescriptor.php           |   4 +-
 .../Json/ApplicationJsonDescriptor.php        |   4 +-
 .../Markdown/AbstractMarkdownDescriptor.php   |   4 +-
 .../ApplicationMarkdownDescriptor.php         |   4 +-
 .../Descriptor/Xml/AbstractXmlDescriptor.php  |  64 ++++++++++
 .../Xml/ApplicationXmlDescriptor.php          |  91 +++++++++++++++
 .../Descriptor/Xml/CommandXmlDescriptor.php   |  59 ++++++++++
 .../Xml/InputArgumentXmlDescriptor.php        |  51 ++++++++
 .../Xml/InputDefinitionXmlDescriptor.php      |  54 +++++++++
 .../Xml/InputOptionXmlDescriptor.php          |  58 ++++++++++
 .../Descriptor/AbstractDescriptorTest.php     |  17 +++
 .../Xml/ApplicationXmlDescriptorTest.php      |  29 +++++
 .../Xml/CommandXmlDescriptorTest.php          |  29 +++++
 .../Xml/InputArgumentXmlDescriptorTest.php    |  29 +++++
 .../Xml/InputDefinitionXmlDescriptorTest.php  |  29 +++++
 .../Xml/InputOptionXmlDescriptorTest.php      |  29 +++++
 .../Console/Tests/Fixtures/application_1.json |   2 +-
 .../Console/Tests/Fixtures/application_1.md   |  28 ++---
 .../Console/Tests/Fixtures/application_1.xml  |  75 ++++++++++++
 .../Console/Tests/Fixtures/application_1.xml~ |  75 ++++++++++++
 .../Console/Tests/Fixtures/application_2.json |   2 +-
 .../Console/Tests/Fixtures/application_2.md   |  28 ++---
 .../Console/Tests/Fixtures/application_2.xml  | 109 ++++++++++++++++++
 .../Console/Tests/Fixtures/application_2.xml~ | 109 ++++++++++++++++++
 .../Fixtures/application_renderexception2.txt |   2 +-
 .../application_renderexception2.txt~         |  11 ++
 .../Tests/Fixtures/application_run2.txt       |  14 +--
 .../Tests/Fixtures/application_run3.txt       |  20 ++--
 .../Console/Tests/Fixtures/command_1.xml      |  12 ++
 .../Console/Tests/Fixtures/command_2.xml      |  18 +++
 .../Tests/Fixtures/input_argument_1.xml       |   5 +
 .../Tests/Fixtures/input_argument_2.xml       |   5 +
 .../Tests/Fixtures/input_argument_3.xml       |   7 ++
 .../Tests/Fixtures/input_definition_1.xml     |   5 +
 .../Tests/Fixtures/input_definition_2.xml     |  10 ++
 .../Tests/Fixtures/input_definition_3.xml     |   9 ++
 .../Tests/Fixtures/input_definition_4.xml     |  14 +++
 .../Console/Tests/Fixtures/input_option_1.xml |   4 +
 .../Console/Tests/Fixtures/input_option_2.xml |   7 ++
 .../Console/Tests/Fixtures/input_option_3.xml |   4 +
 .../Console/Tests/Fixtures/input_option_4.xml |   4 +
 44 files changed, 1092 insertions(+), 64 deletions(-)
 rename src/Symfony/Component/Console/Command/{AbstractDescriptorCommand.php => AbstractDescriptionCommand.php} (83%)
 create mode 100644 src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_1.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_1.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_2.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
similarity index 83%
rename from src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
rename to src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
index 2df8133d630c2..52d716da5af90 100644
--- a/src/Symfony/Component/Console/Command/AbstractDescriptorCommand.php
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
@@ -10,11 +10,11 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Base class for descriptor commands.
+ * Base class for description commands.
  *
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractDescriptorCommand extends Command
+abstract class AbstractDescriptionCommand extends Command
 {
     /**
      * @var DescriptorProvider
@@ -38,7 +38,7 @@ protected function configure()
     protected function createDefinition()
     {
         return new InputDefinition(array(
-            new InputOption('format', null, InputOption::VALUE_OPTIONAL, 'Output format ('.implode(', ', $this->provider->getSupportedFormats()).')'),
+            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats'),
             new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
         ));
     }
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 94a70721cc74d..3623b0241f0b6 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -21,7 +21,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class HelpCommand extends AbstractDescriptorCommand
+class HelpCommand extends AbstractDescriptionCommand
 {
     private $command;
 
@@ -41,9 +41,9 @@ protected function configure()
 
   <info>php %command.full_name% list</info>
 
-You can also output the help as XML by using the <comment>--xml</comment> option:
+You can also output the help in other formats by using the <comment>--format</comment> option:
 
-  <info>php %command.full_name% --xml list</info>
+  <info>php %command.full_name% --format=xml list</info>
 
 To display the list of available commands, please use the <info>list</info> command.
 EOF
@@ -77,14 +77,12 @@ protected function createDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        parent::execute($input, $output);
-
         if (null === $this->command) {
             $this->command = $this->getApplication()->find($input->getArgument('command_name'));
         }
 
+        parent::execute($input, $output);
         $this->getHelper('descriptor')->describe($output, $this->command, $input->getOption('format'), $input->getOption('raw'));
-
         $this->command = null;
     }
 }
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 8b75dd05ae289..7c6176d029c68 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -21,7 +21,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ListCommand extends AbstractDescriptorCommand
+class ListCommand extends AbstractDescriptionCommand
 {
     /**
      * {@inheritdoc}
@@ -42,9 +42,9 @@ protected function configure()
 
   <info>php %command.full_name% test</info>
 
-You can also output the information as XML by using the <comment>--xml</comment> option:
+You can also output the information in other formats by using the <comment>--format</comment> option:
 
-  <info>php %command.full_name% --xml</info>
+  <info>php %command.full_name% --format=xml</info>
 
 It's also possible to get raw list of commands (useful for embedding command runner):
 
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
index 39603108086a2..b4555d1c18d81 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
@@ -36,7 +36,9 @@ public function __construct($encodingOptions = 0)
      */
     public function configure(array $options)
     {
-        $this->encodingOptions = $options['json_encoding'];
+        if (isset($options['json_encoding'])) {
+            $this->encodingOptions = $options['json_encoding'];
+        }
 
         return $this;
     }
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
index 356b4ed71e3d4..acb8bb7707fc4 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -39,7 +39,9 @@ public function __construct($namespace = null, $encodingOptions = 0)
      */
     public function configure(array $options)
     {
-        $this->namespace = $options['namespace'];
+        if (isset($options['namespace'])) {
+            $this->namespace = $options['namespace'];
+        }
 
         return parent::configure($options);
     }
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
index 2c00b30067ee4..5f393666d4e94 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
@@ -36,7 +36,9 @@ public function __construct($maxWidth = 120)
      */
     public function configure(array $options)
     {
-        $this->maxWidth = $options['markdown_width'];
+        if (isset($options['markdown_width'])) {
+            $this->maxWidth = $options['markdown_width'];
+        }
 
         return $this;
     }
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
index 64b61a4488459..ae12cdaae85f8 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
@@ -39,7 +39,9 @@ public function __construct($namespace = null, $maxWidth = 120)
      */
     public function configure(array $options)
     {
-        $this->namespace = $options['namespace'];
+        if (isset($options['namespace'])) {
+            $this->namespace = $options['namespace'];
+        }
 
         return parent::configure($options);
     }
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
new file mode 100644
index 0000000000000..051c41be14f51
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Xml;
+
+use Symfony\Component\Console\Descriptor\DescriptorInterface;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractXmlDescriptor implements DescriptorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describe($object, $raw = false)
+    {
+        $document = new \DOMDocument('1.0', 'UTF-8');
+        $document->formatOutput = true;
+        $this->buildDocument($document, $object);
+
+        return $document->saveXML();
+    }
+
+    /**
+     * Builds DOM document with object.
+     *
+     * @param \DOMNode $parent
+     * @param object   $object
+     */
+    abstract public function buildDocument(\DOMNode $parent, $object);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormat()
+    {
+        return 'xml';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function useFormatting()
+    {
+        return false;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
new file mode 100644
index 0000000000000..cf1d6efe8cc45
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Xml;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class ApplicationXmlDescriptor extends AbstractXmlDescriptor
+{
+    /**
+     * @var string|null
+     */
+    private $namespace;
+
+    /**
+     * @param string|null $namespace
+     */
+    public function __construct($namespace = null)
+    {
+        $this->namespace = $namespace;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        if (isset($options['namespace'])) {
+            $this->namespace = $options['namespace'];
+        }
+
+        return parent::configure($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildDocument(\DOMNode $parent, $object)
+    {
+        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
+        $dom->appendChild($rootXml = $dom->createElement('symfony'));
+        $rootXml->appendChild($commandsXML = $dom->createElement('commands'));
+
+        /** @var Application $object */
+        $description = new ApplicationDescription($object, $this->namespace);
+        $descriptor = new CommandXmlDescriptor();
+
+        if ($this->namespace) {
+            $commandsXML->setAttribute('namespace', $this->namespace);
+        }
+
+        foreach ($description->getCommands() as $command) {
+            $descriptor->buildDocument($commandsXML, $command);
+        }
+
+        if (!$this->namespace) {
+            $rootXml->appendChild($namespacesXML = $dom->createElement('namespaces'));
+
+            foreach ($description->getNamespaces() as $namespace) {
+                $namespacesXML->appendChild($namespaceArrayXML = $dom->createElement('namespace'));
+                $namespaceArrayXML->setAttribute('id', $namespace['id']);
+
+                foreach ($namespace['commands'] as $name) {
+                    $namespaceArrayXML->appendChild($commandXML = $dom->createElement('command'));
+                    $commandXML->appendChild($dom->createTextNode($name));
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Application;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
new file mode 100644
index 0000000000000..21f8b45f966c8
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Xml;
+
+use Symfony\Component\Console\Command\Command;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class CommandXmlDescriptor extends AbstractXmlDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildDocument(\DOMNode $parent, $object)
+    {
+        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
+        $parent->appendChild($commandXML = $dom->createElement('command'));
+
+        /** @var Command $object */
+        $commandXML->setAttribute('id', $object->getName());
+        $commandXML->setAttribute('name', $object->getName());
+
+        $commandXML->appendChild($usageXML = $dom->createElement('usage'));
+        $usageXML->appendChild($dom->createTextNode(sprintf($object->getSynopsis(), '')));
+
+        $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getDescription())));
+
+        $commandXML->appendChild($helpXML = $dom->createElement('help'));
+        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getProcessedHelp())));
+
+        $commandXML->appendChild($aliasesXML = $dom->createElement('aliases'));
+        foreach ($object->getAliases() as $alias) {
+            $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
+            $aliasXML->appendChild($dom->createTextNode($alias));
+        }
+
+        $descriptor = new InputDefinitionXmlDescriptor();
+        $descriptor->buildDocument($commandXML, $object->getDefinition());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Command;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php
new file mode 100644
index 0000000000000..b2391e6ff8c9b
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Xml;
+
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputArgumentXmlDescriptor extends AbstractXmlDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildDocument(\DOMNode $parent, $object)
+    {
+        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
+
+        /** @var InputArgument $object */
+        $parent->appendChild($objectXML = $dom->createElement('argument'));
+        $objectXML->setAttribute('name', $object->getName());
+        $objectXML->setAttribute('is_required', $object->isRequired() ? 1 : 0);
+        $objectXML->setAttribute('is_array', $object->isArray() ? 1 : 0);
+        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode($object->getDescription()));
+
+        $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
+        $defaults = is_array($object->getDefault()) ? $object->getDefault() : (is_bool($object->getDefault()) ? array(var_export($object->getDefault(), true)) : ($object->getDefault() ? array($object->getDefault()) : array()));
+        foreach ($defaults as $default) {
+            $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+            $defaultXML->appendChild($dom->createTextNode($default));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputArgument;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
new file mode 100644
index 0000000000000..99865fd114d25
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Xml;
+
+use Symfony\Component\Console\Input\InputDefinition;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputDefinitionXmlDescriptor extends AbstractXmlDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildDocument(\DOMNode $parent, $object)
+    {
+        if ($parent instanceof \DOMDocument) {
+            $dom = $parent;
+            $parent->appendChild($parent = $dom->createElement('definition'));
+        } else {
+            $dom = $parent->ownerDocument;
+        }
+
+        $parent->appendChild($argumentsXML = $dom->createElement('arguments'));
+        $descriptor = new InputArgumentXmlDescriptor();
+        /** @var InputDefinition $object */
+        foreach ($object->getArguments() as $argument) {
+            $descriptor->buildDocument($argumentsXML, $argument);
+        }
+
+        $parent->appendChild($optionsXML = $dom->createElement('options'));
+        $descriptor = new InputOptionXmlDescriptor();
+        foreach ($object->getOptions() as $option) {
+            $descriptor->buildDocument($optionsXML, $option);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputDefinition;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
new file mode 100644
index 0000000000000..40870b8d41e1b
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Xml;
+
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputOptionXmlDescriptor extends AbstractXmlDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildDocument(\DOMNode $parent, $object)
+    {
+        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
+
+        /** @var InputOption $object */
+        $parent->appendChild($objectXML = $dom->createElement('option'));
+        $objectXML->setAttribute('name', '--'.$object->getName());
+        $objectXML->setAttribute('shortcut', $object->getShortcut() ? '-'.$object->getShortcut() : '');
+        $objectXML->setAttribute('accept_value', $object->acceptValue() ? 1 : 0);
+        $objectXML->setAttribute('is_value_required', $object->isValueRequired() ? 1 : 0);
+        $objectXML->setAttribute('is_multiple', $object->isArray() ? 1 : 0);
+        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode($object->getDescription()));
+
+        if ($object->acceptValue()) {
+            $defaults = is_array($object->getDefault()) ? $object->getDefault() : (is_bool($object->getDefault()) ? array(var_export($object->getDefault(), true)) : ($object->getDefault() ? array($object->getDefault()) : array()));
+
+            if (!empty($defaults)) {
+                $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
+                foreach ($defaults as $default) {
+                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+                    $defaultXML->appendChild($dom->createTextNode($default));
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputOption;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index 45769a429b9ff..0ca0ace266376 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Descriptor;
 
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -19,6 +20,10 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
     /** @dataProvider getDescribeTestData */
     public function testDescribe(DescriptorInterface $descriptor, $object, $description)
     {
+        if ($object instanceof Application) {
+            $this->ensureStaticCommandHelp($object);
+        }
+
         $this->assertTrue($descriptor->supports($object));
         $this->assertEquals(trim($description), trim($descriptor->describe($object)));
     }
@@ -38,4 +43,16 @@ public function getDescribeTestData()
 
     abstract protected function getDescriptor();
     abstract protected function getObjects();
+
+    /**
+     * Replaces the dynamic placeholders of the command help text with a static version.
+     * The placeholder %command.full_name% includes the script path that is not predictable
+     * and can not be tested against.
+     */
+    private function ensureStaticCommandHelp(Application $application)
+    {
+        foreach ($application->all() as $command) {
+            $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp()));
+        }
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php
new file mode 100644
index 0000000000000..0fde188177461
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Xml\ApplicationXmlDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class ApplicationXmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new ApplicationXmlDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getApplications();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php
new file mode 100644
index 0000000000000..ca7ac95a74e7b
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Xml\CommandXmlDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class CommandXmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new CommandXmlDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getCommands();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php
new file mode 100644
index 0000000000000..03cb73c27b44d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Xml\InputArgumentXmlDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputArgumentXmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputArgumentXmlDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputArguments();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php
new file mode 100644
index 0000000000000..6ca79ef1ea8ac
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Xml\InputDefinitionXmlDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputDefinitionXmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputDefinitionXmlDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputDefinitions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php
new file mode 100644
index 0000000000000..e2da24f2c74f7
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Json;
+
+use Symfony\Component\Console\Descriptor\Xml\InputOptionXmlDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputOptionXmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputOptionXmlDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputOptions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index 9f3d2820cd2b4..085989bd58cd0 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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 \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}},{"name":"list","usage":"list [--format[=\"...\"]] [--raw] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
+{"commands":[{"name":"help","usage":"help [--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":{"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 list","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index bb0ce0371d7d4..19fb2aa422ec0 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -8,16 +8,16 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help [--format[="..."]] [--raw] [command_name]`
+* Usage: `help [--format="..."] [--raw] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
 
-  <info>php /usr/bin/phpunit help list</info>
+  <info>php app/console help list</info>
 
-You can also output the help as XML by using the <comment>--xml</comment> option:
+You can also output the help in other formats by using the <comment>--format</comment> option:
 
-  <info>php /usr/bin/phpunit help --xml list</info>
+  <info>php app/console help --format=xml list</info>
 
 To display the list of available commands, please use the <info>list</info> command.
 
@@ -38,9 +38,9 @@ To display the list of available commands, please use the <info>list</info> comm
 * Name: `--format`
 * Shortcut: <none>
 * Accept value: yes
-* Is value required: no
+* Is value required: yes
 * Is multiple: no
-* Description: Output format (json, md)
+* Description: To output help in other formats
 * Default: `NULL`
 
 **raw:**
@@ -57,24 +57,24 @@ list
 ----
 
 * Description: Lists commands
-* Usage: `list [--format[="..."]] [--raw] [namespace]`
+* Usage: `list [--format="..."] [--raw] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
 
-  <info>php /usr/bin/phpunit list</info>
+  <info>php app/console list</info>
 
 You can also display the commands for a specific namespace:
 
-  <info>php /usr/bin/phpunit list test</info>
+  <info>php app/console list test</info>
 
-You can also output the information as XML by using the <comment>--xml</comment> option:
+You can also output the information in other formats by using the <comment>--format</comment> option:
 
-  <info>php /usr/bin/phpunit list --xml</info>
+  <info>php app/console list --format=xml</info>
 
 It's also possible to get raw list of commands (useful for embedding command runner):
 
-  <info>php /usr/bin/phpunit list --raw</info>
+  <info>php app/console list --raw</info>
 
 ### Arguments:
 
@@ -93,9 +93,9 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Name: `--format`
 * Shortcut: <none>
 * Accept value: yes
-* Is value required: no
+* Is value required: yes
 * Is multiple: no
-* Description: Output format (json, md)
+* Description: To output help in other formats
 * Default: `NULL`
 
 **raw:**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
new file mode 100644
index 0000000000000..38ea50b126d80
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands>
+    <command id="help" name="help">
+      <usage>help [--format="..."] [--raw] [command_name]</usage>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+      <aliases/>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output help in other formats</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+    <command id="list" name="list">
+      <usage>list [--format="..."] [--raw] [namespace]</usage>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+      <aliases/>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output help in other formats</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~
new file mode 100644
index 0000000000000..2fe106c4c23a4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands>
+    <command id="help" name="help">
+      <usage>help [--format="..."] [--raw] [command_name]</usage>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help as XML by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+      <aliases/>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output help in other formats</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+    <command id="list" name="list">
+      <usage>list [--format="..."] [--raw] [namespace]</usage>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information as XML by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+      <aliases/>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output help in other formats</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index 5871aef56d84a..f7a1386f021b7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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 \/usr\/bin\/phpunit help list<\/info>\n\nYou can also output the help as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit help --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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}},{"name":"list","usage":"list [--format[=\"...\"]] [--raw] [namespace]","description":"Lists commands","help":"The <info>list<\/info> command lists all commands:\n\n  <info>php \/usr\/bin\/phpunit list<\/info>\n\nYou can also display the commands for a specific namespace:\n\n  <info>php \/usr\/bin\/phpunit list test<\/info>\n\nYou can also output the information as XML by using the <comment>--xml<\/comment> option:\n\n  <info>php \/usr\/bin\/phpunit list --xml<\/info>\n\nIt's also possible to get raw list of commands (useful for embedding command runner):\n\n  <info>php \/usr\/bin\/phpunit list --raw<\/info>","aliases":[],"definition":{"arguments":{"namespace":{"name":"namespace","is_required":false,"is_array":false,"description":"The namespace name","default":null}},"options":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":false,"is_multiple":false,"description":"Output format (json, md)","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
+{"commands":[{"name":"help","usage":"help [--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":{"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 list","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index d06a11c842979..cd21bdd1aa7f7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -15,16 +15,16 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help [--format[="..."]] [--raw] [command_name]`
+* Usage: `help [--format="..."] [--raw] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
 
-  <info>php /usr/bin/phpunit help list</info>
+  <info>php app/console help list</info>
 
-You can also output the help as XML by using the <comment>--xml</comment> option:
+You can also output the help in other formats by using the <comment>--format</comment> option:
 
-  <info>php /usr/bin/phpunit help --xml list</info>
+  <info>php app/console help --format=xml list</info>
 
 To display the list of available commands, please use the <info>list</info> command.
 
@@ -45,9 +45,9 @@ To display the list of available commands, please use the <info>list</info> comm
 * Name: `--format`
 * Shortcut: <none>
 * Accept value: yes
-* Is value required: no
+* Is value required: yes
 * Is multiple: no
-* Description: Output format (json, md)
+* Description: To output help in other formats
 * Default: `NULL`
 
 **raw:**
@@ -64,24 +64,24 @@ list
 ----
 
 * Description: Lists commands
-* Usage: `list [--format[="..."]] [--raw] [namespace]`
+* Usage: `list [--format="..."] [--raw] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
 
-  <info>php /usr/bin/phpunit list</info>
+  <info>php app/console list</info>
 
 You can also display the commands for a specific namespace:
 
-  <info>php /usr/bin/phpunit list test</info>
+  <info>php app/console list test</info>
 
-You can also output the information as XML by using the <comment>--xml</comment> option:
+You can also output the information in other formats by using the <comment>--format</comment> option:
 
-  <info>php /usr/bin/phpunit list --xml</info>
+  <info>php app/console list --format=xml</info>
 
 It's also possible to get raw list of commands (useful for embedding command runner):
 
-  <info>php /usr/bin/phpunit list --raw</info>
+  <info>php app/console list --raw</info>
 
 ### Arguments:
 
@@ -100,9 +100,9 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Name: `--format`
 * Shortcut: <none>
 * Accept value: yes
-* Is value required: no
+* Is value required: yes
 * Is multiple: no
-* Description: Output format (json, md)
+* Description: To output help in other formats
 * Default: `NULL`
 
 **raw:**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
new file mode 100644
index 0000000000000..2fda065c6fc83
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands>
+    <command id="help" name="help">
+      <usage>help [--format="..."] [--raw] [command_name]</usage>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+      <aliases/>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output help in other formats</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+    <command id="list" name="list">
+      <usage>list [--format="..."] [--raw] [namespace]</usage>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+      <aliases/>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output help in other formats</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+    <command id="descriptor:command1" name="descriptor:command1">
+      <usage>descriptor:command1</usage>
+      <description>command 1 description</description>
+      <help>command 1 help</help>
+      <aliases>
+        <alias>alias1</alias>
+        <alias>alias2</alias>
+      </aliases>
+      <arguments/>
+      <options/>
+    </command>
+    <command id="descriptor:command2" name="descriptor:command2">
+      <usage>descriptor:command2 [-o|--option_name] argument_name</usage>
+      <description>command 2 description</description>
+      <help>command 2 help</help>
+      <aliases/>
+      <arguments>
+        <argument name="argument_name" is_required="1" is_array="0">
+          <description></description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+          <description></description>
+        </option>
+      </options>
+    </command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>alias1</command>
+      <command>alias2</command>
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+    <namespace id="descriptor">
+      <command>descriptor:command1</command>
+      <command>descriptor:command2</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~
new file mode 100644
index 0000000000000..7c792c3ec136c
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands>
+    <command id="help" name="help">
+      <usage>help [--format="..."] [--raw] [command_name]</usage>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+      <aliases/>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>Output format (json, md)</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+    <command id="list" name="list">
+      <usage>list [--format="..."] [--raw] [namespace]</usage>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+      <aliases/>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>Output format (json, md)</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+      </options>
+    </command>
+    <command id="descriptor:command1" name="descriptor:command1">
+      <usage>descriptor:command1</usage>
+      <description>command 1 description</description>
+      <help>command 1 help</help>
+      <aliases>
+        <alias>alias1</alias>
+        <alias>alias2</alias>
+      </aliases>
+      <arguments/>
+      <options/>
+    </command>
+    <command id="descriptor:command2" name="descriptor:command2">
+      <usage>descriptor:command2 [-o|--option_name] argument_name</usage>
+      <description>command 2 description</description>
+      <help>command 2 help</help>
+      <aliases/>
+      <arguments>
+        <argument name="argument_name" is_required="1" is_array="0">
+          <description></description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+          <description></description>
+        </option>
+      </options>
+    </command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>alias1</command>
+      <command>alias2</command>
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+    <namespace id="descriptor">
+      <command>descriptor:command1</command>
+      <command>descriptor:command2</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
index 068306a24fd3c..fc8a946e08ac2 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -6,6 +6,6 @@
                                       
 
 
-list [--format[="..."]] [--raw] [namespace]
+list [--format="..."] [--raw] [namespace]
 
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~
new file mode 100644
index 0000000000000..152eadf99377e
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~
@@ -0,0 +1,11 @@
+
+
+ 
+  [InvalidArgumentException]
+  The "--foo" option does not exist.
+ 
+
+
+list [--format="..."] [--raw] [namespace]
+
+
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
index 6831afdd128c1..8b17c7f6bb0f7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
@@ -6,7 +6,7 @@ Arguments:
  command_name          The command name (default: "help")
 
 Options:
- --xml                 To output help as XML
+ --format              To output help in other formats.
  --help (-h)           Display this help message.
  --quiet (-q)          Do not output any message.
  --verbose (-v)        Increase verbosity of messages.
@@ -17,12 +17,12 @@ Options:
 
 Help:
  The help command displays help for a given command:
- 
+
    php app/console help list
- 
- You can also output the help as XML by using the --xml option:
- 
-   php app/console help --xml list
- 
+
+ You can also output the help in other formats by using the --format option:
+
+   php app/console help --format=xml list
+
  To display the list of available commands, please use the list command.
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
index 441db5485752c..a203c737e4147 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
@@ -5,23 +5,23 @@ Arguments:
  namespace  The namespace name
 
 Options:
- --xml      To output help as XML
+ --format   To output help in other formats
  --raw      To output raw command list
 
 Help:
  The list command lists all commands:
- 
+
    php app/console list
- 
+
  You can also display the commands for a specific namespace:
- 
+
    php app/console list test
- 
- You can also output the information as XML by using the --xml option:
- 
-   php app/console list --xml
- 
+
+ You can also output the information in other formats by using the --format option:
+
+   php app/console list --format=xml
+
  It's also possible to get raw list of commands (useful for embedding command runner):
- 
+
    php app/console list --raw
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/command_1.xml
new file mode 100644
index 0000000000000..dcfa6fa5044e7
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<command id="descriptor:command1" name="descriptor:command1">
+  <usage>descriptor:command1</usage>
+  <description>command 1 description</description>
+  <help>command 1 help</help>
+  <aliases>
+    <alias>alias1</alias>
+    <alias>alias2</alias>
+  </aliases>
+  <arguments/>
+  <options/>
+</command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/command_2.xml
new file mode 100644
index 0000000000000..c411c36c3d285
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<command id="descriptor:command2" name="descriptor:command2">
+  <usage>descriptor:command2 [-o|--option_name] argument_name</usage>
+  <description>command 2 description</description>
+  <help>command 2 help</help>
+  <aliases/>
+  <arguments>
+    <argument name="argument_name" is_required="1" is_array="0">
+      <description></description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+      <description></description>
+    </option>
+  </options>
+</command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.xml
new file mode 100644
index 0000000000000..cb37f812c5ec4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="1" is_array="0">
+  <description></description>
+  <defaults/>
+</argument>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.xml
new file mode 100644
index 0000000000000..629da5a98a3b5
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="1">
+  <description>argument description</description>
+  <defaults/>
+</argument>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.xml
new file mode 100644
index 0000000000000..399a5c864d5dd
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<argument name="argument_name" is_required="0" is_array="0">
+  <description>argument description</description>
+  <defaults>
+    <default>default_value</default>
+  </defaults>
+</argument>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.xml
new file mode 100644
index 0000000000000..b5481ce1276a2
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments/>
+  <options/>
+</definition>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.xml
new file mode 100644
index 0000000000000..102efc1486381
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments>
+    <argument name="argument_name" is_required="1" is_array="0">
+      <description></description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options/>
+</definition>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.xml
new file mode 100644
index 0000000000000..bc95151548ada
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments/>
+  <options>
+    <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+      <description></description>
+    </option>
+  </options>
+</definition>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.xml
new file mode 100644
index 0000000000000..cffceecef14c7
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments>
+    <argument name="argument_name" is_required="1" is_array="0">
+      <description></description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+      <description></description>
+    </option>
+  </options>
+</definition>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.xml
new file mode 100644
index 0000000000000..8a64ea65296e6
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
+  <description></description>
+</option>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.xml
new file mode 100644
index 0000000000000..4afac5b04e10d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="0" is_multiple="0">
+  <description>option description</description>
+  <defaults>
+    <default>default_value</default>
+  </defaults>
+</option>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml
new file mode 100644
index 0000000000000..52f87dfa92e9c
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="0">
+  <description>option description</description>
+</option>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml
new file mode 100644
index 0000000000000..6eecd07ea879e
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<option name="--option_name" shortcut="-o" accept_value="1" is_value_required="0" is_multiple="1">
+  <description>option description</description>
+</option>

From 47fa194a7c927023ee0317c6c9583cbf1ddb21a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sat, 6 Apr 2013 15:47:21 +0200
Subject: [PATCH 08/24] [Console] started text derciptors

---
 .../Descriptor/ApplicationDescription.php     |  52 +++++++-
 .../Descriptor/DescriptorInterface.php        |   3 +-
 .../Console/Descriptor/DescriptorProvider.php |   6 +
 .../Json/AbstractJsonDescriptor.php           |  16 +--
 .../Json/ApplicationJsonDescriptor.php        |   2 +-
 .../Descriptor/Json/CommandJsonDescriptor.php |   2 +-
 .../Json/InputDefinitionJsonDescriptor.php    |   4 +-
 .../Markdown/AbstractMarkdownDescriptor.php   |   2 +-
 .../Text/AbstractTextDescriptor.php           |  87 +++++++++++++
 .../Text/ApplicationTextDescriptor.php        | 117 ++++++++++++++++++
 .../Descriptor/Xml/AbstractXmlDescriptor.php  |   2 +-
 .../Console/Helper/DescriptorHelper.php       |   4 +-
 12 files changed, 270 insertions(+), 27 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php

diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 775be0fbbc9bc..90e27dad696e1 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -21,17 +21,41 @@ class ApplicationDescription
 {
     const GLOBAL_NAMESPACE = '_global';
 
+    /**
+     * @var Application
+     */
     private $application;
+
+    /**
+     * @var null|string
+     */
     private $namespace;
+
+    /**
+     * @var array
+     */
     private $namespaces;
+
+    /**
+     * @var Command[]
+     */
     private $commands;
 
+    /**
+     * Constructor.
+     *
+     * @param Application $application
+     * @param string|null $namespace
+     */
     public function __construct(Application $application, $namespace = null)
     {
         $this->application = $application;
         $this->namespace = $namespace;
     }
 
+    /**
+     * @return array
+     */
     public function getNamespaces()
     {
         if (null === $this->namespaces) {
@@ -41,6 +65,9 @@ public function getNamespaces()
         return $this->namespaces;
     }
 
+    /**
+     * @return Command[]
+     */
     public function getCommands()
     {
         if (null === $this->commands) {
@@ -50,6 +77,22 @@ public function getCommands()
         return $this->commands;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return Command
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function getCommand($name)
+    {
+        if (!isset($this->commands[$name])) {
+            throw new \InvalidArgumentException('Command "'.$name.'" does not exist.');
+        }
+
+        return $this->commands[$name];
+    }
+
     private function inspectApplication()
     {
         $this->commands = array();
@@ -67,16 +110,21 @@ private function inspectApplication()
 
                 // aliases must be skipped in commands list
                 if ($name === $command->getName()) {
-                    $this->commands[] = $command;
+                    $this->commands[$name] = $command;
                 }
 
                 $names[] = $name;
             }
 
-            $this->namespaces[] = array('id' => $namespace, 'commands' => $names);
+            $this->namespaces[$namespace] = array('id' => $namespace, 'commands' => $names);
         }
     }
 
+    /**
+     * @param array $commands
+     *
+     * @return array
+     */
     private function sortCommands(array $commands)
     {
         $method = new \ReflectionMethod($this->application, 'sortCommands');
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index fe9124f9243f5..efc12cc01a93c 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -29,11 +29,10 @@ public function configure(array $options);
      * Returns given object's representation.
      *
      * @param object  $object The object to describe
-     * @param boolean $raw    No additional markers if true
      *
      * @return string The object formatted description
      */
-    public function describe($object, $raw = false);
+    public function describe($object);
 
     /**
      * Tests if this descriptor supports given object.
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index 73d2228ea1ed9..16ee053913514 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -29,6 +29,7 @@ class DescriptorProvider
     private $options = array(
         'default_format' => 'txt',
         'namespace'      => null,
+        'raw_text'       => false,
         'json_encoding'  => 0,
         'markdown_width' => 120,
     );
@@ -42,6 +43,11 @@ public function __construct(array $options = array())
     {
         $this
             ->configure($options)
+            ->add(new Xml\ApplicationXmlDescriptor())
+            ->add(new Xml\CommandXmlDescriptor())
+            ->add(new Xml\InputDefinitionXmlDescriptor())
+            ->add(new Xml\InputArgumentXmlDescriptor())
+            ->add(new Xml\InputOptionXmlDescriptor())
             ->add(new Json\ApplicationJsonDescriptor())
             ->add(new Json\CommandJsonDescriptor())
             ->add(new Json\InputDefinitionJsonDescriptor())
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
index b4555d1c18d81..6effd8be75b89 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
@@ -46,7 +46,7 @@ public function configure(array $options)
     /**
      * {@inheritdoc}
      */
-    public function describe($object, $raw = false)
+    public function describe($object)
     {
         return json_encode($this->getData($object), $this->encodingOptions);
     }
@@ -75,18 +75,4 @@ public function useFormatting()
     {
         return false;
     }
-
-    /**
-     * Builds a JSON descriptor.
-     *
-     * @param AbstractJsonDescriptor $descriptor
-     *
-     * @return AbstractJsonDescriptor
-     */
-    protected function build(AbstractJsonDescriptor $descriptor)
-    {
-        $descriptor->configure(array('json_encoding' => $this->encodingOptions));
-
-        return $descriptor;
-    }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
index acb8bb7707fc4..71b00aae4b977 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -53,7 +53,7 @@ public function getData($object)
     {
         /** @var Application $object */
         $description = new ApplicationDescription($object, $this->namespace);
-        $descriptor = $this->build(new CommandJsonDescriptor());
+        $descriptor = new CommandJsonDescriptor();
         $commands = array_map(array($descriptor, 'getData'), $description->getCommands());
 
         return null === $this->namespace
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
index d4bd698180a3b..85d35aa6cf21f 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
@@ -23,7 +23,7 @@ class CommandJsonDescriptor extends AbstractJsonDescriptor
      */
     public function getData($object)
     {
-        $definitionDescriptor = $this->build(new InputDefinitionJsonDescriptor());
+        $definitionDescriptor = new InputDefinitionJsonDescriptor();
 
         /** @var Command $object */
         return array(
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
index 4755b0980bc53..9ad445a7b1bc1 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
@@ -25,8 +25,8 @@ class InputDefinitionJsonDescriptor extends AbstractJsonDescriptor
      */
     public function getData($object)
     {
-        $argumentDescriptor = $this->build(new InputArgumentJsonDescriptor());
-        $optionDescriptor = $this->build(new InputOptionJsonDescriptor());
+        $argumentDescriptor = new InputArgumentJsonDescriptor();
+        $optionDescriptor = new InputOptionJsonDescriptor();
 
         /** @var InputDefinition $object */
         return array(
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
index 5f393666d4e94..3e8366cf4c667 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
@@ -46,7 +46,7 @@ public function configure(array $options)
     /**
      * {@inheritdoc}
      */
-    public function describe($object, $raw = false)
+    public function describe($object)
     {
         return $this->getDocument($object)->format(new Document\Formatter($this->maxWidth));
     }
diff --git a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
new file mode 100644
index 0000000000000..4a6771ab6c99b
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Text;
+
+use Symfony\Component\Console\Descriptor\DescriptorInterface;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractTextDescriptor implements DescriptorInterface
+{
+    /**
+     * @var boolean
+     */
+    private $raw;
+
+    /**
+     * @param boolean $raw
+     */
+    public function __construct($raw = false)
+    {
+        $this->raw = $raw;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        if (isset($options['raw_text'])) {
+            $this->raw = $options['raw_text'];
+        }
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describe($object)
+    {
+        return $this->raw ? $this->getRawText($object) : $this->getFormattedText($object);
+    }
+
+    /**
+     * Returns object's raw text description.
+     *
+     * @param object $object
+     *
+     * @return string
+     */
+    abstract public function getRawText($object);
+
+    /**
+     * Returns object's formatted text description.
+     *
+     * @param object $object
+     *
+     * @return string
+     */
+    abstract public function getFormattedText($object);
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormat()
+    {
+        return 'txt';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function useFormatting()
+    {
+        return false;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
new file mode 100644
index 0000000000000..bfdf6cfbb5083
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
@@ -0,0 +1,117 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Text;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class ApplicationTextDescriptor extends AbstractTextDescriptor
+{
+    /**
+     * @var string|null
+     */
+    private $namespace;
+
+    /**
+     * @param string|null $namespace
+     */
+    public function __construct($namespace = null)
+    {
+        $this->namespace = $namespace;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        if (isset($options['namespace'])) {
+            $this->namespace = $options['namespace'];
+        }
+
+        return parent::configure($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRawText($object)
+    {
+        /** @var Application $object */
+        $description = new ApplicationDescription($object, $this->namespace);
+        $width = $this->getColumnWidth($description->getCommands());
+        $messages = array();
+
+        foreach ($description->getCommands() as $command) {
+            $messages[] = sprintf("%-${width}s %s", $command->getName(), $command->getDescription());
+        }
+
+        return implode(PHP_EOL, $messages);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedText($object)
+    {
+        /** @var Application $object */
+        $description = new ApplicationDescription($object, $this->namespace);
+        $width = $this->getColumnWidth($description->getCommands());
+        $messages = array($object->getHelp(), '');
+
+        if ($this->namespace) {
+            $messages[] = sprintf("<comment>Available commands for the \"%s\" namespace:</comment>", $this->namespace);
+        } else {
+            $messages[] = '<comment>Available commands:</comment>';
+        }
+
+        // add commands by namespace
+        foreach ($description->getNamespaces() as $namespace) {
+            if (!$this->namespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
+                $messages[] = '<comment>'.$namespace['id'].'</comment>';
+            }
+
+            foreach ($namespace['commands'] as $name) {
+                $messages[] = sprintf("  <info>%-${width}s</info> %s", $name, $description->getCommand($name)->getDescription());
+            }
+        }
+
+        return implode(PHP_EOL, $messages);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Application;
+    }
+
+    /**
+     * @param Command[] $commands
+     *
+     * @return int
+     */
+    private function getColumnWidth(array $commands)
+    {
+        $width = 0;
+        foreach ($commands as $command) {
+            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
+        }
+
+        return $width + 2;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
index 051c41be14f51..7a59e6e960e91 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
@@ -29,7 +29,7 @@ public function configure(array $options)
     /**
      * {@inheritdoc}
      */
-    public function describe($object, $raw = false)
+    public function describe($object)
     {
         $document = new \DOMDocument('1.0', 'UTF-8');
         $document->formatOutput = true;
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index e8fc7926fdee5..c947f991a22cf 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -47,10 +47,10 @@ public function __construct(DescriptorProvider $provider)
     public function describe(OutputInterface $output, $object, $format = null, $raw = false)
     {
         $format = $format ?: $this->provider->getDefaultFormat();
-        $descriptor = $this->provider->get($object, $format);
+        $descriptor = $this->provider->configure(array('raw_text' => $raw))->get($object, $format);
         $type = $raw && $descriptor->useFormatting() ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
 
-        $output->writeln($descriptor->describe($object, $format, $raw), $type);
+        $output->writeln($descriptor->describe($object), $type);
     }
 
     /**

From 8b56eb19ced08cd61e282377f3991478b75a5ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Mon, 8 Apr 2013 08:52:47 +0200
Subject: [PATCH 09/24] [Console] finished text descriptors

---
 .../Command/AbstractDescriptionCommand.php    |  5 ++
 .../Descriptor/ApplicationDescription.php     | 14 ++-
 .../Console/Descriptor/DescriptorProvider.php |  5 ++
 .../Json/ApplicationJsonDescriptor.php        |  4 +-
 .../Text/AbstractTextDescriptor.php           |  9 ++
 .../Text/ApplicationTextDescriptor.php        |  4 +-
 .../Descriptor/Text/CommandTextDescriptor.php | 60 +++++++++++++
 .../Text/InputArgumentTextDescriptor.php      | 81 +++++++++++++++++
 .../Text/InputDefinitionTextDescriptor.php    | 83 ++++++++++++++++++
 .../Text/InputOptionTextDescriptor.php        | 87 +++++++++++++++++++
 .../Console/Tests/Command/HelpCommandTest.php |  5 +-
 .../Text/ApplicationTextDescriptorTest.php    | 29 +++++++
 .../Text/CommandTextDescriptorTest.php        | 29 +++++++
 .../Text/InputArgumentTextDescriptorTest.php  | 29 +++++++
 .../InputDefinitionTextDescriptorTest.php     | 29 +++++++
 .../Text/InputOptionTextDescriptorTest.php    | 29 +++++++
 .../Console/Tests/Fixtures/application_1.txt  | 17 ++++
 .../Console/Tests/Fixtures/application_2.txt  | 22 +++++
 .../Console/Tests/Fixtures/command_1.txt      |  7 ++
 .../Console/Tests/Fixtures/command_2.txt      | 11 +++
 .../Console/Tests/Fixtures/command_2.txt~     | 12 +++
 .../Tests/Fixtures/input_argument_1.txt       |  1 +
 .../Tests/Fixtures/input_argument_2.txt       |  1 +
 .../Tests/Fixtures/input_argument_3.txt       |  1 +
 .../Tests/Fixtures/input_definition_1.txt     |  0
 .../Tests/Fixtures/input_definition_2.txt     |  2 +
 .../Tests/Fixtures/input_definition_3.txt     |  2 +
 .../Tests/Fixtures/input_definition_4.txt     |  5 ++
 .../Tests/Fixtures/input_definition_4.txt~    |  5 ++
 .../Console/Tests/Fixtures/input_option_1.txt |  1 +
 .../Console/Tests/Fixtures/input_option_2.txt |  1 +
 .../Console/Tests/Fixtures/input_option_3.txt |  1 +
 .../Console/Tests/Fixtures/input_option_4.txt |  1 +
 33 files changed, 583 insertions(+), 9 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_3.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_option_4.txt

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
index 52d716da5af90..ad0d75b46bd96 100644
--- a/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
@@ -4,6 +4,7 @@
 
 use Symfony\Component\Console\Descriptor\DescriptorProvider;
 use Symfony\Component\Console\Helper\DescriptorHelper;
+use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -48,6 +49,10 @@ protected function createDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (null === $this->getHelperSet()) {
+            $this->setHelperSet(new HelperSet());
+        }
+
         $this->getHelperSet()->set(new DescriptorHelper($this->provider));
     }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 90e27dad696e1..95c124bf15a0a 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -41,6 +41,11 @@ class ApplicationDescription
      */
     private $commands;
 
+    /**
+     * @var Command[]
+     */
+    private $aliases;
+
     /**
      * Constructor.
      *
@@ -86,11 +91,11 @@ public function getCommands()
      */
     public function getCommand($name)
     {
-        if (!isset($this->commands[$name])) {
+        if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
             throw new \InvalidArgumentException('Command "'.$name.'" does not exist.');
         }
 
-        return $this->commands[$name];
+        return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
     }
 
     private function inspectApplication()
@@ -108,9 +113,10 @@ private function inspectApplication()
                     continue;
                 }
 
-                // aliases must be skipped in commands list
-                if ($name === $command->getName()) {
+                if ($command->getName() === $name) {
                     $this->commands[$name] = $command;
+                } else {
+                    $this->aliases[$name] = $command;
                 }
 
                 $names[] = $name;
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index 16ee053913514..426275e24fb54 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -43,6 +43,11 @@ public function __construct(array $options = array())
     {
         $this
             ->configure($options)
+            ->add(new Text\ApplicationTextDescriptor())
+            ->add(new Text\CommandTextDescriptor())
+            ->add(new Text\InputDefinitionTextDescriptor())
+            ->add(new Text\InputArgumentTextDescriptor())
+            ->add(new Text\InputOptionTextDescriptor())
             ->add(new Xml\ApplicationXmlDescriptor())
             ->add(new Xml\CommandXmlDescriptor())
             ->add(new Xml\InputDefinitionXmlDescriptor())
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
index 71b00aae4b977..730e3b573c38c 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -54,10 +54,10 @@ public function getData($object)
         /** @var Application $object */
         $description = new ApplicationDescription($object, $this->namespace);
         $descriptor = new CommandJsonDescriptor();
-        $commands = array_map(array($descriptor, 'getData'), $description->getCommands());
+        $commands = array_values(array_map(array($descriptor, 'getData'), $description->getCommands()));
 
         return null === $this->namespace
-            ? array('commands' => $commands, 'namespaces' => $description->getNamespaces())
+            ? array('commands' => $commands, 'namespaces' => array_values($description->getNamespaces()))
             : array('commands' => $commands, 'namespace' => $this->namespace);
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
index 4a6771ab6c99b..57e7df01a4d7f 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
@@ -84,4 +84,13 @@ public function useFormatting()
     {
         return false;
     }
+
+    protected function formatDefaultValue($default)
+    {
+        if (version_compare(PHP_VERSION, '5.4', '<')) {
+            return str_replace('\/', '/', json_encode($default));
+        }
+
+        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+    }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
index bfdf6cfbb5083..be5b89fd30472 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
@@ -27,10 +27,12 @@ class ApplicationTextDescriptor extends AbstractTextDescriptor
 
     /**
      * @param string|null $namespace
+     * @param bool        $raw
      */
-    public function __construct($namespace = null)
+    public function __construct($namespace = null, $raw = false)
     {
         $this->namespace = $namespace;
+        parent::__construct($raw);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
new file mode 100644
index 0000000000000..b100dfe29b5f8
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Text;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputDefinition;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class CommandTextDescriptor extends AbstractTextDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getRawText($object)
+    {
+        return strip_tags($this->getFormattedText($object));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedText($object)
+    {
+        /** @var Command $object */
+        $messages = array('<comment>Usage:</comment>', ' '.$object->getSynopsis(), '');
+
+        if ($object->getAliases()) {
+            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $object->getAliases()).'</info>';
+        }
+
+        $descriptor = new InputDefinitionTextDescriptor();
+        $messages[] = $descriptor->getFormattedText($object->getDefinition());
+
+        if ($help = $object->getProcessedHelp()) {
+            $messages[] = '<comment>Help:</comment>';
+            $messages[] = ' '.str_replace("\n", "\n ", $help)."\n";
+        }
+
+        return implode("\n", $messages);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof Command;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php
new file mode 100644
index 0000000000000..96fd69c5bb556
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Text;
+
+use Symfony\Component\Console\Input\InputArgument;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputArgumentTextDescriptor extends AbstractTextDescriptor
+{
+    /**
+     * @var int|null
+     */
+    private $nameWidth;
+
+    /**
+     * @param string|null $nameWidth
+     * @param bool        $raw
+     */
+    public function __construct($nameWidth = null, $raw = false)
+    {
+        $this->nameWidth = $nameWidth;
+        parent::__construct($raw);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        if (isset($options['name_width'])) {
+            $this->nameWidth = $options['name_width'];
+        }
+
+        return parent::configure($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRawText($object)
+    {
+        return strip_tags($this->getFormattedText($object));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedText($object)
+    {
+        /** @var InputArgument $object */
+        if (null !== $object->getDefault() && (!is_array($object->getDefault()) || count($object->getDefault()))) {
+            $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($object->getDefault()));
+        } else {
+            $default = '';
+        }
+
+        $nameWidth = $this->nameWidth ?: strlen($object->getName());
+        $description = str_replace("\n", "\n".str_repeat(' ', $nameWidth + 2), $object->getDescription());
+
+        return sprintf(" <info>%-${nameWidth}s</info> %s%s", $object->getName(), $description, $default);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputArgument;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
new file mode 100644
index 0000000000000..2aa32a164c0b1
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Text;
+
+use Symfony\Component\Console\Input\InputDefinition;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputDefinitionTextDescriptor extends AbstractTextDescriptor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getRawText($object)
+    {
+        return strip_tags($this->getFormattedText($object));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedText($object)
+    {
+        // find the largest option or argument name
+        $nameWidth = 0;
+
+        /** @var InputDefinition $object */
+        foreach ($object->getOptions() as $option) {
+            $nameLength = strlen($option->getName()) + 2;
+            if ($option->getShortcut()) {
+                $nameLength += strlen($option->getShortcut()) + 3;
+            }
+
+            $nameWidth = max($nameWidth, $nameLength);
+        }
+
+        foreach ($object->getArguments() as $argument) {
+            $nameWidth = max($nameWidth, strlen($argument->getName()));
+        }
+
+        ++$nameWidth;
+
+        $text = array();
+
+        if ($object->getArguments()) {
+            $text[] = '<comment>Arguments:</comment>';
+            $descriptor = new InputArgumentTextDescriptor($nameWidth);
+            foreach ($object->getArguments() as $argument) {
+                $text[] = $descriptor->getFormattedText($argument);
+            }
+            $text[] = '';
+        }
+
+        if ($object->getOptions()) {
+            $text[] = '<comment>Options:</comment>';
+            $descriptor = new InputOptionTextDescriptor($nameWidth);
+            foreach ($object->getOptions() as $option) {
+                $text[] = $descriptor->getFormattedText($option);
+            }
+            $text[] = '';
+        }
+
+        return implode("\n", $text);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputDefinition;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php
new file mode 100644
index 0000000000000..c3daf3f9c90e7
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php
@@ -0,0 +1,87 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor\Text;
+
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class InputOptionTextDescriptor extends AbstractTextDescriptor
+{
+    /**
+     * @var int|null
+     */
+    private $nameWidth;
+
+    /**
+     * @param string|null $nameWidth
+     * @param bool        $raw
+     */
+    public function __construct($nameWidth = null, $raw = false)
+    {
+        $this->nameWidth = $nameWidth;
+        parent::__construct($raw);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configure(array $options)
+    {
+        if (isset($options['name_width'])) {
+            $this->nameWidth = $options['name_width'];
+        }
+
+        return parent::configure($options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRawText($object)
+    {
+        return strip_tags($this->getFormattedText($object));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFormattedText($object)
+    {
+        /** @var InputOption $object */
+        if ($object->acceptValue() && null !== $object->getDefault() && (!is_array($object->getDefault()) || count($object->getDefault()))) {
+            $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($object->getDefault()));
+        } else {
+            $default = '';
+        }
+
+        $nameWidth = $this->nameWidth ?: strlen($object->getName());
+        $nameWithShortcutWidth = $nameWidth - strlen($object->getName()) - 2;
+
+        return sprintf(" <info>%s</info> %-${nameWithShortcutWidth}s%s%s%s",
+            '--'.$object->getName(),
+            $object->getShortcut() ? sprintf('(-%s) ', $object->getShortcut()) : '',
+            str_replace("\n", "\n".str_repeat(' ', $nameWidth + 2), $object->getDescription()),
+            $default,
+            $object->isArray() ? '<comment> (multiple values allowed)</comment>' : ''
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports($object)
+    {
+        return $object instanceof InputOption;
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
index c55c4ca03dbd0..a7f52da431c75 100644
--- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -53,12 +53,13 @@ public function testExecuteForApplicationCommand()
         $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
+
     public function testExecuteForApplicationCommandWithXmlOption()
     {
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
-        $commandTester->execute(array('command_name' => 'list', 'format' => 'xml'));
+        $commandTester->execute(array('command_name' => 'list', '--format' => 'xml'));
         $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
-        $this->assertRegExp('/<command/', $commandTester->getDisplay(), '->execute() returns an XML help text if --xml is passed');
+        $this->assertRegExp('/<command/', $commandTester->getDisplay(), '->execute() returns an XML help text if --format=xml is passed');
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php
new file mode 100644
index 0000000000000..5470744ca543a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Text;
+
+use Symfony\Component\Console\Descriptor\Text\ApplicationTextDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class ApplicationTextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new ApplicationTextDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getApplications();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php
new file mode 100644
index 0000000000000..c5aeb838e1019
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Text;
+
+use Symfony\Component\Console\Descriptor\Text\CommandTextDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class CommandTextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new CommandTextDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getCommands();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php
new file mode 100644
index 0000000000000..0f48099b0a8a8
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Text;
+
+use Symfony\Component\Console\Descriptor\Text\InputArgumentTextDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputArgumentTextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputArgumentTextDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputArguments();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php
new file mode 100644
index 0000000000000..9b710bf5e98d8
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Text;
+
+use Symfony\Component\Console\Descriptor\Text\InputDefinitionTextDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputDefinitionTextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputDefinitionTextDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputDefinitions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php
new file mode 100644
index 0000000000000..3f0ceb798cb6b
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor\Text;
+
+use Symfony\Component\Console\Descriptor\Text\InputOptionTextDescriptor;
+use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
+use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
+
+class InputOptionTextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new InputOptionTextDescriptor();
+    }
+
+    protected function getObjects()
+    {
+        return ObjectsProvider::getInputOptions();
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
new file mode 100644
index 0000000000000..5488ae7873827
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
@@ -0,0 +1,17 @@
+<info>Console Tool</info>
+
+<comment>Usage:</comment>
+  [options] command [arguments]
+
+<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>--version</info>        <info>-V</info> Display this application version.
+  <info>--ansi</info>              Force ANSI output.
+  <info>--no-ansi</info>           Disable ANSI output.
+  <info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.
+
+<comment>Available commands:</comment>
+  <info>help  </info> Displays help for a command
+  <info>list  </info> Lists commands
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
new file mode 100644
index 0000000000000..a677c3fda9d13
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
@@ -0,0 +1,22 @@
+<info>My Symfony application</info> version <comment>v1.0</comment>
+
+<comment>Usage:</comment>
+  [options] command [arguments]
+
+<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>--version</info>        <info>-V</info> Display this application version.
+  <info>--ansi</info>              Force ANSI output.
+  <info>--no-ansi</info>           Disable ANSI output.
+  <info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.
+
+<comment>Available commands:</comment>
+  <info>alias1               </info> command 1 description
+  <info>alias2               </info> command 1 description
+  <info>help                 </info> Displays help for a command
+  <info>list                 </info> Lists commands
+<comment>descriptor</comment>
+  <info>descriptor:command1  </info> command 1 description
+  <info>descriptor:command2  </info> command 2 description
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_1.txt
new file mode 100644
index 0000000000000..2375ac0e63d8d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_1.txt
@@ -0,0 +1,7 @@
+<comment>Usage:</comment>
+ descriptor:command1
+
+<comment>Aliases:</comment> <info>alias1, alias2</info>
+
+<comment>Help:</comment>
+ command 1 help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt
new file mode 100644
index 0000000000000..1da9f3d29fa05
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt
@@ -0,0 +1,11 @@
+<comment>Usage:</comment>
+ descriptor:command2 [-o|--option_name] argument_name
+
+<comment>Arguments:</comment>
+ <info>argument_name     </info> 
+
+<comment>Options:</comment>
+ <info>--option_name</info> (-o) 
+
+<comment>Help:</comment>
+ command 2 help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~
new file mode 100644
index 0000000000000..77e000213dd26
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~
@@ -0,0 +1,12 @@
+<comment>Usage:</comment>
+ descriptor:command2 [-o|--option_name] argument_name
+
+<comment>Aliases:</comment> <info>alias1, alias2</info>
+<comment>Arguments:</comment>
+ <info>argument_name     </info> 
+
+<comment>Options:</comment>
+ <info>--option_name</info> (-o) 
+
+<comment>Help:</comment>
+ command 2 help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.txt
new file mode 100644
index 0000000000000..111e5157f892d
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_1.txt
@@ -0,0 +1 @@
+ <info>argument_name</info>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.txt
new file mode 100644
index 0000000000000..9497b1ce01a96
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_2.txt
@@ -0,0 +1 @@
+ <info>argument_name</info> argument description
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.txt
new file mode 100644
index 0000000000000..c421fc9117cad
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_argument_3.txt
@@ -0,0 +1 @@
+ <info>argument_name</info> argument description<comment> (default: "default_value")</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_1.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.txt
new file mode 100644
index 0000000000000..0db9f66263a71
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_2.txt
@@ -0,0 +1,2 @@
+<comment>Arguments:</comment>
+ <info>argument_name </info>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.txt
new file mode 100644
index 0000000000000..c6fb2ccc7b5b1
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_3.txt
@@ -0,0 +1,2 @@
+<comment>Options:</comment>
+ <info>--option_name</info> (-o)
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt
new file mode 100644
index 0000000000000..e17c61c3adf4b
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt
@@ -0,0 +1,5 @@
+<comment>Arguments:</comment>
+ <info>argument_name     </info> 
+
+<comment>Options:</comment>
+ <info>--option_name</info> (-o)
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~
new file mode 100644
index 0000000000000..1a530ffa2ef08
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~
@@ -0,0 +1,5 @@
+<comment>Arguments:</comment>
+ <info>argument_name     </info>
+
+<comment>Options:</comment>
+ <info>--option_name</info> (-o)
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.txt
new file mode 100644
index 0000000000000..daf83d07ea748
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_1.txt
@@ -0,0 +1 @@
+ <info>--option_name</info> (-o)
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.txt
new file mode 100644
index 0000000000000..627e3c1ce5db8
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_2.txt
@@ -0,0 +1 @@
+ <info>--option_name</info> (-o) option description<comment> (default: "default_value")</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.txt
new file mode 100644
index 0000000000000..b88b12d2b3e70
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.txt
@@ -0,0 +1 @@
+ <info>--option_name</info> (-o) option description
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.txt b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.txt
new file mode 100644
index 0000000000000..5dba5e6e87422
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.txt
@@ -0,0 +1 @@
+ <info>--option_name</info> (-o) option description<comment> (multiple values allowed)</comment>

From 27aa872544b8ef0161dba00c9214cc40caff4a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Wed, 10 Apr 2013 07:33:08 +0200
Subject: [PATCH 10/24] [Console] repaired tests

---
 .../Command/AbstractDescriptionCommand.php    |  4 +-
 .../Console/Descriptor/CommandDescription.php | 85 +++++++++++++++++++
 .../Descriptor/Json/CommandJsonDescriptor.php | 16 ++--
 .../Markdown/CommandMarkdownDescriptor.php    | 18 ++--
 .../Text/AbstractTextDescriptor.php           |  2 +-
 .../Descriptor/Text/CommandTextDescriptor.php | 10 ++-
 .../Descriptor/Xml/CommandXmlDescriptor.php   | 17 ++--
 .../Console/Helper/DescriptorHelper.php       |  2 +-
 .../Console/Tests/Fixtures/application_1.json |  2 +-
 .../Console/Tests/Fixtures/application_1.md   |  8 +-
 .../Console/Tests/Fixtures/application_1.xml  |  8 +-
 .../Console/Tests/Fixtures/application_2.json |  2 +-
 .../Console/Tests/Fixtures/application_2.md   |  8 +-
 .../Console/Tests/Fixtures/application_2.xml  |  8 +-
 .../Tests/Fixtures/application_run2.txt       | 11 +--
 .../Tests/Fixtures/application_run3.txt       | 20 ++---
 16 files changed, 157 insertions(+), 64 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/CommandDescription.php

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
index ad0d75b46bd96..5c8597807f73b 100644
--- a/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
+++ b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
@@ -39,8 +39,8 @@ protected function configure()
     protected function createDefinition()
     {
         return new InputDefinition(array(
-            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats'),
-            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
+            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats.'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
         ));
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/CommandDescription.php b/src/Symfony/Component/Console/Descriptor/CommandDescription.php
new file mode 100644
index 0000000000000..835914751a6b4
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/CommandDescription.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputDefinition;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class CommandDescription
+{
+    /**
+     * @var Command
+     */
+    private $command;
+    
+    /**
+     * @param Command $command
+     */
+    public function __construct(Command $command)
+    {
+        $this->command = $command;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->command->getName();
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->command->getDescription();
+    }
+
+    /**
+     * @return array
+     */
+    public function getAliases()
+    {
+        return $this->command->getAliases();
+    }
+
+    /**
+     * @return string
+     */
+    public function getSynopsis()
+    {
+        return $this->command->getSynopsis();
+    }
+
+    /**
+     * @return string
+     */
+    public function getHelp()
+    {
+        return $this->command->getProcessedHelp();
+    }
+
+    /**
+     * @return InputDefinition
+     */
+    public function getDefinition()
+    {
+        $method = new \ReflectionMethod($this->command, 'getNativeDefinition');
+        $method->setAccessible(true);
+
+        return $method->invoke($this->command);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
index 85d35aa6cf21f..433b4aef66f35 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -24,15 +25,16 @@ class CommandJsonDescriptor extends AbstractJsonDescriptor
     public function getData($object)
     {
         $definitionDescriptor = new InputDefinitionJsonDescriptor();
-
         /** @var Command $object */
+        $description = new CommandDescription($object);
+
         return array(
-            'name'        => $object->getName(),
-            'usage'       => $object->getSynopsis(),
-            'description' => $object->getDescription(),
-            'help'        => $object->getProcessedHelp(),
-            'aliases'     => $object->getAliases(),
-            'definition'  => $definitionDescriptor->getData($object->getDefinition()),
+            'name'        => $description->getName(),
+            'usage'       => $description->getSynopsis(),
+            'description' => $description->getDescription(),
+            'help'        => $description->getHelp(),
+            'aliases'     => $description->getAliases(),
+            'definition'  => $definitionDescriptor->getData($description->getDefinition()),
         );
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
index 4e8a509ccf9a0..ea3ff33ce8ee0 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -23,20 +24,19 @@ class CommandMarkdownDescriptor extends AbstractMarkdownDescriptor
      */
     public function getDocument($object)
     {
+        /** @var Command $object */
+        $description = new CommandDescription($object);
         $definitionDescriptor = new InputDefinitionMarkdownDescriptor();
 
-        $object->getProcessedHelp();
-
-        /** @var Command $object */
         return new Document\Document(array(
-            new Document\Title($object->getName(), 2),
+            new Document\Title($description->getName(), 2),
             new Document\UnorderedList(array(
-                'Description: '.($object->getDescription() ?: '<none>'),
-                'Usage: `'.$object->getSynopsis().'`',
-                'Aliases: '.(count($object->getAliases()) ? '`'.implode('`, `', $object->getAliases()).'`' : '<none>'),
+                'Description: '.($description->getDescription() ?: '<none>'),
+                'Usage: `'.$description->getSynopsis().'`',
+                'Aliases: '.(count($description->getAliases()) ? '`'.implode('`, `', $description->getAliases()).'`' : '<none>'),
             )),
-            new Document\Paragraph($object->getProcessedHelp()),
-            $definitionDescriptor->getDocument($object->getDefinition()),
+            new Document\Paragraph($description->getHelp()),
+            $definitionDescriptor->getDocument($description->getDefinition()),
         ));
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
index 57e7df01a4d7f..bd6bcecb1d977 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
@@ -82,7 +82,7 @@ public function getFormat()
      */
     public function useFormatting()
     {
-        return false;
+        return true;
     }
 
     protected function formatDefaultValue($default)
diff --git a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
index b100dfe29b5f8..3d31bb7afcde2 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Descriptor\Text;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\CommandDescription;
 use Symfony\Component\Console\Input\InputDefinition;
 
 /**
@@ -33,16 +34,17 @@ public function getRawText($object)
     public function getFormattedText($object)
     {
         /** @var Command $object */
-        $messages = array('<comment>Usage:</comment>', ' '.$object->getSynopsis(), '');
+        $description = new CommandDescription($object);
+        $messages = array('<comment>Usage:</comment>', ' '.$description->getSynopsis(), '');
 
         if ($object->getAliases()) {
-            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $object->getAliases()).'</info>';
+            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $description->getAliases()).'</info>';
         }
 
         $descriptor = new InputDefinitionTextDescriptor();
-        $messages[] = $descriptor->getFormattedText($object->getDefinition());
+        $messages[] = $descriptor->getFormattedText($description->getDefinition());
 
-        if ($help = $object->getProcessedHelp()) {
+        if ($help = $description->getHelp()) {
             $messages[] = '<comment>Help:</comment>';
             $messages[] = ' '.str_replace("\n", "\n ", $help)."\n";
         }
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
index 21f8b45f966c8..abf9e424f94a1 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Console\Descriptor\Xml;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -27,26 +28,28 @@ public function buildDocument(\DOMNode $parent, $object)
         $parent->appendChild($commandXML = $dom->createElement('command'));
 
         /** @var Command $object */
-        $commandXML->setAttribute('id', $object->getName());
-        $commandXML->setAttribute('name', $object->getName());
+        $description = new CommandDescription($object);
+        
+        $commandXML->setAttribute('id', $description->getName());
+        $commandXML->setAttribute('name', $description->getName());
 
         $commandXML->appendChild($usageXML = $dom->createElement('usage'));
-        $usageXML->appendChild($dom->createTextNode(sprintf($object->getSynopsis(), '')));
+        $usageXML->appendChild($dom->createTextNode(sprintf($description->getSynopsis(), '')));
 
         $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getDescription())));
+        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $description->getDescription())));
 
         $commandXML->appendChild($helpXML = $dom->createElement('help'));
-        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getProcessedHelp())));
+        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $description->getHelp())));
 
         $commandXML->appendChild($aliasesXML = $dom->createElement('aliases'));
-        foreach ($object->getAliases() as $alias) {
+        foreach ($description->getAliases() as $alias) {
             $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
             $aliasXML->appendChild($dom->createTextNode($alias));
         }
 
         $descriptor = new InputDefinitionXmlDescriptor();
-        $descriptor->buildDocument($commandXML, $object->getDefinition());
+        $descriptor->buildDocument($commandXML, $description->getDefinition());
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index c947f991a22cf..e960f9f65e71f 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -48,7 +48,7 @@ public function describe(OutputInterface $output, $object, $format = null, $raw
     {
         $format = $format ?: $this->provider->getDefaultFormat();
         $descriptor = $this->provider->configure(array('raw_text' => $raw))->get($object, $format);
-        $type = $raw && $descriptor->useFormatting() ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
+        $type = !$raw && $descriptor->useFormatting() ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
 
         $output->writeln($descriptor->describe($object), $type);
     }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index 085989bd58cd0..b6d28b34f34ac 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 list","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
+{"commands":[{"name":"help","usage":"help [--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":{"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 list.","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index 19fb2aa422ec0..73c54c1eebf03 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -40,7 +40,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats
+* Description: To output help in other formats.
 * Default: `NULL`
 
 **raw:**
@@ -50,7 +50,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list
+* Description: To output raw command list.
 * Default: `false`
 
 list
@@ -95,7 +95,7 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats
+* Description: To output help in other formats.
 * Default: `NULL`
 
 **raw:**
@@ -105,5 +105,5 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list
+* Description: To output raw command list.
 * Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index 38ea50b126d80..75b589e5b1422 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -24,10 +24,10 @@
       </arguments>
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats</description>
+          <description>To output help in other formats.</description>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
+          <description>To output raw command list.</description>
         </option>
       </options>
     </command>
@@ -58,10 +58,10 @@
       </arguments>
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats</description>
+          <description>To output help in other formats.</description>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
+          <description>To output raw command list.</description>
         </option>
       </options>
     </command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index f7a1386f021b7..38167cee4bfbb 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 list","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
+{"commands":[{"name":"help","usage":"help [--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":{"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 list.","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index cd21bdd1aa7f7..98cbff1a9ee9f 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -47,7 +47,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats
+* Description: To output help in other formats.
 * Default: `NULL`
 
 **raw:**
@@ -57,7 +57,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list
+* Description: To output raw command list.
 * Default: `false`
 
 list
@@ -102,7 +102,7 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats
+* Description: To output help in other formats.
 * Default: `NULL`
 
 **raw:**
@@ -112,7 +112,7 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list
+* Description: To output raw command list.
 * Default: `false`
 
 descriptor:command1
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index 2fda065c6fc83..0ccdaf3cb4ecf 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -24,10 +24,10 @@
       </arguments>
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats</description>
+          <description>To output help in other formats.</description>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
+          <description>To output raw command list.</description>
         </option>
       </options>
     </command>
@@ -58,10 +58,10 @@
       </arguments>
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats</description>
+          <description>To output help in other formats.</description>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
+          <description>To output raw command list.</description>
         </option>
       </options>
     </command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
index 8b17c7f6bb0f7..dc35636d6192e 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
@@ -1,5 +1,5 @@
 Usage:
- help [--xml] [command_name]
+ help [--format="..."] [--raw] [command_name]
 
 Arguments:
  command               The command to execute
@@ -7,6 +7,7 @@ Arguments:
 
 Options:
  --format              To output help in other formats.
+ --raw                 To output raw command list.
  --help (-h)           Display this help message.
  --quiet (-q)          Do not output any message.
  --verbose (-v)        Increase verbosity of messages.
@@ -17,12 +18,12 @@ Options:
 
 Help:
  The help command displays help for a given command:
-
+ 
    php app/console help list
-
+ 
  You can also output the help in other formats by using the --format option:
-
+ 
    php app/console help --format=xml list
-
+ 
  To display the list of available commands, please use the list command.
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
index a203c737e4147..7f84cfcce9754 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
@@ -1,27 +1,27 @@
 Usage:
- list [--xml] [--raw] [namespace]
+ list [--format="..."] [--raw] [namespace]
 
 Arguments:
  namespace  The namespace name
 
 Options:
- --format   To output help in other formats
- --raw      To output raw command list
+ --format   To output help in other formats.
+ --raw      To output raw command list.
 
 Help:
  The list command lists all commands:
-
+ 
    php app/console list
-
+ 
  You can also display the commands for a specific namespace:
-
+ 
    php app/console list test
-
+ 
  You can also output the information in other formats by using the --format option:
-
+ 
    php app/console list --format=xml
-
+ 
  It's also possible to get raw list of commands (useful for embedding command runner):
-
+ 
    php app/console list --raw
 

From 30d88073111a460ff947955ebd35adc98951b50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 07:38:25 +0200
Subject: [PATCH 11/24] [Console] re-introduced asText & asXml methods to avoid
 BC break

---
 src/Symfony/Component/Console/Application.php |  43 ++++++
 .../Component/Console/Command/Command.php     |  39 ++++++
 .../Xml/InputOptionXmlDescriptor.php          |   2 +-
 .../Console/Input/InputDefinition.php         |  41 ++++++
 .../Console/Tests/ApplicationTest.php         |  18 +++
 .../Console/Tests/Command/CommandTest.php     |  18 +++
 .../Console/Tests/Fixtures/application_1.xml  |   2 +
 .../Console/Tests/Fixtures/application_2.xml  |   2 +
 .../Tests/Fixtures/application_astext1.txt    |  20 +++
 .../Tests/Fixtures/application_astext2.txt    |  16 +++
 .../Tests/Fixtures/application_asxml1.txt     | 131 ++++++++++++++++++
 .../Tests/Fixtures/application_asxml2.txt     |  37 +++++
 .../Console/Tests/Fixtures/command_astext.txt |  18 +++
 .../Console/Tests/Fixtures/command_asxml.txt  |  38 +++++
 .../Tests/Fixtures/definition_astext.txt      |  11 ++
 .../Tests/Fixtures/definition_asxml.txt       |  39 ++++++
 .../Console/Tests/Fixtures/input_option_3.xml |   1 +
 .../Console/Tests/Fixtures/input_option_4.xml |   1 +
 .../Tests/Input/InputDefinitionTest.php       |  28 ++++
 19 files changed, 504 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt
 create mode 100644 src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 245bf254878a7..73e35b803f7ee 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Console;
 
+use Symfony\Component\Console\Descriptor\Text\ApplicationTextDescriptor;
+use Symfony\Component\Console\Descriptor\Xml\ApplicationXmlDescriptor;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -680,6 +682,47 @@ public static function getAbbreviations($names)
         return $abbrevs;
     }
 
+    /**
+     * Returns a text representation of the Application.
+     *
+     * @param string  $namespace An optional namespace name
+     * @param boolean $raw       Whether to return raw command list
+     *
+     * @return string A string representing the Application
+     *
+     * @deprecated
+     */
+    public function asText($namespace = null, $raw = false)
+    {
+        $descriptor = new ApplicationTextDescriptor($namespace, $raw);
+
+        return $descriptor->describe($this);
+    }
+
+    /**
+     * Returns an XML representation of the Application.
+     *
+     * @param string  $namespace An optional namespace name
+     * @param Boolean $asDom     Whether to return a DOM or an XML string
+     *
+     * @return string|\DOMDocument An XML string representing the Application
+     *
+     * @deprecated
+     */
+    public function asXml($namespace = null, $asDom = false)
+    {
+        $descriptor = new ApplicationXmlDescriptor($namespace);
+
+        if ($asDom) {
+            $dom = new \DOMDocument('1.0', 'UTF-8');
+            $descriptor->buildDocument($dom, $this);
+
+            return $dom;
+        }
+
+        return $descriptor->describe($this);
+    }
+
     /**
      * Renders a caught exception.
      *
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 870a65b548aff..86ac27e6b2bb2 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Console\Command;
 
+use Symfony\Component\Console\Descriptor\Text\CommandTextDescriptor;
+use Symfony\Component\Console\Descriptor\Xml\CommandXmlDescriptor;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
@@ -555,6 +557,43 @@ public function getHelper($name)
         return $this->helperSet->get($name);
     }
 
+    /**
+     * Returns a text representation of the command.
+     *
+     * @return string A string representing the command
+     *
+     * @deprecated
+     */
+    public function asText()
+    {
+        $descriptor = new CommandTextDescriptor();
+
+        return $descriptor->describe($this);
+    }
+
+    /**
+     * Returns an XML representation of the command.
+     *
+     * @param Boolean $asDom Whether to return a DOM or an XML string
+     *
+     * @return string|\DOMDocument An XML string representing the command
+     *
+     * @deprecated
+     */
+    public function asXml($asDom = false)
+    {
+        $descriptor = new CommandXmlDescriptor();
+
+        if ($asDom) {
+            $dom = new \DOMDocument('1.0', 'UTF-8');
+            $descriptor->buildDocument($dom, $this);
+
+            return $dom;
+        }
+
+        return $descriptor->describe($this);
+    }
+
     private function validateName($name)
     {
         if (!preg_match('/^[^\:]+(\:[^\:]+)*$/', $name)) {
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
index 40870b8d41e1b..f11a7f26f728e 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
@@ -37,9 +37,9 @@ public function buildDocument(\DOMNode $parent, $object)
 
         if ($object->acceptValue()) {
             $defaults = is_array($object->getDefault()) ? $object->getDefault() : (is_bool($object->getDefault()) ? array(var_export($object->getDefault(), true)) : ($object->getDefault() ? array($object->getDefault()) : array()));
+            $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
 
             if (!empty($defaults)) {
-                $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
                 foreach ($defaults as $default) {
                     $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
                     $defaultXML->appendChild($dom->createTextNode($default));
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index 4c5dcf3b574dd..18617a0e95e93 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\Console\Input;
 
+use Symfony\Component\Console\Descriptor\Text\InputDefinitionTextDescriptor;
+use Symfony\Component\Console\Descriptor\Xml\InputDefinitionXmlDescriptor;
+
 /**
  * A InputDefinition represents a set of valid command line arguments and options.
  *
@@ -399,4 +402,42 @@ public function getSynopsis()
 
         return implode(' ', $elements);
     }
+
+
+    /**
+     * Returns a textual representation of the InputDefinition.
+     *
+     * @return string A string representing the InputDefinition
+     *
+     * @deprecated
+     */
+    public function asText()
+    {
+        $descriptor = new InputDefinitionTextDescriptor();
+
+        return $descriptor->describe($this);
+    }
+
+    /**
+     * Returns an XML representation of the InputDefinition.
+     *
+     * @param Boolean $asDom Whether to return a DOM or an XML string
+     *
+     * @return string|\DOMDocument An XML string representing the InputDefinition
+     *
+     * @deprecated
+     */
+    public function asXml($asDom = false)
+    {
+        $descriptor = new InputDefinitionXmlDescriptor();
+
+        if ($asDom) {
+            $dom = new \DOMDocument('1.0', 'UTF-8');
+            $descriptor->buildDocument($dom, $this);
+
+            return $dom;
+        }
+
+        return $descriptor->describe($this);
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index 783d364dc1d1a..f2614bfa37e26 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -392,6 +392,24 @@ public function testSetCatchExceptions()
         }
     }
 
+    public function testAsText()
+    {
+        $application = new Application();
+        $application->add(new \FooCommand);
+        $this->ensureStaticCommandHelp($application);
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_astext1.txt', $this->normalizeLineBreaks($application->asText()), '->asText() returns a text representation of the application');
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_astext2.txt', $this->normalizeLineBreaks($application->asText('foo')), '->asText() returns a text representation of the application');
+    }
+
+    public function testAsXml()
+    {
+        $application = new Application();
+        $application->add(new \FooCommand);
+        $this->ensureStaticCommandHelp($application);
+        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/application_asxml1.txt', $application->asXml(), '->asXml() returns an XML representation of the application');
+        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/application_asxml2.txt', $application->asXml('foo'), '->asXml() returns an XML representation of the application');
+    }
+
     public function testRenderException()
     {
         $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index 3aa990f9be083..acbe2ea10ce38 100644
--- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -280,4 +280,22 @@ public function callableMethodCommand(InputInterface $input, OutputInterface $ou
     {
         $output->writeln('from the code...');
     }
+
+    public function testAsText()
+    {
+        $command = new \TestCommand();
+        $command->setApplication(new Application());
+        $tester = new CommandTester($command);
+        $tester->execute(array('command' => $command->getName()));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/command_astext.txt', $command->asText(), '->asText() returns a text representation of the command');
+    }
+
+    public function testAsXml()
+    {
+        $command = new \TestCommand();
+        $command->setApplication(new Application());
+        $tester = new CommandTester($command);
+        $tester->execute(array('command' => $command->getName()));
+        $this->assertXmlStringEqualsXmlFile(self::$fixturesPath.'/command_asxml.txt', $command->asXml(), '->asXml() returns an XML representation of the command');
+    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index 75b589e5b1422..221cc33e93026 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -25,6 +25,7 @@
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
           <description>To output help in other formats.</description>
+          <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
@@ -59,6 +60,7 @@
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
           <description>To output help in other formats.</description>
+          <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index 0ccdaf3cb4ecf..6cd652bfcf494 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -25,6 +25,7 @@
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
           <description>To output help in other formats.</description>
+          <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
@@ -59,6 +60,7 @@
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
           <description>To output help in other formats.</description>
+          <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
new file mode 100644
index 0000000000000..2f692c07e0a8f
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
@@ -0,0 +1,20 @@
+<info>Console Tool</info>
+
+<comment>Usage:</comment>
+  [options] command [arguments]
+
+<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>--version</info>        <info>-V</info> Display this application version.
+  <info>--ansi</info>              Force ANSI output.
+  <info>--no-ansi</info>           Disable ANSI output.
+  <info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.
+
+<comment>Available commands:</comment>
+  <info>afoobar  </info> The foo:bar command
+  <info>help     </info> Displays help for a command
+  <info>list     </info> Lists commands
+<comment>foo</comment>
+  <info>foo:bar  </info> The foo:bar command
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
new file mode 100644
index 0000000000000..1457bf793d6c1
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
@@ -0,0 +1,16 @@
+<info>Console Tool</info>
+
+<comment>Usage:</comment>
+  [options] command [arguments]
+
+<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>--version</info>        <info>-V</info> Display this application version.
+  <info>--ansi</info>              Force ANSI output.
+  <info>--no-ansi</info>           Disable ANSI output.
+  <info>--no-interaction</info> <info>-n</info> Do not ask any interactive question.
+
+<comment>Available commands for the "foo" namespace:</comment>
+  <info>foo:bar  </info> The foo:bar command
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
new file mode 100644
index 0000000000000..efa4fbff649d4
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands>
+    <command id="help" name="help">
+  <usage>help [--format="..."] [--raw] [command_name]</usage>
+  <description>Displays help for a command</description>
+  <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+ 
+   &lt;info&gt;php app/console help list&lt;/info&gt;
+ 
+ You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
+ 
+ To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
+  <aliases />
+  <arguments>
+    <argument name="command_name" is_required="0" is_array="0">
+      <description>The command name</description>
+      <defaults>
+        <default>help</default>
+      </defaults>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+      <description>To output help in other formats.</description>
+      <defaults/>
+    </option>
+    <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>To output raw command list.</description>
+    </option>
+    <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>
+    <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Display this application version.</description>
+    </option>
+    <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Force ANSI output.</description>
+    </option>
+    <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Disable ANSI output.</description>
+    </option>
+    <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Do not ask any interactive question.</description>
+    </option>
+  </options>
+</command>
+    <command id="list" name="list">
+  <usage>list [--format="..."] [--raw] [namespace]</usage>
+  <description>Lists commands</description>
+  <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+ 
+   &lt;info&gt;php app/console list&lt;/info&gt;
+ 
+ You can also display the commands for a specific namespace:
+ 
+   &lt;info&gt;php app/console list test&lt;/info&gt;
+ 
+ You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
+ 
+   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
+ 
+ It's also possible to get raw list of commands (useful for embedding command runner):
+ 
+   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
+  <aliases/>
+  <arguments>
+    <argument name="namespace" is_required="0" is_array="0">
+      <description>The namespace name</description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+      <description>To output help in other formats.</description>
+      <defaults/>
+    </option>
+    <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>To output raw command list.</description>
+    </option>
+  </options>
+</command>
+    <command id="foo:bar" name="foo:bar">
+  <usage>foo:bar</usage>
+  <description>The foo:bar command</description>
+  <help/>
+  <aliases>
+    <alias>afoobar</alias>
+  </aliases>
+  <arguments/>
+    <options>
+      <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Display this help message.</description>
+      </option>
+      <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>
+      <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Display this application version.</description>
+      </option>
+      <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Force ANSI output.</description>
+      </option>
+      <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Disable ANSI output.</description>
+      </option>
+      <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Do not ask any interactive question.</description>
+      </option>
+    </options>
+</command>
+  </commands>
+  <namespaces>
+    <namespace id="_global">
+      <command>afoobar</command>
+      <command>help</command>
+      <command>list</command>
+    </namespace>
+    <namespace id="foo">
+      <command>foo:bar</command>
+    </namespace>
+  </namespaces>
+</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
new file mode 100644
index 0000000000000..ef92f85cbfe07
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<symfony>
+  <commands namespace="foo">
+    <command id="foo:bar" name="foo:bar">
+  <usage>foo:bar</usage>
+  <description>The foo:bar command</description>
+  <help/>
+  <aliases>
+    <alias>afoobar</alias>
+  </aliases>
+  <arguments/>
+    <options>
+      <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Display this help message.</description>
+      </option>
+      <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>
+      <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Display this application version.</description>
+      </option>
+      <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Force ANSI output.</description>
+      </option>
+      <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Disable ANSI output.</description>
+      </option>
+      <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+        <description>Do not ask any interactive question.</description>
+      </option>
+    </options>
+</command>
+  </commands>
+</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
new file mode 100644
index 0000000000000..e5999030e3679
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
@@ -0,0 +1,18 @@
+<comment>Usage:</comment>
+ namespace:name
+
+<comment>Aliases:</comment> <info>name</info>
+<comment>Arguments:</comment>
+ <info>command              </info> The command to execute
+
+<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>--version</info> (-V)        Display this application version.
+ <info>--ansi</info>                Force ANSI output.
+ <info>--no-ansi</info>             Disable ANSI output.
+ <info>--no-interaction</info> (-n) Do not ask any interactive question.
+
+<comment>Help:</comment>
+ help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
new file mode 100644
index 0000000000000..806c5a567089a
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<command id="namespace:name" name="namespace:name">
+  <usage>namespace:name</usage>
+  <description>description</description>
+  <help>help</help>
+  <aliases>
+    <alias>name</alias>
+  </aliases>
+  <arguments>
+    <argument name="command" is_required="1" is_array="0">
+      <description>The command to execute</description>
+      <defaults/>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Display this help message.</description>
+    </option>
+    <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>
+    <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Display this application version.</description>
+    </option>
+    <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Force ANSI output.</description>
+    </option>
+    <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Disable ANSI output.</description>
+    </option>
+    <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Do not ask any interactive question.</description>
+    </option>
+  </options>
+</command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt b/src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt
new file mode 100644
index 0000000000000..a7d7e0d5134ec
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/definition_astext.txt
@@ -0,0 +1,11 @@
+<comment>Arguments:</comment>
+ <info>foo       </info> The foo argument
+ <info>baz       </info> The baz argument<comment> (default: true)</comment>
+ <info>bar       </info> The bar argument<comment> (default: ["http://foo.com/"])</comment>
+
+<comment>Options:</comment>
+ <info>--foo</info> (-f) The foo option
+ <info>--baz</info>      The baz option<comment> (default: false)</comment>
+ <info>--bar</info> (-b) The bar option<comment> (default: "bar")</comment>
+ <info>--qux</info>      The qux option<comment> (default: ["http://foo.com/","bar"])</comment><comment> (multiple values allowed)</comment>
+ <info>--qux2</info>     The qux2 option<comment> (default: {"foo":"bar"})</comment><comment> (multiple values allowed)</comment>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt b/src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt
new file mode 100644
index 0000000000000..eec8c079ee3ee
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Fixtures/definition_asxml.txt
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definition>
+  <arguments>
+    <argument name="foo" is_required="0" is_array="0">
+      <description>The foo argument</description>
+      <defaults/>
+    </argument>
+    <argument name="baz" is_required="0" is_array="0">
+      <description>The baz argument</description>
+      <defaults>
+        <default>true</default>
+      </defaults>
+    </argument>
+    <argument name="bar" is_required="0" is_array="1">
+      <description>The bar argument</description>
+      <defaults>
+        <default>bar</default>
+      </defaults>
+    </argument>
+  </arguments>
+  <options>
+    <option name="--foo" shortcut="-f" accept_value="1" is_value_required="1" is_multiple="0">
+      <description>The foo option</description>
+      <defaults/>
+    </option>
+    <option name="--baz" shortcut="" accept_value="1" is_value_required="0" is_multiple="0">
+      <description>The baz option</description>
+      <defaults>
+        <default>false</default>
+      </defaults>
+    </option>
+    <option name="--bar" shortcut="-b" accept_value="1" is_value_required="0" is_multiple="0">
+      <description>The bar option</description>
+      <defaults>
+        <default>bar</default>
+      </defaults>
+    </option>
+  </options>
+</definition>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml
index 52f87dfa92e9c..dcc0631cf4e6f 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_3.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <option name="--option_name" shortcut="-o" accept_value="1" is_value_required="1" is_multiple="0">
   <description>option description</description>
+  <defaults/>
 </option>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml
index 6eecd07ea879e..5e2418b14ade3 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/input_option_4.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <option name="--option_name" shortcut="-o" accept_value="1" is_value_required="0" is_multiple="1">
   <description>option description</description>
+  <defaults/>
 </option>
diff --git a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
index dd4a57ba847c8..76316bd863f68 100644
--- a/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
+++ b/src/Symfony/Component/Console/Tests/Input/InputDefinitionTest.php
@@ -364,6 +364,34 @@ public function testGetSynopsis()
         $this->assertEquals('foo1 ... [fooN]', $definition->getSynopsis(), '->getSynopsis() returns a synopsis of arguments and options');
     }
 
+    public function testAsText()
+    {
+        $definition = new InputDefinition(array(
+            new InputArgument('foo', InputArgument::OPTIONAL, 'The foo argument'),
+            new InputArgument('baz', InputArgument::OPTIONAL, 'The baz argument', true),
+            new InputArgument('bar', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'The bar argument', array('http://foo.com/')),
+            new InputOption('foo', 'f', InputOption::VALUE_REQUIRED, 'The foo option'),
+            new InputOption('baz', null, InputOption::VALUE_OPTIONAL, 'The baz option', false),
+            new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL, 'The bar option', 'bar'),
+            new InputOption('qux', '', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The qux option', array('http://foo.com/', 'bar')),
+            new InputOption('qux2', '', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY, 'The qux2 option', array('foo' => 'bar')),
+        ));
+        $this->assertStringEqualsFile(self::$fixtures.'/definition_astext.txt', $definition->asText(), '->asText() returns a textual representation of the InputDefinition');
+    }
+
+    public function testAsXml()
+    {
+        $definition = new InputDefinition(array(
+            new InputArgument('foo', InputArgument::OPTIONAL, 'The foo argument'),
+            new InputArgument('baz', InputArgument::OPTIONAL, 'The baz argument', true),
+            new InputArgument('bar', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'The bar argument', array('bar')),
+            new InputOption('foo', 'f', InputOption::VALUE_REQUIRED, 'The foo option'),
+            new InputOption('baz', null, InputOption::VALUE_OPTIONAL, 'The baz option', false),
+            new InputOption('bar', 'b', InputOption::VALUE_OPTIONAL, 'The bar option', 'bar'),
+        ));
+        $this->assertXmlStringEqualsXmlFile(self::$fixtures.'/definition_asxml.txt', $definition->asXml(), '->asText() returns a textual representation of the InputDefinition');
+    }
+
     protected function initializeArguments()
     {
         $this->foo = new InputArgument('foo');

From 996483826dfaa7a0e90babaac6bd3d9c5c5317ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 08:04:30 +0200
Subject: [PATCH 12/24] [Console] added command definition merge be fore
 description

---
 .../Console/Descriptor/CommandDescription.php |   6 +
 .../Descriptor/Text/CommandTextDescriptor.php |   1 -
 .../Console/Tests/Fixtures/application_1.json |   2 +-
 .../Console/Tests/Fixtures/application_1.md   |  70 ++++++
 .../Console/Tests/Fixtures/application_1.xml  |  21 ++
 .../Console/Tests/Fixtures/application_2.json |   2 +-
 .../Console/Tests/Fixtures/application_2.md   | 212 ++++++++++++++++++
 .../Console/Tests/Fixtures/application_2.xml  |  66 +++++-
 .../Tests/Fixtures/application_asxml1.txt     |   3 +
 9 files changed, 379 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Console/Descriptor/CommandDescription.php b/src/Symfony/Component/Console/Descriptor/CommandDescription.php
index 835914751a6b4..f5f80b9f37f85 100644
--- a/src/Symfony/Component/Console/Descriptor/CommandDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/CommandDescription.php
@@ -77,6 +77,12 @@ public function getHelp()
      */
     public function getDefinition()
     {
+        // ensure command definition is merged with application one
+        $method = new \ReflectionMethod($this->command, 'mergeApplicationDefinition');
+        $method->setAccessible(true);
+        $method->invoke($this->command, false);
+        
+        // reads native definition
         $method = new \ReflectionMethod($this->command, 'getNativeDefinition');
         $method->setAccessible(true);
 
diff --git a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
index 3d31bb7afcde2..98556cf8ae0c5 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Descriptor\CommandDescription;
-use Symfony\Component\Console\Input\InputDefinition;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index b6d28b34f34ac..1768d63740d03 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 list.","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
+{"commands":[{"name":"help","usage":"help [--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":{"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 list.","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 [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index 73c54c1eebf03..6d2c3e741b388 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -53,6 +53,76 @@ To display the list of available commands, please use the <info>list</info> comm
 * Description: To output raw command list.
 * Default: `false`
 
+**help:**
+
+* Name: `--help`
+* Shortcut: `-h`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this help message.
+* Default: `false`
+
+**quiet:**
+
+* Name: `--quiet`
+* Shortcut: `-q`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not output any message.
+* Default: `false`
+
+**verbose:**
+
+* Name: `--verbose`
+* Shortcut: `-v`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Increase verbosity of messages.
+* Default: `false`
+
+**version:**
+
+* Name: `--version`
+* Shortcut: `-V`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this application version.
+* Default: `false`
+
+**ansi:**
+
+* Name: `--ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Force ANSI output.
+* Default: `false`
+
+**no-ansi:**
+
+* Name: `--no-ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Disable ANSI output.
+* Default: `false`
+
+**no-interaction:**
+
+* Name: `--no-interaction`
+* Shortcut: `-n`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not ask any interactive question.
+* Default: `false`
+
 list
 ----
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index 221cc33e93026..c0fcadf9dd7cc 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -30,6 +30,27 @@
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
         </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message.</description>
+        </option>
+        <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>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version.</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output.</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output.</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question.</description>
+        </option>
       </options>
     </command>
     <command id="list" name="list">
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index 38167cee4bfbb..b4635ab414db6 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 list.","default":false}}}},{"name":"list","usage":"list [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":[]}},{"name":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","default":false}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
+{"commands":[{"name":"help","usage":"help [--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":{"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 list.","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 [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index 98cbff1a9ee9f..c5ddb45675692 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -60,6 +60,76 @@ To display the list of available commands, please use the <info>list</info> comm
 * Description: To output raw command list.
 * Default: `false`
 
+**help:**
+
+* Name: `--help`
+* Shortcut: `-h`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this help message.
+* Default: `false`
+
+**quiet:**
+
+* Name: `--quiet`
+* Shortcut: `-q`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not output any message.
+* Default: `false`
+
+**verbose:**
+
+* Name: `--verbose`
+* Shortcut: `-v`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Increase verbosity of messages.
+* Default: `false`
+
+**version:**
+
+* Name: `--version`
+* Shortcut: `-V`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this application version.
+* Default: `false`
+
+**ansi:**
+
+* Name: `--ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Force ANSI output.
+* Default: `false`
+
+**no-ansi:**
+
+* Name: `--no-ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Disable ANSI output.
+* Default: `false`
+
+**no-interaction:**
+
+* Name: `--no-interaction`
+* Shortcut: `-n`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not ask any interactive question.
+* Default: `false`
+
 list
 ----
 
@@ -124,6 +194,78 @@ descriptor:command1
 
 command 1 help
 
+### Options:
+
+**help:**
+
+* Name: `--help`
+* Shortcut: `-h`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this help message.
+* Default: `false`
+
+**quiet:**
+
+* Name: `--quiet`
+* Shortcut: `-q`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not output any message.
+* Default: `false`
+
+**verbose:**
+
+* Name: `--verbose`
+* Shortcut: `-v`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Increase verbosity of messages.
+* Default: `false`
+
+**version:**
+
+* Name: `--version`
+* Shortcut: `-V`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this application version.
+* Default: `false`
+
+**ansi:**
+
+* Name: `--ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Force ANSI output.
+* Default: `false`
+
+**no-ansi:**
+
+* Name: `--no-ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Disable ANSI output.
+* Default: `false`
+
+**no-interaction:**
+
+* Name: `--no-interaction`
+* Shortcut: `-n`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not ask any interactive question.
+* Default: `false`
+
 descriptor:command2
 -------------------
 
@@ -154,3 +296,73 @@ command 2 help
 * Is multiple: no
 * Description: <none>
 * Default: `false`
+
+**help:**
+
+* Name: `--help`
+* Shortcut: `-h`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this help message.
+* Default: `false`
+
+**quiet:**
+
+* Name: `--quiet`
+* Shortcut: `-q`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not output any message.
+* Default: `false`
+
+**verbose:**
+
+* Name: `--verbose`
+* Shortcut: `-v`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Increase verbosity of messages.
+* Default: `false`
+
+**version:**
+
+* Name: `--version`
+* Shortcut: `-V`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Display this application version.
+* Default: `false`
+
+**ansi:**
+
+* Name: `--ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Force ANSI output.
+* Default: `false`
+
+**no-ansi:**
+
+* Name: `--no-ansi`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Disable ANSI output.
+* Default: `false`
+
+**no-interaction:**
+
+* Name: `--no-interaction`
+* Shortcut: `-n`
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: Do not ask any interactive question.
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index 6cd652bfcf494..8ee61bbfe44fd 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -30,6 +30,27 @@
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
         </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message.</description>
+        </option>
+        <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>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version.</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output.</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output.</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question.</description>
+        </option>
       </options>
     </command>
     <command id="list" name="list">
@@ -76,7 +97,29 @@
         <alias>alias2</alias>
       </aliases>
       <arguments/>
-      <options/>
+      <options>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message.</description>
+        </option>
+        <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>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version.</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output.</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output.</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question.</description>
+        </option>
+      </options>
     </command>
     <command id="descriptor:command2" name="descriptor:command2">
       <usage>descriptor:command2 [-o|--option_name] argument_name</usage>
@@ -93,6 +136,27 @@
         <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
           <description></description>
         </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message.</description>
+        </option>
+        <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>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version.</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output.</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output.</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question.</description>
+        </option>
       </options>
     </command>
   </commands>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
index efa4fbff649d4..50a63e20626ad 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -30,6 +30,9 @@
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
       <description>To output raw command list.</description>
     </option>
+    <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>Display this help message.</description>
+    </option>
     <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Do not output any message.</description>
     </option>

From ef6d8ba93a3b7526e28be1740fe7dc884a0fd4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 08:15:39 +0200
Subject: [PATCH 13/24] [Console] simplified description commands

---
 .../Command/AbstractDescriptionCommand.php    | 58 -------------------
 .../Component/Console/Command/HelpCommand.php | 23 +++-----
 .../Component/Console/Command/ListCommand.php | 19 +++---
 .../Console/Helper/DescriptorHelper.php       |  4 +-
 .../Console/Tests/Fixtures/application_1.json |  2 +-
 .../Console/Tests/Fixtures/application_1.md   |  4 +-
 .../Console/Tests/Fixtures/application_1.xml  |  4 +-
 .../Console/Tests/Fixtures/application_2.json |  2 +-
 .../Console/Tests/Fixtures/application_2.md   |  4 +-
 .../Console/Tests/Fixtures/application_2.xml  |  4 +-
 .../Tests/Fixtures/application_asxml1.txt     |  4 +-
 .../Tests/Fixtures/application_run2.txt       |  2 +-
 .../Tests/Fixtures/application_run3.txt       |  2 +-
 13 files changed, 36 insertions(+), 96 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php

diff --git a/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php b/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
deleted file mode 100644
index 5c8597807f73b..0000000000000
--- a/src/Symfony/Component/Console/Command/AbstractDescriptionCommand.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Symfony\Component\Console\Command;
-
-use Symfony\Component\Console\Descriptor\DescriptorProvider;
-use Symfony\Component\Console\Helper\DescriptorHelper;
-use Symfony\Component\Console\Helper\HelperSet;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * Base class for description commands.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractDescriptionCommand extends Command
-{
-    /**
-     * @var DescriptorProvider
-     */
-    private $provider;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this->provider = new DescriptorProvider();
-        $this->setDefinition($this->createDefinition());
-    }
-
-    /**
-     * Creates command definition.
-     *
-     * @return InputDefinition
-     */
-    protected function createDefinition()
-    {
-        return new InputDefinition(array(
-            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats.'),
-            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        if (null === $this->getHelperSet()) {
-            $this->setHelperSet(new HelperSet());
-        }
-
-        $this->getHelperSet()->set(new DescriptorHelper($this->provider));
-    }
-}
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 3623b0241f0b6..de339f4fb25f1 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Command;
 
+use Symfony\Component\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
@@ -21,7 +22,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class HelpCommand extends AbstractDescriptionCommand
+class HelpCommand extends Command
 {
     private $command;
 
@@ -36,6 +37,11 @@ protected function configure()
         $this
             ->setName('help')
             ->setDescription('Displays help for a command')
+            ->setDefinition(array(
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats.'),
+                new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help.'),
+                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
+            ))
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command displays help for a given command:
 
@@ -61,17 +67,6 @@ public function setCommand(Command $command)
         $this->command = $command;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function createDefinition()
-    {
-        $definition = parent::createDefinition();
-        $definition->addArgument(new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'));
-
-        return $definition;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -81,8 +76,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->command = $this->getApplication()->find($input->getArgument('command_name'));
         }
 
-        parent::execute($input, $output);
-        $this->getHelper('descriptor')->describe($output, $this->command, $input->getOption('format'), $input->getOption('raw'));
+        $helper = new DescriptorHelper();
+        $helper->describe($output, $this->command, $input->getOption('format'), $input->getOption('raw'));
         $this->command = null;
     }
 }
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 7c6176d029c68..404219e9ae700 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\Console\Command;
 
+use Symfony\Component\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -21,7 +23,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class ListCommand extends AbstractDescriptionCommand
+class ListCommand extends Command
 {
     /**
      * {@inheritdoc}
@@ -33,6 +35,7 @@ protected function configure()
         $this
             ->setName('list')
             ->setDescription('Lists commands')
+            ->setDefinition($this->createDefinition())
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command lists all commands:
 
@@ -59,10 +62,11 @@ protected function configure()
      */
     protected function createDefinition()
     {
-        $definition = parent::createDefinition();
-        $definition->addArgument(new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'));
-
-        return $definition;
+        return new InputDefinition(array(
+            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats.'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
+            new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
+        ));
     }
 
     /**
@@ -78,8 +82,7 @@ protected function getNativeDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        parent::execute($input, $output);
-
-        $this->getHelper('descriptor')->describe($output, $this->getApplication(), $input->getOption('format'), $input->getOption('raw'));
+        $helper = new DescriptorHelper();
+        $helper->describe($output, $this->getApplication(), $input->getOption('format'), $input->getOption('raw'));
     }
 }
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index e960f9f65e71f..ed8dc44fb7a29 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -31,9 +31,9 @@ class DescriptorHelper extends Helper
      *
      * @param DescriptorProvider $provider
      */
-    public function __construct(DescriptorProvider $provider)
+    public function __construct(DescriptorProvider $provider = null)
     {
-        $this->provider = $provider;
+        $this->provider = $provider ?: new DescriptorProvider();
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index 1768d63740d03..ef49cbe2570c9 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 list.","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 [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
\ No newline at end of file
+{"commands":[{"name":"help","usage":"help [--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":{"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 [--format=\"...\"] [--raw] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index 6d2c3e741b388..d8b12f18f558d 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -50,7 +50,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list.
+* Description: To output raw command help.
 * Default: `false`
 
 **help:**
@@ -165,7 +165,7 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats.
+* Description: To output list in other formats.
 * Default: `NULL`
 
 **raw:**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index c0fcadf9dd7cc..31465958323a0 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -28,7 +28,7 @@
           <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list.</description>
+          <description>To output raw command help.</description>
         </option>
         <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this help message.</description>
@@ -80,7 +80,7 @@
       </arguments>
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats.</description>
+          <description>To output list in other formats.</description>
           <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index b4635ab414db6..88de988f01623 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 list.","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 [--format=\"...\"] [--raw] [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":{"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 list.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
+{"commands":[{"name":"help","usage":"help [--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":{"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 [--format=\"...\"] [--raw] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index c5ddb45675692..417cb36fa55d5 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -57,7 +57,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list.
+* Description: To output raw command help.
 * Default: `false`
 
 **help:**
@@ -172,7 +172,7 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats.
+* Description: To output list in other formats.
 * Default: `NULL`
 
 **raw:**
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index 8ee61bbfe44fd..080a52db38d63 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -28,7 +28,7 @@
           <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list.</description>
+          <description>To output raw command help.</description>
         </option>
         <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this help message.</description>
@@ -80,7 +80,7 @@
       </arguments>
       <options>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats.</description>
+          <description>To output list in other formats.</description>
           <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
index 50a63e20626ad..325d0ee64aff2 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -28,7 +28,7 @@
       <defaults/>
     </option>
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output raw command list.</description>
+      <description>To output raw command help.</description>
     </option>
     <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Display this help message.</description>
@@ -80,7 +80,7 @@
   </arguments>
   <options>
     <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-      <description>To output help in other formats.</description>
+      <description>To output list in other formats.</description>
       <defaults/>
     </option>
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
index dc35636d6192e..7eb22687db286 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
@@ -7,7 +7,7 @@ Arguments:
 
 Options:
  --format              To output help in other formats.
- --raw                 To output raw command list.
+ --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.
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
index 7f84cfcce9754..8566d5f857cef 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
@@ -5,7 +5,7 @@ Arguments:
  namespace  The namespace name
 
 Options:
- --format   To output help in other formats.
+ --format   To output list in other formats.
  --raw      To output raw command list.
 
 Help:

From 389101a67279b8804adbc8609d6e45d26b3d03f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 08:55:51 +0200
Subject: [PATCH 14/24] [Console] re-introduced --xml option to avoid BC break

---
 .../Component/Console/Command/HelpCommand.php |  1 +
 .../Component/Console/Command/ListCommand.php |  1 +
 .../Console/Tests/Command/HelpCommandTest.php |  8 +++----
 .../Console/Tests/Fixtures/application_1.json |  2 +-
 .../Console/Tests/Fixtures/application_1.md   | 24 +++++++++++++++++--
 .../Console/Tests/Fixtures/application_1.xml  | 10 ++++++--
 .../Console/Tests/Fixtures/application_2.json |  2 +-
 .../Console/Tests/Fixtures/application_2.md   | 24 +++++++++++++++++--
 .../Console/Tests/Fixtures/application_2.xml  | 10 ++++++--
 .../Tests/Fixtures/application_asxml1.txt     | 10 ++++++--
 .../Fixtures/application_renderexception2.txt |  2 +-
 .../Tests/Fixtures/application_run2.txt       |  3 ++-
 .../Tests/Fixtures/application_run3.txt       |  3 ++-
 13 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index de339f4fb25f1..36ae8e1745f50 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -40,6 +40,7 @@ protected function configure()
             ->setDefinition(array(
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats.'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help.'),
+                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML.'),
                 new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
             ))
             ->setHelp(<<<EOF
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 404219e9ae700..0c72c33682090 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -65,6 +65,7 @@ protected function createDefinition()
         return new InputDefinition(array(
             new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats.'),
             new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
+            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML.'),
             new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
         ));
     }
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
index a7f52da431c75..0610a47113f40 100644
--- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -24,7 +24,7 @@ public function testExecuteForCommandAlias()
         $command->setApplication(new Application());
         $commandTester = new CommandTester($command);
         $commandTester->execute(array('command_name' => 'li'));
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
     }
 
     public function testExecuteForCommand()
@@ -33,7 +33,7 @@ public function testExecuteForCommand()
         $commandTester = new CommandTester($command);
         $command->setCommand(new ListCommand());
         $commandTester->execute(array());
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
     public function testExecuteForCommandWithXmlOption()
@@ -50,7 +50,7 @@ public function testExecuteForApplicationCommand()
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
         $commandTester->execute(array('command_name' => 'list'));
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
 
@@ -59,7 +59,7 @@ public function testExecuteForApplicationCommandWithXmlOption()
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
         $commandTester->execute(array('command_name' => 'list', '--format' => 'xml'));
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertRegExp('/<command/', $commandTester->getDisplay(), '->execute() returns an XML help text if --format=xml is passed');
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index ef49cbe2570c9..394724d98818a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 [--format=\"...\"] [--raw] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
\ No newline at end of file
+{"commands":[{"name":"help","usage":"help [--format=\"...\"] [--raw] [--xml] [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":{"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},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML.","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 [--format=\"...\"] [--raw] [--xml] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index d8b12f18f558d..851faaa92caba 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -8,7 +8,7 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help [--format="..."] [--raw] [command_name]`
+* Usage: `help [--format="..."] [--raw] [--xml] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
@@ -53,6 +53,16 @@ To display the list of available commands, please use the <info>list</info> comm
 * Description: To output raw command help.
 * Default: `false`
 
+**xml:**
+
+* Name: `--xml`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output help as XML.
+* Default: `false`
+
 **help:**
 
 * Name: `--help`
@@ -127,7 +137,7 @@ list
 ----
 
 * Description: Lists commands
-* Usage: `list [--format="..."] [--raw] [namespace]`
+* Usage: `list [--format="..."] [--raw] [--xml] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
@@ -177,3 +187,13 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Is multiple: no
 * Description: To output raw command list.
 * Default: `false`
+
+**xml:**
+
+* Name: `--xml`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output list as XML.
+* Default: `false`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index 31465958323a0..9d882568b97f1 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -2,7 +2,7 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-      <usage>help [--format="..."] [--raw] [command_name]</usage>
+      <usage>help [--format="..."] [--raw] [--xml] [command_name]</usage>
       <description>Displays help for a command</description>
       <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
  
@@ -30,6 +30,9 @@
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command help.</description>
         </option>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output help as XML.</description>
+        </option>
         <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this help message.</description>
         </option>
@@ -54,7 +57,7 @@
       </options>
     </command>
     <command id="list" name="list">
-      <usage>list [--format="..."] [--raw] [namespace]</usage>
+      <usage>list [--format="..."] [--raw] [--xml] [namespace]</usage>
       <description>Lists commands</description>
       <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
  
@@ -86,6 +89,9 @@
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
         </option>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output list as XML.</description>
+        </option>
       </options>
     </command>
   </commands>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index 88de988f01623..8c17081ea9f58 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--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":{"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 [--format=\"...\"] [--raw] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
+{"commands":[{"name":"help","usage":"help [--format=\"...\"] [--raw] [--xml] [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":{"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},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML.","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 [--format=\"...\"] [--raw] [--xml] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index 417cb36fa55d5..0dde6d3a65e61 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -15,7 +15,7 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help [--format="..."] [--raw] [command_name]`
+* Usage: `help [--format="..."] [--raw] [--xml] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
@@ -60,6 +60,16 @@ To display the list of available commands, please use the <info>list</info> comm
 * Description: To output raw command help.
 * Default: `false`
 
+**xml:**
+
+* Name: `--xml`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output help as XML.
+* Default: `false`
+
 **help:**
 
 * Name: `--help`
@@ -134,7 +144,7 @@ list
 ----
 
 * Description: Lists commands
-* Usage: `list [--format="..."] [--raw] [namespace]`
+* Usage: `list [--format="..."] [--raw] [--xml] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
@@ -185,6 +195,16 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Description: To output raw command list.
 * Default: `false`
 
+**xml:**
+
+* Name: `--xml`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output list as XML.
+* Default: `false`
+
 descriptor:command1
 -------------------
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index 080a52db38d63..fbc78cca5c362 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -2,7 +2,7 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-      <usage>help [--format="..."] [--raw] [command_name]</usage>
+      <usage>help [--format="..."] [--raw] [--xml] [command_name]</usage>
       <description>Displays help for a command</description>
       <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
  
@@ -30,6 +30,9 @@
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command help.</description>
         </option>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output help as XML.</description>
+        </option>
         <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this help message.</description>
         </option>
@@ -54,7 +57,7 @@
       </options>
     </command>
     <command id="list" name="list">
-      <usage>list [--format="..."] [--raw] [namespace]</usage>
+      <usage>list [--format="..."] [--raw] [--xml] [namespace]</usage>
       <description>Lists commands</description>
       <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
  
@@ -86,6 +89,9 @@
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
           <description>To output raw command list.</description>
         </option>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output list as XML.</description>
+        </option>
       </options>
     </command>
     <command id="descriptor:command1" name="descriptor:command1">
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
index 325d0ee64aff2..136ba7ed31be3 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -2,7 +2,7 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-  <usage>help [--format="..."] [--raw] [command_name]</usage>
+  <usage>help [--format="..."] [--raw] [--xml] [command_name]</usage>
   <description>Displays help for a command</description>
   <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
  
@@ -30,6 +30,9 @@
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
       <description>To output raw command help.</description>
     </option>
+    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>To output help as XML.</description>
+    </option>
     <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Display this help message.</description>
     </option>
@@ -54,7 +57,7 @@
   </options>
 </command>
     <command id="list" name="list">
-  <usage>list [--format="..."] [--raw] [namespace]</usage>
+  <usage>list [--format="..."] [--raw] [--xml] [namespace]</usage>
   <description>Lists commands</description>
   <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
  
@@ -86,6 +89,9 @@
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
       <description>To output raw command list.</description>
     </option>
+    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>To output list as XML.</description>
+    </option>
   </options>
 </command>
     <command id="foo:bar" name="foo:bar">
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
index fc8a946e08ac2..5cc75b7413ddd 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -6,6 +6,6 @@
                                       
 
 
-list [--format="..."] [--raw] [namespace]
+list [--format="..."] [--raw] [--xml] [namespace]
 
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
index 7eb22687db286..4fee44aefcf1a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
@@ -1,5 +1,5 @@
 Usage:
- help [--format="..."] [--raw] [command_name]
+ help [--format="..."] [--raw] [--xml] [command_name]
 
 Arguments:
  command               The command to execute
@@ -8,6 +8,7 @@ Arguments:
 Options:
  --format              To output help in other formats.
  --raw                 To output raw command help.
+ --xml                 To output help as XML.
  --help (-h)           Display this help message.
  --quiet (-q)          Do not output any message.
  --verbose (-v)        Increase verbosity of messages.
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
index 8566d5f857cef..d478348026e79 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
@@ -1,5 +1,5 @@
 Usage:
- list [--format="..."] [--raw] [namespace]
+ list [--format="..."] [--raw] [--xml] [namespace]
 
 Arguments:
  namespace  The namespace name
@@ -7,6 +7,7 @@ Arguments:
 Options:
  --format   To output list in other formats.
  --raw      To output raw command list.
+ --xml      To output list as XML.
 
 Help:
  The list command lists all commands:

From 84be8de1bdc6db1c8258557633339f8860134874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 09:24:04 +0200
Subject: [PATCH 15/24] [Console] simplified mardown descriptors

---
 .../Console/Descriptor/DescriptorProvider.php |  1 -
 .../Markdown/AbstractMarkdownDescriptor.php   | 34 --------
 .../ApplicationMarkdownDescriptor.php         | 16 ++--
 .../Markdown/CommandMarkdownDescriptor.php    | 28 ++++---
 .../Markdown/Document/BlockInterface.php      | 34 --------
 .../Descriptor/Markdown/Document/Document.php | 65 ---------------
 .../Markdown/Document/Formatter.php           | 64 ---------------
 .../Markdown/Document/Paragraph.php           | 49 ------------
 .../Descriptor/Markdown/Document/Title.php    | 80 -------------------
 .../Markdown/Document/UnorderedList.php       | 68 ----------------
 .../InputArgumentMarkdownDescriptor.php       | 18 ++---
 .../InputDefinitionMarkdownDescriptor.php     | 14 ++--
 .../InputOptionMarkdownDescriptor.php         | 22 +++--
 .../Markdown/Document/FormatterTest.php       | 36 ---------
 14 files changed, 49 insertions(+), 480 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php

diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index 426275e24fb54..310debf29aec2 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -31,7 +31,6 @@ class DescriptorProvider
         'namespace'      => null,
         'raw_text'       => false,
         'json_encoding'  => 0,
-        'markdown_width' => 120,
     );
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
index 3e8366cf4c667..a4448d1c99b1d 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
@@ -18,48 +18,14 @@
  */
 abstract class AbstractMarkdownDescriptor implements DescriptorInterface
 {
-    /**
-     * @var int
-     */
-    private $maxWidth;
-
-    /**
-     * @param int $maxWidth
-     */
-    public function __construct($maxWidth = 120)
-    {
-        $this->maxWidth = $maxWidth;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function configure(array $options)
     {
-        if (isset($options['markdown_width'])) {
-            $this->maxWidth = $options['markdown_width'];
-        }
-
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        return $this->getDocument($object)->format(new Document\Formatter($this->maxWidth));
-    }
-
-    /**
-     * Returns object document to format.
-     *
-     * @param object $object
-     *
-     * @return Document\Document
-     */
-    abstract public function getDocument($object);
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
index ae12cdaae85f8..1e23e86f002b8 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
@@ -31,7 +31,6 @@ class ApplicationMarkdownDescriptor extends AbstractMarkdownDescriptor
     public function __construct($namespace = null, $maxWidth = 120)
     {
         $this->namespace = $namespace;
-        parent::__construct($maxWidth);
     }
 
     /**
@@ -49,26 +48,29 @@ public function configure(array $options)
     /**
      * {@inheritdoc}
      */
-    public function getDocument($object)
+    public function describe($object)
     {
         /** @var Application $object */
         $description = new ApplicationDescription($object, $this->namespace);
         $descriptor = new CommandMarkdownDescriptor();
-        $document = new Document\Document(array(new Document\Title($object->getName(), 1)));
+
+        $blocks = array($object->getName()."\n".str_repeat('=', strlen($object->getName())));
 
         foreach ($description->getNamespaces() as $namespace) {
             if (ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
-                $document->add(new Document\Paragraph('**'.$namespace['id'].':**'));
+                $blocks[] = '**'.$namespace['id'].':**';
             }
 
-            $document->add(new Document\UnorderedList($namespace['commands']));
+            $blocks[] = implode("\n", array_map(function ($commandName) {
+                return '* '.$commandName;
+            } , $namespace['commands']));
         }
 
         foreach ($description->getCommands() as $command) {
-            $document->add($descriptor->getDocument($command));
+            $blocks[] = $descriptor->describe($command);
         }
 
-        return $document;
+        return implode("\n\n", $blocks);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
index ea3ff33ce8ee0..78fc1885bbe60 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
@@ -22,22 +22,28 @@ class CommandMarkdownDescriptor extends AbstractMarkdownDescriptor
     /**
      * {@inheritdoc}
      */
-    public function getDocument($object)
+    public function describe($object)
     {
         /** @var Command $object */
         $description = new CommandDescription($object);
         $definitionDescriptor = new InputDefinitionMarkdownDescriptor();
 
-        return new Document\Document(array(
-            new Document\Title($description->getName(), 2),
-            new Document\UnorderedList(array(
-                'Description: '.($description->getDescription() ?: '<none>'),
-                'Usage: `'.$description->getSynopsis().'`',
-                'Aliases: '.(count($description->getAliases()) ? '`'.implode('`, `', $description->getAliases()).'`' : '<none>'),
-            )),
-            new Document\Paragraph($description->getHelp()),
-            $definitionDescriptor->getDocument($description->getDefinition()),
-        ));
+        $markdown = $description->getName()."\n"
+            .str_repeat('-', strlen($description->getName()))."\n\n"
+            .'* Description: '.($description->getDescription() ?: '<none>')."\n"
+            .'* Usage: `'.$description->getSynopsis().'`'."\n"
+            .'* Aliases: '.(count($description->getAliases()) ? '`'.implode('`, `', $description->getAliases()).'`' : '<none>');
+
+        if ($description->getHelp()) {
+            $markdown .= "\n\n".$description->getHelp();
+        }
+
+        $definitionMarkdown = $definitionDescriptor->describe($description->getDefinition());
+        if ($definitionMarkdown) {
+            $markdown .= "\n\n".$definitionMarkdown;
+        }
+
+        return $markdown;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
deleted file mode 100644
index ce39fac8a43d8..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/BlockInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown\Document;
-
-/**
- * Document block interface.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-interface BlockInterface
-{
-    /**
-     * @return boolean
-     */
-    public function isEmpty();
-
-    /**
-     * Formats block output.
-     *
-     * @param Formatter $formatter
-     *
-     * @return string
-     */
-    public function format(Formatter $formatter);
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
deleted file mode 100644
index 6cf2ef7e77cc4..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Document.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown\Document;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class Document implements BlockInterface
-{
-    /**
-     * @var BlockInterface[]
-     */
-    private $blocks = array();
-
-    /**
-     * @param BlockInterface[] $blocks
-     */
-    public function __construct(array $blocks = array())
-    {
-        foreach ($blocks as $block) {
-            $this->add($block);
-        }
-    }
-
-    /**
-     * @param BlockInterface $block
-     *
-     * @return Document
-     */
-    public function add(BlockInterface $block)
-    {
-        $this->blocks[] = $block;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEmpty()
-    {
-        return empty($this->blocks);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(Formatter $formatter)
-    {
-        return implode("\n\n", array_map(function (BlockInterface $block) use ($formatter) {
-            return $block->format($formatter);
-        }, array_filter($this->blocks, function (BlockInterface $block) {
-            return !$block->isEmpty();
-        })));
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
deleted file mode 100644
index 2669a0353939c..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Formatter.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown\Document;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class Formatter
-{
-    /**
-     * @var int
-     */
-    private $maxWidth;
-
-    /**
-     * @param int $maxWidth
-     */
-    public function __construct($maxWidth = 120)
-    {
-        $this->maxWidth = $maxWidth;
-    }
-
-    /**
-     * Clips content on words.
-     *
-     * @param string $content   Content to clip
-     * @param int    $freeSpace Free space to keep
-     *
-     * @return array
-     */
-    public function clip($content, $freeSpace = 0)
-    {
-        $lines = array();
-        $maxWidth = $this->maxWidth - $freeSpace;
-
-        foreach (explode("\n", $content) as $text) {
-            $line = '';
-            foreach (explode(' ', $text) as $word) {
-                if (strlen($line.$word) <= $maxWidth) {
-                    $line .= $word.' ';
-                    continue;
-                }
-
-                $lines[] = substr($line, 0, -1);
-                $line = $word.' ';
-            }
-
-            if (!empty($line)) {
-                $lines[] = substr($line, 0, -1);
-            }
-        }
-
-        return $lines;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
deleted file mode 100644
index 4fe3beeb360b0..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Paragraph.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown\Document;
-
-/**
- * Document paragraph.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class Paragraph implements BlockInterface
-{
-    /**
-     * @var string
-     */
-    private $content;
-
-    /**
-     * @param $content
-     */
-    public function __construct($content)
-    {
-        $this->content = $content;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEmpty()
-    {
-        return empty($this->content);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(Formatter $formatter)
-    {
-        return implode("\n", $formatter->clip($this->content));
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
deleted file mode 100644
index 45cfc3d14092b..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/Title.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown\Document;
-
-/**
- * Document paragraph.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class Title implements BlockInterface
-{
-    /**
-     * @var string
-     */
-    private $content;
-
-    /**
-     * @var int
-     */
-    private $level;
-
-    /**
-     * @param string $content
-     * @param int    $level
-     */
-    public function __construct($content, $level = 1)
-    {
-        $this->content = $content;
-        $this->level = $level;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEmpty()
-    {
-        return empty($this->content);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(Formatter $formatter)
-    {
-        if (empty($this->content)) {
-            return '';
-        }
-
-        switch ($this->level) {
-            case 1: return $this->entitle('=');
-            case 2: return $this->entitle('-');
-        }
-
-        $lines = array();
-        foreach ($formatter->clip($this->content, $this->level + 1) as $index => $line) {
-            $lines[] = (0 === $index ? str_repeat('#', $this->level).' ' : str_repeat(' ', $this->level + 1)).$line;
-        }
-
-        return implode("\n", $lines);
-    }
-
-    /**
-     * @param string $char
-     *
-     * @return string
-     */
-    private function entitle($char)
-    {
-        return $this->content."\n".str_repeat($char, strlen($this->content));
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php b/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
deleted file mode 100644
index a228ed6185728..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/Document/UnorderedList.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown\Document;
-
-/**
- * Document unordered list.
- *
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class UnorderedList implements BlockInterface
-{
-    /**
-     * @var array
-     */
-    private $items;
-
-    /**
-     * @param array $items
-     */
-    public function __construct(array $items = array())
-    {
-        $this->items = $items;
-    }
-
-    /**
-     * @param $item
-     *
-     * @return UnorderedList
-     */
-    public function push($item)
-    {
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isEmpty()
-    {
-        return empty($this->items);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function format(Formatter $formatter)
-    {
-        $content = array();
-        foreach ($this->items as $item) {
-            foreach ($formatter->clip($item, 2) as $index => $line) {
-                $content[] = (0 === $index ? '* ' : '  ').$line;
-            }
-        }
-
-        return implode("\n", $content);
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
index f3f2917874427..cd2e043ec8c0e 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
@@ -21,19 +21,15 @@ class InputArgumentMarkdownDescriptor extends AbstractMarkdownDescriptor
     /**
      * {@inheritdoc}
      */
-    public function getDocument($object)
+    public function describe($object)
     {
         /** @var InputArgument $object */
-        return new Document\Document(array(
-            new Document\Paragraph('**'.$object->getName().':**'),
-            new Document\UnorderedList(array(
-                'Name: '.($object->getName() ?: '<none>'),
-                'Is required: '.($object->isRequired() ? 'yes' : 'no'),
-                'Is array: '.($object->isArray() ? 'yes' : 'no'),
-                'Description: '.($object->getDescription() ?: '<none>'),
-                'Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`',
-            )),
-        ));
+        return '**'.$object->getName().':**'."\n\n"
+            .'* Name: '.($object->getName() ?: '<none>')."\n"
+            .'* Is required: '.($object->isRequired() ? 'yes' : 'no')."\n"
+            .'* Is array: '.($object->isArray() ? 'yes' : 'no')."\n"
+            .'* Description: '.($object->getDescription() ?: '<none>')."\n"
+            .'* Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`';
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
index fe57f9c000f13..6a2c21dcaed36 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
@@ -21,29 +21,29 @@ class InputDefinitionMarkdownDescriptor extends AbstractMarkdownDescriptor
     /**
      * {@inheritdoc}
      */
-    public function getDocument($object)
+    public function describe($object)
     {
-        $document = new Document\Document();
+        $blocks = array();
         $argumentDescriptor = new InputArgumentMarkdownDescriptor();
         $optionDescriptor = new InputOptionMarkdownDescriptor();
 
         /** @var InputDefinition $object */
 
         if (count($object->getArguments()) > 0) {
-            $document->add(new Document\Title('Arguments:', 3));
+            $blocks[] = '### Arguments:';
             foreach ($object->getArguments() as $argument) {
-                $document->add($argumentDescriptor->getDocument($argument));
+                $blocks[] = $argumentDescriptor->describe($argument);
             }
         }
 
         if (count($object->getOptions()) > 0) {
-            $document->add(new Document\Title('Options:', 3));
+            $blocks[] = '### Options:';
             foreach ($object->getOptions() as $option) {
-                $document->add($optionDescriptor->getDocument($option));
+                $blocks[] = $optionDescriptor->describe($option);
             }
         }
 
-        return $document;
+        return implode("\n\n", $blocks);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
index 411c3e84e032f..624f3644cf947 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
@@ -21,21 +21,17 @@ class InputOptionMarkdownDescriptor extends AbstractMarkdownDescriptor
     /**
      * {@inheritdoc}
      */
-    public function getDocument($object)
+    public function describe($object)
     {
         /** @var InputOption $object */
-        return new Document\Document(array(
-            new Document\Paragraph('**'.$object->getName().':**'),
-            new Document\UnorderedList(array(
-                'Name: `--'.$object->getName().'`',
-                'Shortcut: '.($object->getShortcut() ? '`-'.$object->getShortcut().'`' : '<none>'),
-                'Accept value: '.($object->acceptValue() ? 'yes' : 'no'),
-                'Is value required: '.($object->isValueRequired() ? 'yes' : 'no'),
-                'Is multiple: '.($object->isArray() ? 'yes' : 'no'),
-                'Description: '.($object->getDescription() ?: '<none>'),
-                'Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`',
-            )),
-        ));
+        return '**'.$object->getName().':**'."\n\n"
+            .'* Name: `--'.$object->getName().'`'."\n"
+            .'* Shortcut: '.($object->getShortcut() ? '`-'.$object->getShortcut().'`' : '<none>')."\n"
+            .'* Accept value: '.($object->acceptValue() ? 'yes' : 'no')."\n"
+            .'* Is value required: '.($object->isValueRequired() ? 'yes' : 'no')."\n"
+            .'* Is multiple: '.($object->isArray() ? 'yes' : 'no')."\n"
+            .'* Description: '.($object->getDescription() ?: '<none>')."\n"
+            .'* Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`';
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
deleted file mode 100644
index d2bd8a69f2206..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/Document/FormatterTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json\Document;
-
-use Symfony\Component\Console\Descriptor\Markdown\Document\Formatter;
-
-class FormatterTest extends \PHPUnit_Framework_TestCase
-{
-    /** @dataProvider getClipTestData */
-    public function testClip($content, $maxLength, $expectedLines)
-    {
-        $formatter = new Formatter($maxLength);
-        $this->assertEquals($expectedLines, $formatter->clip($content));
-    }
-
-    public function getClipTestData()
-    {
-        $lorem = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit.';
-
-        return array(
-            array('a b c d e', 3, array('a b', 'c d', 'e')),
-            array($lorem, 20, array('Lorem ipsum dolor', 'sit amet,', 'consectetur', 'adipisicing elit.')),
-            array($lorem, 30, array('Lorem ipsum dolor sit amet,', 'consectetur adipisicing elit.')),
-            array($lorem, 60, array($lorem)),
-        );
-    }
-}

From ce5c0fd8a9cf1ff17bc8c58d877248c4b71dfc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 09:54:49 +0200
Subject: [PATCH 16/24] [Console] applied comments from github

---
 src/Symfony/Component/Console/Application.php                 | 4 ++--
 src/Symfony/Component/Console/Command/Command.php             | 4 ++--
 src/Symfony/Component/Console/Command/HelpCommand.php         | 4 ++++
 src/Symfony/Component/Console/Command/ListCommand.php         | 4 ++++
 .../Component/Console/Descriptor/ApplicationDescription.php   | 2 +-
 src/Symfony/Component/Console/Input/InputDefinition.php       | 4 ++--
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 73e35b803f7ee..c9d0dcbf35068 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -690,7 +690,7 @@ public static function getAbbreviations($names)
      *
      * @return string A string representing the Application
      *
-     * @deprecated
+     * @deprecated Deprecated since version 2.3, to be removed in 3.0.
      */
     public function asText($namespace = null, $raw = false)
     {
@@ -707,7 +707,7 @@ public function asText($namespace = null, $raw = false)
      *
      * @return string|\DOMDocument An XML string representing the Application
      *
-     * @deprecated
+     * @deprecated Deprecated since version 2.3, to be removed in 3.0.
      */
     public function asXml($namespace = null, $asDom = false)
     {
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 86ac27e6b2bb2..53e67d2eef8e9 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -562,7 +562,7 @@ public function getHelper($name)
      *
      * @return string A string representing the command
      *
-     * @deprecated
+     * @deprecated Deprecated since version 2.3, to be removed in 3.0.
      */
     public function asText()
     {
@@ -578,7 +578,7 @@ public function asText()
      *
      * @return string|\DOMDocument An XML string representing the command
      *
-     * @deprecated
+     * @deprecated Deprecated since version 2.3, to be removed in 3.0.
      */
     public function asXml($asDom = false)
     {
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 36ae8e1745f50..08246a9533b00 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -77,6 +77,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->command = $this->getApplication()->find($input->getArgument('command_name'));
         }
 
+        if ($input->getOption('xml')) {
+            $input->setOption('format', 'xml');
+        }
+
         $helper = new DescriptorHelper();
         $helper->describe($output, $this->command, $input->getOption('format'), $input->getOption('raw'));
         $this->command = null;
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 0c72c33682090..5a9e9775daedd 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -83,6 +83,10 @@ protected function getNativeDefinition()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if ($input->getOption('xml')) {
+            $input->setOption('format', 'xml');
+        }
+
         $helper = new DescriptorHelper();
         $helper->describe($output, $this->getApplication(), $input->getOption('format'), $input->getOption('raw'));
     }
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 95c124bf15a0a..a9a41fcf95f79 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -92,7 +92,7 @@ public function getCommands()
     public function getCommand($name)
     {
         if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
-            throw new \InvalidArgumentException('Command "'.$name.'" does not exist.');
+            throw new \InvalidArgumentException(sprintf('Command %s does not exist.', $name));
         }
 
         return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index 18617a0e95e93..c240573169381 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -409,7 +409,7 @@ public function getSynopsis()
      *
      * @return string A string representing the InputDefinition
      *
-     * @deprecated
+     * @deprecated Deprecated since version 2.3, to be removed in 3.0.
      */
     public function asText()
     {
@@ -425,7 +425,7 @@ public function asText()
      *
      * @return string|\DOMDocument An XML string representing the InputDefinition
      *
-     * @deprecated
+     * @deprecated Deprecated since version 2.3, to be removed in 3.0.
      */
     public function asXml($asDom = false)
     {

From 49a46120148a28458b5e96b414e3d1bfe501a9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 20:30:34 +0200
Subject: [PATCH 17/24] [Console] applied comments from github

---
 src/Symfony/Component/Console/Application.php | 29 +-----
 .../Component/Console/Command/Command.php     |  4 +-
 .../Component/Console/Command/HelpCommand.php |  1 -
 .../Component/Console/Command/ListCommand.php |  6 +-
 .../Descriptor/ApplicationDescription.php     | 18 +++-
 .../Console/Descriptor/CommandDescription.php | 91 -------------------
 .../Descriptor/Json/CommandJsonDescriptor.php | 18 ++--
 .../Markdown/CommandMarkdownDescriptor.php    | 20 ++--
 .../Descriptor/Text/CommandTextDescriptor.php | 12 +--
 .../Descriptor/Xml/CommandXmlDescriptor.php   | 20 ++--
 10 files changed, 55 insertions(+), 164 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Descriptor/CommandDescription.php

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index c9d0dcbf35068..8505dfc51531a 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -1005,33 +1005,6 @@ private function getConsoleMode()
         }
     }
 
-    /**
-     * Sorts commands in alphabetical order.
-     *
-     * @param array $commands An associative array of commands to sort
-     *
-     * @return array A sorted array of commands
-     */
-    private function sortCommands($commands)
-    {
-        $namespacedCommands = array();
-        foreach ($commands as $name => $command) {
-            $key = $this->extractNamespace($name, 1);
-            if (!$key) {
-                $key = '_global';
-            }
-
-            $namespacedCommands[$key][$name] = $command;
-        }
-        ksort($namespacedCommands);
-
-        foreach ($namespacedCommands as &$commands) {
-            ksort($commands);
-        }
-
-        return $namespacedCommands;
-    }
-
     /**
      * Returns abbreviated suggestions in string format.
      *
@@ -1052,7 +1025,7 @@ private function getAbbreviationSuggestions($abbrevs)
      *
      * @return string The namespace of the command
      */
-    private function extractNamespace($name, $limit = null)
+    public function extractNamespace($name, $limit = null)
     {
         $parts = explode(':', $name);
         array_pop($parts);
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 53e67d2eef8e9..faa519d12673f 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -277,7 +277,7 @@ public function setCode($code)
      *
      * @param Boolean $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
      */
-    private function mergeApplicationDefinition($mergeArgs = true)
+    public function mergeApplicationDefinition($mergeArgs = true)
     {
         if (null === $this->application || true === $this->applicationDefinitionMerged) {
             return;
@@ -336,7 +336,7 @@ public function getDefinition()
      *
      * @return InputDefinition An InputDefinition instance
      */
-    protected function getNativeDefinition()
+    public function getNativeDefinition()
     {
         return $this->getDefinition();
     }
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 08246a9533b00..3bcdf73f71f20 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -31,7 +31,6 @@ class HelpCommand extends Command
      */
     protected function configure()
     {
-        parent::configure();
         $this->ignoreValidationErrors();
 
         $this
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 5a9e9775daedd..d1c8d2b5434cf 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -30,8 +30,6 @@ class ListCommand extends Command
      */
     protected function configure()
     {
-        parent::configure();
-
         $this
             ->setName('list')
             ->setDescription('Lists commands')
@@ -60,7 +58,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function createDefinition()
+    private function createDefinition()
     {
         return new InputDefinition(array(
             new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats.'),
@@ -73,7 +71,7 @@ protected function createDefinition()
     /**
      * {@inheritdoc}
      */
-    protected function getNativeDefinition()
+    public function getNativeDefinition()
     {
         return $this->createDefinition();
     }
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index a9a41fcf95f79..cdf1493c40217 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -133,9 +133,21 @@ private function inspectApplication()
      */
     private function sortCommands(array $commands)
     {
-        $method = new \ReflectionMethod($this->application, 'sortCommands');
-        $method->setAccessible(true);
+        $namespacedCommands = array();
+        foreach ($commands as $name => $command) {
+            $key = $this->application->extractNamespace($name, 1);
+            if (!$key) {
+                $key = '_global';
+            }
+
+            $namespacedCommands[$key][$name] = $command;
+        }
+        ksort($namespacedCommands);
+
+        foreach ($namespacedCommands as &$commands) {
+            ksort($commands);
+        }
 
-        return $method->invoke($this->application, $commands);
+        return $namespacedCommands;
     }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/CommandDescription.php b/src/Symfony/Component/Console/Descriptor/CommandDescription.php
deleted file mode 100644
index f5f80b9f37f85..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/CommandDescription.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputDefinition;
-
-/**
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class CommandDescription
-{
-    /**
-     * @var Command
-     */
-    private $command;
-    
-    /**
-     * @param Command $command
-     */
-    public function __construct(Command $command)
-    {
-        $this->command = $command;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->command->getName();
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->command->getDescription();
-    }
-
-    /**
-     * @return array
-     */
-    public function getAliases()
-    {
-        return $this->command->getAliases();
-    }
-
-    /**
-     * @return string
-     */
-    public function getSynopsis()
-    {
-        return $this->command->getSynopsis();
-    }
-
-    /**
-     * @return string
-     */
-    public function getHelp()
-    {
-        return $this->command->getProcessedHelp();
-    }
-
-    /**
-     * @return InputDefinition
-     */
-    public function getDefinition()
-    {
-        // ensure command definition is merged with application one
-        $method = new \ReflectionMethod($this->command, 'mergeApplicationDefinition');
-        $method->setAccessible(true);
-        $method->invoke($this->command, false);
-        
-        // reads native definition
-        $method = new \ReflectionMethod($this->command, 'getNativeDefinition');
-        $method->setAccessible(true);
-
-        return $method->invoke($this->command);
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
index 433b4aef66f35..b0b61c9fbfa77 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Descriptor\Json;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -24,17 +23,18 @@ class CommandJsonDescriptor extends AbstractJsonDescriptor
      */
     public function getData($object)
     {
-        $definitionDescriptor = new InputDefinitionJsonDescriptor();
         /** @var Command $object */
-        $description = new CommandDescription($object);
+        $object->getSynopsis();
+        $object->mergeApplicationDefinition(false);
+        $definitionDescriptor = new InputDefinitionJsonDescriptor();
 
         return array(
-            'name'        => $description->getName(),
-            'usage'       => $description->getSynopsis(),
-            'description' => $description->getDescription(),
-            'help'        => $description->getHelp(),
-            'aliases'     => $description->getAliases(),
-            'definition'  => $definitionDescriptor->getData($description->getDefinition()),
+            'name'        => $object->getName(),
+            'usage'       => $object->getSynopsis(),
+            'description' => $object->getDescription(),
+            'help'        => $object->getProcessedHelp(),
+            'aliases'     => $object->getAliases(),
+            'definition'  => $definitionDescriptor->getData($object->getNativeDefinition()),
         );
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
index 78fc1885bbe60..3a118d47dfa53 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -25,20 +24,21 @@ class CommandMarkdownDescriptor extends AbstractMarkdownDescriptor
     public function describe($object)
     {
         /** @var Command $object */
-        $description = new CommandDescription($object);
+        $object->getSynopsis();
+        $object->mergeApplicationDefinition(false);
         $definitionDescriptor = new InputDefinitionMarkdownDescriptor();
 
-        $markdown = $description->getName()."\n"
-            .str_repeat('-', strlen($description->getName()))."\n\n"
-            .'* Description: '.($description->getDescription() ?: '<none>')."\n"
-            .'* Usage: `'.$description->getSynopsis().'`'."\n"
-            .'* Aliases: '.(count($description->getAliases()) ? '`'.implode('`, `', $description->getAliases()).'`' : '<none>');
+        $markdown = $object->getName()."\n"
+            .str_repeat('-', strlen($object->getName()))."\n\n"
+            .'* Description: '.($object->getDescription() ?: '<none>')."\n"
+            .'* Usage: `'.$object->getSynopsis().'`'."\n"
+            .'* Aliases: '.(count($object->getAliases()) ? '`'.implode('`, `', $object->getAliases()).'`' : '<none>');
 
-        if ($description->getHelp()) {
-            $markdown .= "\n\n".$description->getHelp();
+        if ($help = $object->getProcessedHelp()) {
+            $markdown .= "\n\n".$help;
         }
 
-        $definitionMarkdown = $definitionDescriptor->describe($description->getDefinition());
+        $definitionMarkdown = $definitionDescriptor->describe($object->getNativeDefinition());
         if ($definitionMarkdown) {
             $markdown .= "\n\n".$definitionMarkdown;
         }
diff --git a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
index 98556cf8ae0c5..90b35a9447577 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Descriptor\Text;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -33,17 +32,18 @@ public function getRawText($object)
     public function getFormattedText($object)
     {
         /** @var Command $object */
-        $description = new CommandDescription($object);
-        $messages = array('<comment>Usage:</comment>', ' '.$description->getSynopsis(), '');
+        $object->getSynopsis();
+        $object->mergeApplicationDefinition(false);
+        $messages = array('<comment>Usage:</comment>', ' '.$object->getSynopsis(), '');
 
         if ($object->getAliases()) {
-            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $description->getAliases()).'</info>';
+            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $object->getAliases()).'</info>';
         }
 
         $descriptor = new InputDefinitionTextDescriptor();
-        $messages[] = $descriptor->getFormattedText($description->getDefinition());
+        $messages[] = $descriptor->getFormattedText($object->getNativeDefinition());
 
-        if ($help = $description->getHelp()) {
+        if ($help = $object->getProcessedHelp()) {
             $messages[] = '<comment>Help:</comment>';
             $messages[] = ' '.str_replace("\n", "\n ", $help)."\n";
         }
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
index abf9e424f94a1..c1335f8c791ac 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Console\Descriptor\Xml;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Descriptor\CommandDescription;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
@@ -28,28 +27,29 @@ public function buildDocument(\DOMNode $parent, $object)
         $parent->appendChild($commandXML = $dom->createElement('command'));
 
         /** @var Command $object */
-        $description = new CommandDescription($object);
-        
-        $commandXML->setAttribute('id', $description->getName());
-        $commandXML->setAttribute('name', $description->getName());
+        $object->getSynopsis();
+        $object->mergeApplicationDefinition(false);
+
+        $commandXML->setAttribute('id', $object->getName());
+        $commandXML->setAttribute('name', $object->getName());
 
         $commandXML->appendChild($usageXML = $dom->createElement('usage'));
-        $usageXML->appendChild($dom->createTextNode(sprintf($description->getSynopsis(), '')));
+        $usageXML->appendChild($dom->createTextNode(sprintf($object->getSynopsis(), '')));
 
         $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $description->getDescription())));
+        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getDescription())));
 
         $commandXML->appendChild($helpXML = $dom->createElement('help'));
-        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $description->getHelp())));
+        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getProcessedHelp())));
 
         $commandXML->appendChild($aliasesXML = $dom->createElement('aliases'));
-        foreach ($description->getAliases() as $alias) {
+        foreach ($object->getAliases() as $alias) {
             $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
             $aliasXML->appendChild($dom->createTextNode($alias));
         }
 
         $descriptor = new InputDefinitionXmlDescriptor();
-        $descriptor->buildDocument($commandXML, $description->getDefinition());
+        $descriptor->buildDocument($commandXML, $object->getNativeDefinition());
     }
 
     /**

From 20c10a5606b0c9e3622c7af38a839d17b4fbffe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Sun, 14 Apr 2013 21:35:06 +0200
Subject: [PATCH 18/24] [Console] added provider injection to descriptors

---
 src/Symfony/Component/Console/Application.php | 10 ++---
 .../Component/Console/Command/Command.php     | 10 ++---
 .../Console/Descriptor/AbstractDescriptor.php | 40 +++++++++++++++++++
 .../Descriptor/DescriptorInterface.php        |  5 +++
 .../Console/Descriptor/DescriptorProvider.php |  1 +
 .../Json/AbstractJsonDescriptor.php           |  4 +-
 .../Json/ApplicationJsonDescriptor.php        |  7 +++-
 .../Descriptor/Json/CommandJsonDescriptor.php |  4 +-
 .../Json/InputDefinitionJsonDescriptor.php    | 21 +++++-----
 .../Markdown/AbstractMarkdownDescriptor.php   |  4 +-
 .../ApplicationMarkdownDescriptor.php         |  4 +-
 .../Markdown/CommandMarkdownDescriptor.php    |  4 +-
 .../InputDefinitionMarkdownDescriptor.php     |  7 +---
 .../Text/AbstractTextDescriptor.php           |  4 +-
 .../Descriptor/Text/CommandTextDescriptor.php |  4 +-
 .../Text/InputDefinitionTextDescriptor.php    | 12 ++++--
 .../Descriptor/Xml/AbstractXmlDescriptor.php  |  4 +-
 .../Xml/ApplicationXmlDescriptor.php          |  3 +-
 .../Descriptor/Xml/CommandXmlDescriptor.php   |  4 +-
 .../Xml/InputDefinitionXmlDescriptor.php      |  6 +--
 .../Console/Input/InputDefinition.php         | 10 ++---
 .../Descriptor/AbstractDescriptorTest.php     |  3 ++
 22 files changed, 111 insertions(+), 60 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 8505dfc51531a..42c26d2c4c15e 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\Console;
 
-use Symfony\Component\Console\Descriptor\Text\ApplicationTextDescriptor;
-use Symfony\Component\Console\Descriptor\Xml\ApplicationXmlDescriptor;
+use Symfony\Component\Console\Descriptor\DescriptorProvider;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -694,9 +693,9 @@ public static function getAbbreviations($names)
      */
     public function asText($namespace = null, $raw = false)
     {
-        $descriptor = new ApplicationTextDescriptor($namespace, $raw);
+        $descriptor = new DescriptorProvider(array('namespace' => $namespace, 'raw_text' => $raw));
 
-        return $descriptor->describe($this);
+        return $descriptor->get($this, 'txt')->describe($this);
     }
 
     /**
@@ -711,7 +710,8 @@ public function asText($namespace = null, $raw = false)
      */
     public function asXml($namespace = null, $asDom = false)
     {
-        $descriptor = new ApplicationXmlDescriptor($namespace);
+        $provider = new DescriptorProvider(array('namespace' => $namespace));
+        $descriptor = $provider->get($this, 'xml');
 
         if ($asDom) {
             $dom = new \DOMDocument('1.0', 'UTF-8');
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index faa519d12673f..bd2104d7d7806 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\Console\Command;
 
-use Symfony\Component\Console\Descriptor\Text\CommandTextDescriptor;
-use Symfony\Component\Console\Descriptor\Xml\CommandXmlDescriptor;
+use Symfony\Component\Console\Descriptor\DescriptorProvider;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
@@ -566,9 +565,9 @@ public function getHelper($name)
      */
     public function asText()
     {
-        $descriptor = new CommandTextDescriptor();
+        $descriptor = new DescriptorProvider();
 
-        return $descriptor->describe($this);
+        return $descriptor->get($this, 'txt')->describe($this);
     }
 
     /**
@@ -582,7 +581,8 @@ public function asText()
      */
     public function asXml($asDom = false)
     {
-        $descriptor = new CommandXmlDescriptor();
+        $provider = new DescriptorProvider();
+        $descriptor = $provider->get($this, 'xml');
 
         if ($asDom) {
             $dom = new \DOMDocument('1.0', 'UTF-8');
diff --git a/src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php b/src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php
new file mode 100644
index 0000000000000..3b335ad683ef3
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+abstract class AbstractDescriptor implements DescriptorInterface
+{
+    /**
+     * @var DescriptorProvider|null
+     */
+    private $descriptorProvider;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setDescriptorProvider(DescriptorProvider $descriptorProvider)
+    {
+        $this->descriptorProvider = $descriptorProvider;
+    }
+
+    /**
+     * Returns a descriptor for given object with current format.
+     *
+     * @param object $object
+     *
+     * @return DescriptorInterface
+     *
+     * @throws \LogicException
+     */
+    protected function getDescriptor($object)
+    {
+        if (null === $this->descriptorProvider) {
+            throw new \LogicException('You must set a descriptor provider to get a descriptor.');
+        }
+
+        return $this->descriptorProvider->get($object, $this->getFormat());
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index efc12cc01a93c..e4726e1507afa 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -56,4 +56,9 @@ public function getFormat();
      * @return boolean
      */
     public function useFormatting();
+
+    /**
+     * @param DescriptorProvider $descriptorProvider
+     */
+    public function setDescriptorProvider(DescriptorProvider $descriptorProvider);
 }
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
index 310debf29aec2..ba238187a9e0d 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
@@ -75,6 +75,7 @@ public function __construct(array $options = array())
     public function add(DescriptorInterface $descriptor)
     {
         $descriptor->configure($this->options);
+        $descriptor->setDescriptorProvider($this);
         $this->descriptors[] = $descriptor;
 
         return $this;
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
index 6effd8be75b89..02d87ff95596e 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Console\Descriptor\Json;
 
-use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Descriptor\AbstractDescriptor;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractJsonDescriptor implements DescriptorInterface
+abstract class AbstractJsonDescriptor extends AbstractDescriptor
 {
     /**
      * @var int
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
index 730e3b573c38c..739c82ec42406 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
@@ -53,8 +53,11 @@ public function getData($object)
     {
         /** @var Application $object */
         $description = new ApplicationDescription($object, $this->namespace);
-        $descriptor = new CommandJsonDescriptor();
-        $commands = array_values(array_map(array($descriptor, 'getData'), $description->getCommands()));
+        $commands = array();
+
+        foreach ($description->getCommands() as $command) {
+            $commands[] = $this->getDescriptor($command)->getData($command);
+        }
 
         return null === $this->namespace
             ? array('commands' => $commands, 'namespaces' => array_values($description->getNamespaces()))
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
index b0b61c9fbfa77..8c8fd259e550a 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
@@ -26,7 +26,7 @@ public function getData($object)
         /** @var Command $object */
         $object->getSynopsis();
         $object->mergeApplicationDefinition(false);
-        $definitionDescriptor = new InputDefinitionJsonDescriptor();
+        $definition = $object->getNativeDefinition();
 
         return array(
             'name'        => $object->getName(),
@@ -34,7 +34,7 @@ public function getData($object)
             'description' => $object->getDescription(),
             'help'        => $object->getProcessedHelp(),
             'aliases'     => $object->getAliases(),
-            'definition'  => $definitionDescriptor->getData($object->getNativeDefinition()),
+            'definition'  => $this->getDescriptor($definition)->getData($definition),
         );
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
index 9ad445a7b1bc1..9b184c78b85a4 100644
--- a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
@@ -25,17 +25,20 @@ class InputDefinitionJsonDescriptor extends AbstractJsonDescriptor
      */
     public function getData($object)
     {
-        $argumentDescriptor = new InputArgumentJsonDescriptor();
-        $optionDescriptor = new InputOptionJsonDescriptor();
-
+        $arguments = array();
         /** @var InputDefinition $object */
+        foreach ($object->getArguments() as $name => $argument) {
+            $arguments[$name] = $this->getDescriptor($argument)->getData($argument);
+        }
+
+        $options = array();
+        foreach ($object->getOptions() as $name => $option) {
+            $options[$name] = $this->getDescriptor($option)->getData($option);
+        }
+
         return array(
-            'arguments' => array_map(function (InputArgument $argument) use ($argumentDescriptor) {
-                return $argumentDescriptor->getData($argument);
-            }, $object->getArguments()),
-            'options' => array_map(function (InputOption $option) use ($optionDescriptor) {
-                return $optionDescriptor->getData($option);
-            }, $object->getOptions()),
+            'arguments' => $arguments,
+            'options'   => $options
         );
     }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
index a4448d1c99b1d..268616c473b94 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Console\Descriptor\Markdown;
 
-use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Descriptor\AbstractDescriptor;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractMarkdownDescriptor implements DescriptorInterface
+abstract class AbstractMarkdownDescriptor extends AbstractDescriptor
 {
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
index 1e23e86f002b8..4f0f52bc45325 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
@@ -52,8 +52,6 @@ public function describe($object)
     {
         /** @var Application $object */
         $description = new ApplicationDescription($object, $this->namespace);
-        $descriptor = new CommandMarkdownDescriptor();
-
         $blocks = array($object->getName()."\n".str_repeat('=', strlen($object->getName())));
 
         foreach ($description->getNamespaces() as $namespace) {
@@ -67,7 +65,7 @@ public function describe($object)
         }
 
         foreach ($description->getCommands() as $command) {
-            $blocks[] = $descriptor->describe($command);
+            $blocks[] = $this->getDescriptor($command)->describe($command);
         }
 
         return implode("\n\n", $blocks);
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
index 3a118d47dfa53..0921bbf89f972 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
@@ -26,7 +26,6 @@ public function describe($object)
         /** @var Command $object */
         $object->getSynopsis();
         $object->mergeApplicationDefinition(false);
-        $definitionDescriptor = new InputDefinitionMarkdownDescriptor();
 
         $markdown = $object->getName()."\n"
             .str_repeat('-', strlen($object->getName()))."\n\n"
@@ -38,7 +37,8 @@ public function describe($object)
             $markdown .= "\n\n".$help;
         }
 
-        $definitionMarkdown = $definitionDescriptor->describe($object->getNativeDefinition());
+        $definition = $object->getNativeDefinition();
+        $definitionMarkdown = $this->getDescriptor($definition)->describe($definition);
         if ($definitionMarkdown) {
             $markdown .= "\n\n".$definitionMarkdown;
         }
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
index 6a2c21dcaed36..92daa675bffbe 100644
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
@@ -24,22 +24,19 @@ class InputDefinitionMarkdownDescriptor extends AbstractMarkdownDescriptor
     public function describe($object)
     {
         $blocks = array();
-        $argumentDescriptor = new InputArgumentMarkdownDescriptor();
-        $optionDescriptor = new InputOptionMarkdownDescriptor();
 
         /** @var InputDefinition $object */
-
         if (count($object->getArguments()) > 0) {
             $blocks[] = '### Arguments:';
             foreach ($object->getArguments() as $argument) {
-                $blocks[] = $argumentDescriptor->describe($argument);
+                $blocks[] = $this->getDescriptor($argument)->describe($argument);
             }
         }
 
         if (count($object->getOptions()) > 0) {
             $blocks[] = '### Options:';
             foreach ($object->getOptions() as $option) {
-                $blocks[] = $optionDescriptor->describe($option);
+                $blocks[] = $this->getDescriptor($option)->describe($option);
             }
         }
 
diff --git a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
index bd6bcecb1d977..77ca0da21820c 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Console\Descriptor\Text;
 
-use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Descriptor\AbstractDescriptor;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractTextDescriptor implements DescriptorInterface
+abstract class AbstractTextDescriptor extends AbstractDescriptor
 {
     /**
      * @var boolean
diff --git a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
index 90b35a9447577..5665c184b2c76 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
@@ -40,8 +40,8 @@ public function getFormattedText($object)
             $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $object->getAliases()).'</info>';
         }
 
-        $descriptor = new InputDefinitionTextDescriptor();
-        $messages[] = $descriptor->getFormattedText($object->getNativeDefinition());
+        $definition = $object->getNativeDefinition();
+        $messages[] = $this->getDescriptor($definition)->getFormattedText($definition);
 
         if ($help = $object->getProcessedHelp()) {
             $messages[] = '<comment>Help:</comment>';
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
index 2aa32a164c0b1..a1e802c5bdc16 100644
--- a/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
@@ -54,18 +54,22 @@ public function getFormattedText($object)
 
         if ($object->getArguments()) {
             $text[] = '<comment>Arguments:</comment>';
-            $descriptor = new InputArgumentTextDescriptor($nameWidth);
             foreach ($object->getArguments() as $argument) {
-                $text[] = $descriptor->getFormattedText($argument);
+                $text[] = $this
+                    ->getDescriptor($argument)
+                    ->configure(array('name_width' => $nameWidth))
+                    ->getFormattedText($argument);
             }
             $text[] = '';
         }
 
         if ($object->getOptions()) {
             $text[] = '<comment>Options:</comment>';
-            $descriptor = new InputOptionTextDescriptor($nameWidth);
             foreach ($object->getOptions() as $option) {
-                $text[] = $descriptor->getFormattedText($option);
+                $text[] = $this
+                    ->getDescriptor($option)
+                    ->configure(array('name_width' => $nameWidth))
+                    ->getFormattedText($option);
             }
             $text[] = '';
         }
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
index 7a59e6e960e91..8dacc6f189e52 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
@@ -11,12 +11,12 @@
 
 namespace Symfony\Component\Console\Descriptor\Xml;
 
-use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Descriptor\AbstractDescriptor;
 
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractXmlDescriptor implements DescriptorInterface
+abstract class AbstractXmlDescriptor extends AbstractDescriptor
 {
     /**
      * {@inheritdoc}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
index cf1d6efe8cc45..7392cb1de1af3 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
@@ -56,14 +56,13 @@ public function buildDocument(\DOMNode $parent, $object)
 
         /** @var Application $object */
         $description = new ApplicationDescription($object, $this->namespace);
-        $descriptor = new CommandXmlDescriptor();
 
         if ($this->namespace) {
             $commandsXML->setAttribute('namespace', $this->namespace);
         }
 
         foreach ($description->getCommands() as $command) {
-            $descriptor->buildDocument($commandsXML, $command);
+            $this->getDescriptor($command)->buildDocument($commandsXML, $command);
         }
 
         if (!$this->namespace) {
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
index c1335f8c791ac..7a044396c8ffd 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
@@ -48,8 +48,8 @@ public function buildDocument(\DOMNode $parent, $object)
             $aliasXML->appendChild($dom->createTextNode($alias));
         }
 
-        $descriptor = new InputDefinitionXmlDescriptor();
-        $descriptor->buildDocument($commandXML, $object->getNativeDefinition());
+        $definition = $object->getNativeDefinition();
+        $this->getDescriptor($definition)->buildDocument($commandXML, $definition);
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
index 99865fd114d25..588653f1b3716 100644
--- a/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
@@ -31,16 +31,14 @@ public function buildDocument(\DOMNode $parent, $object)
         }
 
         $parent->appendChild($argumentsXML = $dom->createElement('arguments'));
-        $descriptor = new InputArgumentXmlDescriptor();
         /** @var InputDefinition $object */
         foreach ($object->getArguments() as $argument) {
-            $descriptor->buildDocument($argumentsXML, $argument);
+            $this->getDescriptor($argument)->buildDocument($argumentsXML, $argument);
         }
 
         $parent->appendChild($optionsXML = $dom->createElement('options'));
-        $descriptor = new InputOptionXmlDescriptor();
         foreach ($object->getOptions() as $option) {
-            $descriptor->buildDocument($optionsXML, $option);
+            $this->getDescriptor($option)->buildDocument($optionsXML, $option);
         }
     }
 
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index c240573169381..56c4bf09e8952 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\Console\Input;
 
-use Symfony\Component\Console\Descriptor\Text\InputDefinitionTextDescriptor;
-use Symfony\Component\Console\Descriptor\Xml\InputDefinitionXmlDescriptor;
+use Symfony\Component\Console\Descriptor\DescriptorProvider;
 
 /**
  * A InputDefinition represents a set of valid command line arguments and options.
@@ -413,9 +412,9 @@ public function getSynopsis()
      */
     public function asText()
     {
-        $descriptor = new InputDefinitionTextDescriptor();
+        $descriptor = new DescriptorProvider();
 
-        return $descriptor->describe($this);
+        return $descriptor->get($this, 'txt')->describe($this);
     }
 
     /**
@@ -429,7 +428,8 @@ public function asText()
      */
     public function asXml($asDom = false)
     {
-        $descriptor = new InputDefinitionXmlDescriptor();
+        $provider = new DescriptorProvider();
+        $descriptor = $provider->get($this, 'xml');
 
         if ($asDom) {
             $dom = new \DOMDocument('1.0', 'UTF-8');
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index 0ca0ace266376..16d00b14d1ce4 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
+use Symfony\Component\Console\Descriptor\DescriptorProvider;
 use Symfony\Component\Console\Input\InputArgument;
 
 abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
@@ -24,6 +25,8 @@ public function testDescribe(DescriptorInterface $descriptor, $object, $descript
             $this->ensureStaticCommandHelp($object);
         }
 
+        $descriptor->setDescriptorProvider(new DescriptorProvider());
+
         $this->assertTrue($descriptor->supports($object));
         $this->assertEquals(trim($description), trim($descriptor->describe($object)));
     }

From 9c7b3586b5f57aad264e27ac94dae25af07698ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Tue, 23 Apr 2013 09:50:30 +0200
Subject: [PATCH 19/24] [Console] simplified descriptors

---
 src/Symfony/Component/Console/Application.php |  19 +-
 .../Component/Console/Command/Command.php     |  19 +-
 .../Console/Descriptor/AbstractDescriptor.php |  40 ----
 .../Descriptor/DescriptorInterface.php        |  64 +++---
 .../Console/Descriptor/DescriptorProvider.php | 150 -------------
 .../Console/Descriptor/DescriptorProxy.php    | 118 ++++++++++
 .../Json/AbstractJsonDescriptor.php           |  78 -------
 .../Json/ApplicationJsonDescriptor.php        |  74 -------
 .../Descriptor/Json/CommandJsonDescriptor.php |  48 -----
 .../Json/InputArgumentJsonDescriptor.php      |  43 ----
 .../Json/InputDefinitionJsonDescriptor.php    |  52 -----
 .../Json/InputOptionJsonDescriptor.php        |  45 ----
 .../Console/Descriptor/JsonDescriptor.php     | 120 +++++++++++
 .../Markdown/AbstractMarkdownDescriptor.php   |  44 ----
 .../ApplicationMarkdownDescriptor.php         |  81 -------
 .../Markdown/CommandMarkdownDescriptor.php    |  56 -----
 .../InputArgumentMarkdownDescriptor.php       |  42 ----
 .../InputDefinitionMarkdownDescriptor.php     |  53 -----
 .../InputOptionMarkdownDescriptor.php         |  44 ----
 .../Console/Descriptor/MarkdownDescriptor.php | 120 +++++++++++
 .../Text/AbstractTextDescriptor.php           |  96 ---------
 .../Text/ApplicationTextDescriptor.php        | 119 -----------
 .../Descriptor/Text/CommandTextDescriptor.php |  61 ------
 .../Text/InputArgumentTextDescriptor.php      |  81 -------
 .../Text/InputDefinitionTextDescriptor.php    |  87 --------
 .../Text/InputOptionTextDescriptor.php        |  87 --------
 .../Console/Descriptor/TextDescriptor.php     | 201 ++++++++++++++++++
 .../Descriptor/Xml/AbstractXmlDescriptor.php  |  64 ------
 .../Xml/ApplicationXmlDescriptor.php          |  90 --------
 .../Descriptor/Xml/CommandXmlDescriptor.php   |  62 ------
 .../Xml/InputArgumentXmlDescriptor.php        |  51 -----
 .../Xml/InputDefinitionXmlDescriptor.php      |  52 -----
 .../Xml/InputOptionXmlDescriptor.php          |  58 -----
 .../Console/Descriptor/XmlDescriptor.php      | 197 +++++++++++++++++
 .../Console/Helper/DescriptorHelper.php       |  42 +++-
 .../Console/Input/InputDefinition.php         |  19 +-
 .../Descriptor/AbstractDescriptorTest.php     |  87 +++++---
 .../Json/ApplicationJsonDescriptorTest.php    |  29 ---
 .../Json/CommandJsonDescriptorTest.php        |  29 ---
 .../Json/InputArgumentJsonDescriptorTest.php  |  29 ---
 .../InputDefinitionJsonDescriptorTest.php     |  29 ---
 .../Json/InputOptionJsonDescriptorTest.php    |  29 ---
 .../Tests/Descriptor/JsonDescriptorTest.php   |  18 ++
 .../ApplicationMarkdownDescriptorTest.php     |  29 ---
 .../CommandMarkdownDescriptorTest.php         |  29 ---
 .../InputArgumentMarkdownDescriptorTest.php   |  29 ---
 .../InputDefinitionMarkdownDescriptorTest.php |  29 ---
 .../InputOptionMarkdownDescriptorTest.php     |  29 ---
 .../Descriptor/MarkdownDescriptorTest.php     |  18 ++
 .../Text/ApplicationTextDescriptorTest.php    |  29 ---
 .../Text/CommandTextDescriptorTest.php        |  29 ---
 .../Text/InputArgumentTextDescriptorTest.php  |  29 ---
 .../InputDefinitionTextDescriptorTest.php     |  29 ---
 .../Text/InputOptionTextDescriptorTest.php    |  29 ---
 .../Tests/Descriptor/TextDescriptorTest.php   |  18 ++
 .../Xml/ApplicationXmlDescriptorTest.php      |  29 ---
 .../Xml/CommandXmlDescriptorTest.php          |  29 ---
 .../Xml/InputArgumentXmlDescriptorTest.php    |  29 ---
 .../Xml/InputDefinitionXmlDescriptorTest.php  |  29 ---
 .../Xml/InputOptionXmlDescriptorTest.php      |  29 ---
 .../Tests/Descriptor/XmlDescriptorTest.php    |  18 ++
 61 files changed, 971 insertions(+), 2445 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/TextDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
 create mode 100644 src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php
 delete mode 100644 src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php
 create mode 100644 src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 42c26d2c4c15e..64f101084b714 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Component\Console;
 
-use Symfony\Component\Console\Descriptor\DescriptorProvider;
+use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -693,9 +694,9 @@ public static function getAbbreviations($names)
      */
     public function asText($namespace = null, $raw = false)
     {
-        $descriptor = new DescriptorProvider(array('namespace' => $namespace, 'raw_text' => $raw));
+        $descriptor = new TextDescriptor();
 
-        return $descriptor->get($this, 'txt')->describe($this);
+        return $descriptor->describeApplication($this, array('namespace' => $namespace, 'raw_text' => $raw));
     }
 
     /**
@@ -710,17 +711,9 @@ public function asText($namespace = null, $raw = false)
      */
     public function asXml($namespace = null, $asDom = false)
     {
-        $provider = new DescriptorProvider(array('namespace' => $namespace));
-        $descriptor = $provider->get($this, 'xml');
+        $descriptor = new XmlDescriptor();
 
-        if ($asDom) {
-            $dom = new \DOMDocument('1.0', 'UTF-8');
-            $descriptor->buildDocument($dom, $this);
-
-            return $dom;
-        }
-
-        return $descriptor->describe($this);
+        return $descriptor->describeApplication($this, array('namespace' => $namespace, 'as_dom' => $asDom));
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index bd2104d7d7806..083fae10ff608 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Component\Console\Command;
 
-use Symfony\Component\Console\Descriptor\DescriptorProvider;
+use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
@@ -565,9 +566,9 @@ public function getHelper($name)
      */
     public function asText()
     {
-        $descriptor = new DescriptorProvider();
+        $descriptor = new TextDescriptor();
 
-        return $descriptor->get($this, 'txt')->describe($this);
+        return $descriptor->describeCommand($this);
     }
 
     /**
@@ -581,17 +582,9 @@ public function asText()
      */
     public function asXml($asDom = false)
     {
-        $provider = new DescriptorProvider();
-        $descriptor = $provider->get($this, 'xml');
+        $descriptor = new XmlDescriptor();
 
-        if ($asDom) {
-            $dom = new \DOMDocument('1.0', 'UTF-8');
-            $descriptor->buildDocument($dom, $this);
-
-            return $dom;
-        }
-
-        return $descriptor->describe($this);
+        return $descriptor->describeCommand($this, array('as_dom' => $asDom));
     }
 
     private function validateName($name)
diff --git a/src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php b/src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php
deleted file mode 100644
index 3b335ad683ef3..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/AbstractDescriptor.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Symfony\Component\Console\Descriptor;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractDescriptor implements DescriptorInterface
-{
-    /**
-     * @var DescriptorProvider|null
-     */
-    private $descriptorProvider;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDescriptorProvider(DescriptorProvider $descriptorProvider)
-    {
-        $this->descriptorProvider = $descriptorProvider;
-    }
-
-    /**
-     * Returns a descriptor for given object with current format.
-     *
-     * @param object $object
-     *
-     * @return DescriptorInterface
-     *
-     * @throws \LogicException
-     */
-    protected function getDescriptor($object)
-    {
-        if (null === $this->descriptorProvider) {
-            throw new \LogicException('You must set a descriptor provider to get a descriptor.');
-        }
-
-        return $this->descriptorProvider->get($object, $this->getFormat());
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index e4726e1507afa..635ce81d79ea2 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -1,64 +1,62 @@
 <?php
 
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 namespace Symfony\Component\Console\Descriptor;
 
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
 /**
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ * Descriptor interface.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
  */
 interface DescriptorInterface
 {
     /**
-     * Configures descriptor with description options.
+     * @param InputArgument $argument
      *
-     * @param array $options Description options
+     * @param array $options
      *
-     * @return DescriptorInterface
+     * @return string|mixed
      */
-    public function configure(array $options);
+    public function describeInputArgument(InputArgument $argument, array $options = array());
 
     /**
-     * Returns given object's representation.
+     * @param InputOption $option
      *
-     * @param object  $object The object to describe
+     * @param array $options
      *
-     * @return string The object formatted description
+     * @return string|mixed
      */
-    public function describe($object);
+    public function describeInputOption(InputOption $option, array $options = array());
 
     /**
-     * Tests if this descriptor supports given object.
+     * @param InputDefinition $definition
      *
-     * @param object $object The object to describe
+     * @param array $options
      *
-     * @return boolean
+     * @return string|mixed
      */
-    public function supports($object);
+    public function describeInputDefinition(InputDefinition $definition, array $options = array());
 
     /**
-     * Returns descriptor's format name.
+     * @param Command $command
      *
-     * @return string The format name
-     */
-    public function getFormat();
-
-    /**
-     * Returns true if output formatting is used.
+     * @param array $options
      *
-     * @return boolean
+     * @return string|mixed
      */
-    public function useFormatting();
+    public function describeCommand(Command $command, array $options = array());
 
     /**
-     * @param DescriptorProvider $descriptorProvider
+     * @param Application $application
+     *
+     * @param array $options
+     *
+     * @return string|mixed
      */
-    public function setDescriptorProvider(DescriptorProvider $descriptorProvider);
+    public function describeApplication(Application $application, array $options = array());
 }
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php b/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
deleted file mode 100644
index ba238187a9e0d..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProvider.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Descriptor\Json;
-
-/**
- * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
- */
-class DescriptorProvider
-{
-    /**
-     * @var DescriptorInterface[]
-     */
-    private $descriptors = array();
-
-    /**
-     * @var array
-     */
-    private $options = array(
-        'default_format' => 'txt',
-        'namespace'      => null,
-        'raw_text'       => false,
-        'json_encoding'  => 0,
-    );
-
-    /**
-     * Constructor.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $this
-            ->configure($options)
-            ->add(new Text\ApplicationTextDescriptor())
-            ->add(new Text\CommandTextDescriptor())
-            ->add(new Text\InputDefinitionTextDescriptor())
-            ->add(new Text\InputArgumentTextDescriptor())
-            ->add(new Text\InputOptionTextDescriptor())
-            ->add(new Xml\ApplicationXmlDescriptor())
-            ->add(new Xml\CommandXmlDescriptor())
-            ->add(new Xml\InputDefinitionXmlDescriptor())
-            ->add(new Xml\InputArgumentXmlDescriptor())
-            ->add(new Xml\InputOptionXmlDescriptor())
-            ->add(new Json\ApplicationJsonDescriptor())
-            ->add(new Json\CommandJsonDescriptor())
-            ->add(new Json\InputDefinitionJsonDescriptor())
-            ->add(new Json\InputArgumentJsonDescriptor())
-            ->add(new Json\InputOptionJsonDescriptor())
-            ->add(new Markdown\ApplicationMarkdownDescriptor())
-            ->add(new Markdown\CommandMarkdownDescriptor())
-            ->add(new Markdown\InputDefinitionMarkdownDescriptor())
-            ->add(new Markdown\InputArgumentMarkdownDescriptor())
-            ->add(new Markdown\InputOptionMarkdownDescriptor())
-        ;
-    }
-
-    /**
-     * Adds a descriptor to the stack.
-     *
-     * @param DescriptorInterface $descriptor
-     *
-     * @return DescriptorProvider
-     */
-    public function add(DescriptorInterface $descriptor)
-    {
-        $descriptor->configure($this->options);
-        $descriptor->setDescriptorProvider($this);
-        $this->descriptors[] = $descriptor;
-
-        return $this;
-    }
-
-    /**
-     * Configures provider with options.
-     *
-     * @param array $options
-     *
-     * @return DescriptorProvider
-     */
-    public function configure(array $options)
-    {
-        $this->options = array_replace($this->options, $options);
-
-        foreach ($this->descriptors as $descriptor) {
-            $descriptor->configure($this->options);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Provides a descriptor for given object and format.
-     *
-     * @param mixed  $object The object to describe
-     * @param string $format The description format
-     *
-     * @return DescriptorInterface The object descriptor
-     *
-     * @throws \InvalidArgumentException If no descriptors was found
-     */
-    public function get($object, $format)
-    {
-        foreach ($this->descriptors as $descriptor) {
-            if ($format === $descriptor->getFormat() && $descriptor->supports($object)) {
-                return $descriptor;
-            }
-        }
-
-        throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
-    }
-
-    /**
-     * Returns default format.
-     *
-     * @return string
-     */
-    public function getDefaultFormat()
-    {
-        return $this->options['default_format'];
-    }
-
-    /**
-     * Returns supported formats list.
-     *
-     * @return array
-     */
-    public function getSupportedFormats()
-    {
-        $supportedFormats = array();
-        foreach ($this->descriptors as $descriptor) {
-            $supportedFormats[] = $descriptor->getFormat();
-        }
-
-        $supportedFormats = array_unique($supportedFormats);
-        sort($supportedFormats);
-
-        return $supportedFormats;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php b/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
new file mode 100644
index 0000000000000..45b149afbd16b
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class DescriptorProxy implements DescriptorInterface
+{
+    /**
+     * @var array
+     */
+    private $defaultOptions = array();
+
+    /**
+     * @var DescriptorInterface[]
+     */
+    private $descriptors = array();
+
+    /**
+     * Constructor.
+     *
+     * Valid options are:
+     * * format:        string       default rendering format
+     * * namespace:     string|null  namespace for application description
+     * * raw_text:      boolean      for raw text description
+     * * json_encoding: integer      options for json encoding
+     *
+     * @param array $options
+     */
+    public function __construct(array $options = array())
+    {
+        $this->defaultOptions = array_merge(array(
+            'format'        => 'txt',
+            'namespace'     => null,
+            'raw_text'      => false,
+            'json_encoding' => 0,
+        ), $options);
+
+        $this
+            ->register('txt',  new TextDescriptor())
+            ->register('xml',  new XmlDescriptor())
+            ->register('json', new JsonDescriptor())
+            ->register('md',   new MarkdownDescriptor())
+        ;
+    }
+
+    /**
+     * Registers a descriptor.
+     *
+     * @param string              $format
+     * @param DescriptorInterface $descriptor
+     *
+     * @return DescriptorProxy
+     */
+    public function register($format, DescriptorInterface $descriptor)
+    {
+        $this->descriptors[$format] = $descriptor;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputArgument(InputArgument $argument, array $options = array())
+    {
+        $options = array_merge($this->defaultOptions, $options);
+
+        return $this->descriptors[$options['format']]->describeInputArgument($argument, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputOption(InputOption $option, array $options = array())
+    {
+        $options = array_merge($this->defaultOptions, $options);
+
+        return $this->descriptors[$options['format']]->describeInputOption($option, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    {
+        $options = array_merge($this->defaultOptions, $options);
+
+        return $this->descriptors[$options['format']]->describeInputDefinition($definition, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeCommand(Command $command, array $options = array())
+    {
+        $options = array_merge($this->defaultOptions, $options);
+
+        return $this->descriptors[$options['format']]->describeCommand($command, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeApplication(Application $application, array $options = array())
+    {
+        $options = array_merge($this->defaultOptions, $options);
+
+        return $this->descriptors[$options['format']]->describeApplication($application, $options);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
deleted file mode 100644
index 02d87ff95596e..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Json/AbstractJsonDescriptor.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\AbstractDescriptor;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractJsonDescriptor extends AbstractDescriptor
-{
-    /**
-     * @var int
-     */
-    private $encodingOptions;
-
-    /**
-     * @param int $encodingOptions
-     */
-    public function __construct($encodingOptions = 0)
-    {
-        $this->encodingOptions = $encodingOptions;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['json_encoding'])) {
-            $this->encodingOptions = $options['json_encoding'];
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        return json_encode($this->getData($object), $this->encodingOptions);
-    }
-
-    /**
-     * Returns object data to encode.
-     *
-     * @param object $object
-     *
-     * @return array
-     */
-    abstract public function getData($object);
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormat()
-    {
-        return 'json';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function useFormatting()
-    {
-        return false;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
deleted file mode 100644
index 739c82ec42406..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Json/ApplicationJsonDescriptor.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Json;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Descriptor\ApplicationDescription;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class ApplicationJsonDescriptor extends AbstractJsonDescriptor
-{
-    /**
-     * @var string|null
-     */
-    private $namespace;
-
-    /**
-     * @param string|null $namespace
-     * @param int         $encodingOptions
-     */
-    public function __construct($namespace = null, $encodingOptions = 0)
-    {
-        $this->namespace = $namespace;
-        parent::__construct($encodingOptions);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['namespace'])) {
-            $this->namespace = $options['namespace'];
-        }
-
-        return parent::configure($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getData($object)
-    {
-        /** @var Application $object */
-        $description = new ApplicationDescription($object, $this->namespace);
-        $commands = array();
-
-        foreach ($description->getCommands() as $command) {
-            $commands[] = $this->getDescriptor($command)->getData($command);
-        }
-
-        return null === $this->namespace
-            ? array('commands' => $commands, 'namespaces' => array_values($description->getNamespaces()))
-            : array('commands' => $commands, 'namespace' => $this->namespace);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Application;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
deleted file mode 100644
index 8c8fd259e550a..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Json/CommandJsonDescriptor.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Json;
-
-use Symfony\Component\Console\Command\Command;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class CommandJsonDescriptor extends AbstractJsonDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getData($object)
-    {
-        /** @var Command $object */
-        $object->getSynopsis();
-        $object->mergeApplicationDefinition(false);
-        $definition = $object->getNativeDefinition();
-
-        return array(
-            'name'        => $object->getName(),
-            'usage'       => $object->getSynopsis(),
-            'description' => $object->getDescription(),
-            'help'        => $object->getProcessedHelp(),
-            'aliases'     => $object->getAliases(),
-            'definition'  => $this->getDescriptor($definition)->getData($definition),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Command;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
deleted file mode 100644
index fe9b9ca63fb71..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Json/InputArgumentJsonDescriptor.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Json;
-
-use Symfony\Component\Console\Input\InputArgument;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputArgumentJsonDescriptor extends AbstractJsonDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getData($object)
-    {
-        /** @var InputArgument $object */
-        return array(
-            'name'        => $object->getName(),
-            'is_required' => $object->isRequired(),
-            'is_array'    => $object->isArray(),
-            'description' => $object->getDescription(),
-            'default'     => $object->getDefault(),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputArgument;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
deleted file mode 100644
index 9b184c78b85a4..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Json/InputDefinitionJsonDescriptor.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Json;
-
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputDefinitionJsonDescriptor extends AbstractJsonDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getData($object)
-    {
-        $arguments = array();
-        /** @var InputDefinition $object */
-        foreach ($object->getArguments() as $name => $argument) {
-            $arguments[$name] = $this->getDescriptor($argument)->getData($argument);
-        }
-
-        $options = array();
-        foreach ($object->getOptions() as $name => $option) {
-            $options[$name] = $this->getDescriptor($option)->getData($option);
-        }
-
-        return array(
-            'arguments' => $arguments,
-            'options'   => $options
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputDefinition;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
deleted file mode 100644
index 329c813d48b6b..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Json/InputOptionJsonDescriptor.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Json;
-
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputOptionJsonDescriptor extends AbstractJsonDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getData($object)
-    {
-        /** @var InputOption $object */
-        return array(
-            'name'              => '--'.$object->getName(),
-            'shortcut'          => $object->getShortcut() ? '-'.$object->getShortcut() : '',
-            'accept_value'      => $object->acceptValue(),
-            'is_value_required' => $object->isValueRequired(),
-            'is_multiple'       => $object->isArray(),
-            'description'       => $object->getDescription(),
-            'default'           => $object->getDefault(),
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputOption;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
new file mode 100644
index 0000000000000..40970c8ea92d3
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * JSON descriptor.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class JsonDescriptor implements DescriptorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputArgument(InputArgument $argument, array $options = array())
+    {
+        return $this->output(array(
+            'name'        => $argument->getName(),
+            'is_required' => $argument->isRequired(),
+            'is_array'    => $argument->isArray(),
+            'description' => $argument->getDescription(),
+            'default'     => $argument->getDefault(),
+        ), $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputOption(InputOption $option, array $options = array())
+    {
+        return $this->output(array(
+            'name'              => '--'.$option->getName(),
+            'shortcut'          => $option->getShortcut() ? '-'.$option->getShortcut() : '',
+            'accept_value'      => $option->acceptValue(),
+            'is_value_required' => $option->isValueRequired(),
+            'is_multiple'       => $option->isArray(),
+            'description'       => $option->getDescription(),
+            'default'           => $option->getDefault(),
+        ), $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    {
+        $inputArguments = array();
+        foreach ($definition->getArguments() as $name => $argument) {
+            $inputArguments[$name] = $this->describeInputArgument($argument, array('as_array' => true));
+        }
+
+        $inputOptions = array();
+        foreach ($definition->getOptions() as $name => $option) {
+            $inputOptions[$name] = $this->describeInputOption($option, array('as_array' => true));
+        }
+
+        return $this->output(array('arguments' => $inputArguments, 'options' => $inputOptions), $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeCommand(Command $command, array $options = array())
+    {
+        $command->getSynopsis();
+        $command->mergeApplicationDefinition(false);
+
+        return $this->output(array(
+            'name'        => $command->getName(),
+            'usage'       => $command->getSynopsis(),
+            'description' => $command->getDescription(),
+            'help'        => $command->getProcessedHelp(),
+            'aliases'     => $command->getAliases(),
+            'definition'  => $this->describeInputDefinition($command->getNativeDefinition(), array('as_array' => true)),
+        ), $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeApplication(Application $application, array $options = array())
+    {
+        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $description = new ApplicationDescription($application, $describedNamespace);
+        $commands = array();
+
+        foreach ($description->getCommands() as $command) {
+            $commands[] = $this->describeCommand($command, array('as_array' => true));
+        }
+
+        $data = $describedNamespace
+            ? array('commands' => $commands, 'namespace' => $describedNamespace)
+            : array('commands' => $commands, 'namespaces' => array_values($description->getNamespaces()));
+
+        return $this->output($data, $options);
+    }
+
+    /**
+     * Outputs data as array or string according to options.
+     *
+     * @param array $data
+     * @param array $options
+     *
+     * @return array|string
+     */
+    private function output(array $data, array $options)
+    {
+        if (isset($options['as_array']) && $options['as_array']) {
+            return $data;
+        }
+
+        return json_encode($data, isset($options['json_encoding']) ? $options['json_encoding'] : 0);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
deleted file mode 100644
index 268616c473b94..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/AbstractMarkdownDescriptor.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown;
-
-use Symfony\Component\Console\Descriptor\AbstractDescriptor;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractMarkdownDescriptor extends AbstractDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormat()
-    {
-        return 'md';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function useFormatting()
-    {
-        return false;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
deleted file mode 100644
index 4f0f52bc45325..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/ApplicationMarkdownDescriptor.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Descriptor\ApplicationDescription;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class ApplicationMarkdownDescriptor extends AbstractMarkdownDescriptor
-{
-    /**
-     * @var string|null
-     */
-    private $namespace;
-
-    /**
-     * @param string|null $namespace
-     * @param int         $maxWidth
-     */
-    public function __construct($namespace = null, $maxWidth = 120)
-    {
-        $this->namespace = $namespace;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['namespace'])) {
-            $this->namespace = $options['namespace'];
-        }
-
-        return parent::configure($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        /** @var Application $object */
-        $description = new ApplicationDescription($object, $this->namespace);
-        $blocks = array($object->getName()."\n".str_repeat('=', strlen($object->getName())));
-
-        foreach ($description->getNamespaces() as $namespace) {
-            if (ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
-                $blocks[] = '**'.$namespace['id'].':**';
-            }
-
-            $blocks[] = implode("\n", array_map(function ($commandName) {
-                return '* '.$commandName;
-            } , $namespace['commands']));
-        }
-
-        foreach ($description->getCommands() as $command) {
-            $blocks[] = $this->getDescriptor($command)->describe($command);
-        }
-
-        return implode("\n\n", $blocks);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Application;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
deleted file mode 100644
index 0921bbf89f972..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/CommandMarkdownDescriptor.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown;
-
-use Symfony\Component\Console\Command\Command;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class CommandMarkdownDescriptor extends AbstractMarkdownDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        /** @var Command $object */
-        $object->getSynopsis();
-        $object->mergeApplicationDefinition(false);
-
-        $markdown = $object->getName()."\n"
-            .str_repeat('-', strlen($object->getName()))."\n\n"
-            .'* Description: '.($object->getDescription() ?: '<none>')."\n"
-            .'* Usage: `'.$object->getSynopsis().'`'."\n"
-            .'* Aliases: '.(count($object->getAliases()) ? '`'.implode('`, `', $object->getAliases()).'`' : '<none>');
-
-        if ($help = $object->getProcessedHelp()) {
-            $markdown .= "\n\n".$help;
-        }
-
-        $definition = $object->getNativeDefinition();
-        $definitionMarkdown = $this->getDescriptor($definition)->describe($definition);
-        if ($definitionMarkdown) {
-            $markdown .= "\n\n".$definitionMarkdown;
-        }
-
-        return $markdown;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Command;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
deleted file mode 100644
index cd2e043ec8c0e..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputArgumentMarkdownDescriptor.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown;
-
-use Symfony\Component\Console\Input\InputArgument;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputArgumentMarkdownDescriptor extends AbstractMarkdownDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        /** @var InputArgument $object */
-        return '**'.$object->getName().':**'."\n\n"
-            .'* Name: '.($object->getName() ?: '<none>')."\n"
-            .'* Is required: '.($object->isRequired() ? 'yes' : 'no')."\n"
-            .'* Is array: '.($object->isArray() ? 'yes' : 'no')."\n"
-            .'* Description: '.($object->getDescription() ?: '<none>')."\n"
-            .'* Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputArgument;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
deleted file mode 100644
index 92daa675bffbe..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputDefinitionMarkdownDescriptor.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown;
-
-use Symfony\Component\Console\Input\InputDefinition;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputDefinitionMarkdownDescriptor extends AbstractMarkdownDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        $blocks = array();
-
-        /** @var InputDefinition $object */
-        if (count($object->getArguments()) > 0) {
-            $blocks[] = '### Arguments:';
-            foreach ($object->getArguments() as $argument) {
-                $blocks[] = $this->getDescriptor($argument)->describe($argument);
-            }
-        }
-
-        if (count($object->getOptions()) > 0) {
-            $blocks[] = '### Options:';
-            foreach ($object->getOptions() as $option) {
-                $blocks[] = $this->getDescriptor($option)->describe($option);
-            }
-        }
-
-        return implode("\n\n", $blocks);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputDefinition;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
deleted file mode 100644
index 624f3644cf947..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Markdown/InputOptionMarkdownDescriptor.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Markdown;
-
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputOptionMarkdownDescriptor extends AbstractMarkdownDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        /** @var InputOption $object */
-        return '**'.$object->getName().':**'."\n\n"
-            .'* Name: `--'.$object->getName().'`'."\n"
-            .'* Shortcut: '.($object->getShortcut() ? '`-'.$object->getShortcut().'`' : '<none>')."\n"
-            .'* Accept value: '.($object->acceptValue() ? 'yes' : 'no')."\n"
-            .'* Is value required: '.($object->isValueRequired() ? 'yes' : 'no')."\n"
-            .'* Is multiple: '.($object->isArray() ? 'yes' : 'no')."\n"
-            .'* Description: '.($object->getDescription() ?: '<none>')."\n"
-            .'* Default: `'.str_replace("\n", '', var_export($object->getDefault(), true)).'`';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputOption;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
new file mode 100644
index 0000000000000..f7b6da04943b6
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * Markdown descriptor.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class MarkdownDescriptor implements DescriptorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputArgument(InputArgument $argument, array $options = array())
+    {
+        return '**'.$argument->getName().':**'."\n\n"
+            .'* Name: '.($argument->getName() ?: '<none>')."\n"
+            .'* Is required: '.($argument->isRequired() ? 'yes' : 'no')."\n"
+            .'* Is array: '.($argument->isArray() ? 'yes' : 'no')."\n"
+            .'* Description: '.($argument->getDescription() ?: '<none>')."\n"
+            .'* Default: `'.str_replace("\n", '', var_export($argument->getDefault(), true)).'`';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputOption(InputOption $option, array $options = array())
+    {
+        return '**'.$option->getName().':**'."\n\n"
+            .'* Name: `--'.$option->getName().'`'."\n"
+            .'* Shortcut: '.($option->getShortcut() ? '`-'.$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"
+            .'* Description: '.($option->getDescription() ?: '<none>')."\n"
+            .'* Default: `'.str_replace("\n", '', var_export($option->getDefault(), true)).'`';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    {
+        $blocks = array();
+
+        if (count($definition->getArguments()) > 0) {
+            $blocks[] = '### Arguments:';
+            foreach ($definition->getArguments() as $argument) {
+                $blocks[] = $this->describeInputArgument($argument);
+            }
+        }
+
+        if (count($definition->getOptions()) > 0) {
+            $blocks[] = '### Options:';
+            foreach ($definition->getOptions() as $option) {
+                $blocks[] = $this->describeInputOption($option);
+            }
+        }
+
+        return implode("\n\n", $blocks);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeCommand(Command $command, array $options = array())
+    {
+        $command->getSynopsis();
+        $command->mergeApplicationDefinition(false);
+
+        $markdown = $command->getName()."\n"
+            .str_repeat('-', strlen($command->getName()))."\n\n"
+            .'* Description: '.($command->getDescription() ?: '<none>')."\n"
+            .'* Usage: `'.$command->getSynopsis().'`'."\n"
+            .'* Aliases: '.(count($command->getAliases()) ? '`'.implode('`, `', $command->getAliases()).'`' : '<none>');
+
+        if ($help = $command->getProcessedHelp()) {
+            $markdown .= "\n\n".$help;
+        }
+
+        if ($definitionMarkdown = $this->describeInputDefinition($command->getNativeDefinition())) {
+            $markdown .= "\n\n".$definitionMarkdown;
+        }
+
+        return $markdown;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeApplication(Application $application, array $options = array())
+    {
+        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $description = new ApplicationDescription($application, $describedNamespace);
+        $blocks = array($application->getName()."\n".str_repeat('=', strlen($application->getName())));
+
+        foreach ($description->getNamespaces() as $namespace) {
+            if (ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
+                $blocks[] = '**'.$namespace['id'].':**';
+            }
+
+            $blocks[] = implode("\n", array_map(function ($commandName) {
+                return '* '.$commandName;
+            } , $namespace['commands']));
+        }
+
+        foreach ($description->getCommands() as $command) {
+            $blocks[] = $this->describeCommand($command);
+        }
+
+        return implode("\n\n", $blocks);
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
deleted file mode 100644
index 77ca0da21820c..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Text/AbstractTextDescriptor.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Text;
-
-use Symfony\Component\Console\Descriptor\AbstractDescriptor;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractTextDescriptor extends AbstractDescriptor
-{
-    /**
-     * @var boolean
-     */
-    private $raw;
-
-    /**
-     * @param boolean $raw
-     */
-    public function __construct($raw = false)
-    {
-        $this->raw = $raw;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['raw_text'])) {
-            $this->raw = $options['raw_text'];
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        return $this->raw ? $this->getRawText($object) : $this->getFormattedText($object);
-    }
-
-    /**
-     * Returns object's raw text description.
-     *
-     * @param object $object
-     *
-     * @return string
-     */
-    abstract public function getRawText($object);
-
-    /**
-     * Returns object's formatted text description.
-     *
-     * @param object $object
-     *
-     * @return string
-     */
-    abstract public function getFormattedText($object);
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormat()
-    {
-        return 'txt';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function useFormatting()
-    {
-        return true;
-    }
-
-    protected function formatDefaultValue($default)
-    {
-        if (version_compare(PHP_VERSION, '5.4', '<')) {
-            return str_replace('\/', '/', json_encode($default));
-        }
-
-        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
deleted file mode 100644
index be5b89fd30472..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Text/ApplicationTextDescriptor.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Text;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Descriptor\ApplicationDescription;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class ApplicationTextDescriptor extends AbstractTextDescriptor
-{
-    /**
-     * @var string|null
-     */
-    private $namespace;
-
-    /**
-     * @param string|null $namespace
-     * @param bool        $raw
-     */
-    public function __construct($namespace = null, $raw = false)
-    {
-        $this->namespace = $namespace;
-        parent::__construct($raw);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['namespace'])) {
-            $this->namespace = $options['namespace'];
-        }
-
-        return parent::configure($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawText($object)
-    {
-        /** @var Application $object */
-        $description = new ApplicationDescription($object, $this->namespace);
-        $width = $this->getColumnWidth($description->getCommands());
-        $messages = array();
-
-        foreach ($description->getCommands() as $command) {
-            $messages[] = sprintf("%-${width}s %s", $command->getName(), $command->getDescription());
-        }
-
-        return implode(PHP_EOL, $messages);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormattedText($object)
-    {
-        /** @var Application $object */
-        $description = new ApplicationDescription($object, $this->namespace);
-        $width = $this->getColumnWidth($description->getCommands());
-        $messages = array($object->getHelp(), '');
-
-        if ($this->namespace) {
-            $messages[] = sprintf("<comment>Available commands for the \"%s\" namespace:</comment>", $this->namespace);
-        } else {
-            $messages[] = '<comment>Available commands:</comment>';
-        }
-
-        // add commands by namespace
-        foreach ($description->getNamespaces() as $namespace) {
-            if (!$this->namespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
-                $messages[] = '<comment>'.$namespace['id'].'</comment>';
-            }
-
-            foreach ($namespace['commands'] as $name) {
-                $messages[] = sprintf("  <info>%-${width}s</info> %s", $name, $description->getCommand($name)->getDescription());
-            }
-        }
-
-        return implode(PHP_EOL, $messages);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Application;
-    }
-
-    /**
-     * @param Command[] $commands
-     *
-     * @return int
-     */
-    private function getColumnWidth(array $commands)
-    {
-        $width = 0;
-        foreach ($commands as $command) {
-            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
-        }
-
-        return $width + 2;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
deleted file mode 100644
index 5665c184b2c76..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Text/CommandTextDescriptor.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Text;
-
-use Symfony\Component\Console\Command\Command;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class CommandTextDescriptor extends AbstractTextDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawText($object)
-    {
-        return strip_tags($this->getFormattedText($object));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormattedText($object)
-    {
-        /** @var Command $object */
-        $object->getSynopsis();
-        $object->mergeApplicationDefinition(false);
-        $messages = array('<comment>Usage:</comment>', ' '.$object->getSynopsis(), '');
-
-        if ($object->getAliases()) {
-            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $object->getAliases()).'</info>';
-        }
-
-        $definition = $object->getNativeDefinition();
-        $messages[] = $this->getDescriptor($definition)->getFormattedText($definition);
-
-        if ($help = $object->getProcessedHelp()) {
-            $messages[] = '<comment>Help:</comment>';
-            $messages[] = ' '.str_replace("\n", "\n ", $help)."\n";
-        }
-
-        return implode("\n", $messages);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Command;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php
deleted file mode 100644
index 96fd69c5bb556..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Text/InputArgumentTextDescriptor.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Text;
-
-use Symfony\Component\Console\Input\InputArgument;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputArgumentTextDescriptor extends AbstractTextDescriptor
-{
-    /**
-     * @var int|null
-     */
-    private $nameWidth;
-
-    /**
-     * @param string|null $nameWidth
-     * @param bool        $raw
-     */
-    public function __construct($nameWidth = null, $raw = false)
-    {
-        $this->nameWidth = $nameWidth;
-        parent::__construct($raw);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['name_width'])) {
-            $this->nameWidth = $options['name_width'];
-        }
-
-        return parent::configure($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawText($object)
-    {
-        return strip_tags($this->getFormattedText($object));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormattedText($object)
-    {
-        /** @var InputArgument $object */
-        if (null !== $object->getDefault() && (!is_array($object->getDefault()) || count($object->getDefault()))) {
-            $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($object->getDefault()));
-        } else {
-            $default = '';
-        }
-
-        $nameWidth = $this->nameWidth ?: strlen($object->getName());
-        $description = str_replace("\n", "\n".str_repeat(' ', $nameWidth + 2), $object->getDescription());
-
-        return sprintf(" <info>%-${nameWidth}s</info> %s%s", $object->getName(), $description, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputArgument;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
deleted file mode 100644
index a1e802c5bdc16..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Text/InputDefinitionTextDescriptor.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Text;
-
-use Symfony\Component\Console\Input\InputDefinition;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputDefinitionTextDescriptor extends AbstractTextDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawText($object)
-    {
-        return strip_tags($this->getFormattedText($object));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormattedText($object)
-    {
-        // find the largest option or argument name
-        $nameWidth = 0;
-
-        /** @var InputDefinition $object */
-        foreach ($object->getOptions() as $option) {
-            $nameLength = strlen($option->getName()) + 2;
-            if ($option->getShortcut()) {
-                $nameLength += strlen($option->getShortcut()) + 3;
-            }
-
-            $nameWidth = max($nameWidth, $nameLength);
-        }
-
-        foreach ($object->getArguments() as $argument) {
-            $nameWidth = max($nameWidth, strlen($argument->getName()));
-        }
-
-        ++$nameWidth;
-
-        $text = array();
-
-        if ($object->getArguments()) {
-            $text[] = '<comment>Arguments:</comment>';
-            foreach ($object->getArguments() as $argument) {
-                $text[] = $this
-                    ->getDescriptor($argument)
-                    ->configure(array('name_width' => $nameWidth))
-                    ->getFormattedText($argument);
-            }
-            $text[] = '';
-        }
-
-        if ($object->getOptions()) {
-            $text[] = '<comment>Options:</comment>';
-            foreach ($object->getOptions() as $option) {
-                $text[] = $this
-                    ->getDescriptor($option)
-                    ->configure(array('name_width' => $nameWidth))
-                    ->getFormattedText($option);
-            }
-            $text[] = '';
-        }
-
-        return implode("\n", $text);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputDefinition;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php
deleted file mode 100644
index c3daf3f9c90e7..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Text/InputOptionTextDescriptor.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Text;
-
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputOptionTextDescriptor extends AbstractTextDescriptor
-{
-    /**
-     * @var int|null
-     */
-    private $nameWidth;
-
-    /**
-     * @param string|null $nameWidth
-     * @param bool        $raw
-     */
-    public function __construct($nameWidth = null, $raw = false)
-    {
-        $this->nameWidth = $nameWidth;
-        parent::__construct($raw);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['name_width'])) {
-            $this->nameWidth = $options['name_width'];
-        }
-
-        return parent::configure($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRawText($object)
-    {
-        return strip_tags($this->getFormattedText($object));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormattedText($object)
-    {
-        /** @var InputOption $object */
-        if ($object->acceptValue() && null !== $object->getDefault() && (!is_array($object->getDefault()) || count($object->getDefault()))) {
-            $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($object->getDefault()));
-        } else {
-            $default = '';
-        }
-
-        $nameWidth = $this->nameWidth ?: strlen($object->getName());
-        $nameWithShortcutWidth = $nameWidth - strlen($object->getName()) - 2;
-
-        return sprintf(" <info>%s</info> %-${nameWithShortcutWidth}s%s%s%s",
-            '--'.$object->getName(),
-            $object->getShortcut() ? sprintf('(-%s) ', $object->getShortcut()) : '',
-            str_replace("\n", "\n".str_repeat(' ', $nameWidth + 2), $object->getDescription()),
-            $default,
-            $object->isArray() ? '<comment> (multiple values allowed)</comment>' : ''
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputOption;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
new file mode 100644
index 0000000000000..db873f0b71277
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -0,0 +1,201 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * Text descriptor.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class TextDescriptor implements DescriptorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputArgument(InputArgument $argument, array $options = array())
+    {
+        if (null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault()))) {
+            $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($argument->getDefault()));
+        } else {
+            $default = '';
+        }
+
+        $nameWidth = isset($options['name_width']) ? $options['name_width'] : strlen($argument->getName());
+        $output = str_replace("\n", "\n".str_repeat(' ', $nameWidth + 2), $argument->getDescription());
+        $output = sprintf(" <info>%-${nameWidth}s</info> %s%s", $argument->getName(), $output, $default);
+
+        return isset($options['raw_text']) && $options['raw_text'] ? strip_tags($output) : $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputOption(InputOption $option, array $options = array())
+    {
+        if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) {
+            $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($option->getDefault()));
+        } else {
+            $default = '';
+        }
+
+        $nameWidth = isset($options['name_width']) ? $options['name_width'] : strlen($option->getName());
+        $nameWithShortcutWidth = $nameWidth - strlen($option->getName()) - 2;
+
+        $output = sprintf(" <info>%s</info> %-${nameWithShortcutWidth}s%s%s%s",
+            '--'.$option->getName(),
+            $option->getShortcut() ? sprintf('(-%s) ', $option->getShortcut()) : '',
+            str_replace("\n", "\n".str_repeat(' ', $nameWidth + 2), $option->getDescription()),
+            $default,
+            $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''
+        );
+
+        return isset($options['raw_text']) && $options['raw_text'] ? strip_tags($output) : $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    {
+        $nameWidth = 0;
+        foreach ($definition->getOptions() as $option) {
+            $nameLength = strlen($option->getName()) + 2;
+            if ($option->getShortcut()) {
+                $nameLength += strlen($option->getShortcut()) + 3;
+            }
+            $nameWidth = max($nameWidth, $nameLength);
+        }
+        foreach ($definition->getArguments() as $argument) {
+            $nameWidth = max($nameWidth, strlen($argument->getName()));
+        }
+        ++$nameWidth;
+
+        $messages = array();
+
+        if ($definition->getArguments()) {
+            $messages[] = '<comment>Arguments:</comment>';
+            foreach ($definition->getArguments() as $argument) {
+                $messages[] = $this->describeInputArgument($argument, array('name_width' => $nameWidth));
+            }
+            $messages[] = '';
+        }
+
+        if ($definition->getOptions()) {
+            $messages[] = '<comment>Options:</comment>';
+            foreach ($definition->getOptions() as $option) {
+                $messages[] = $this->describeInputOption($option, array('name_width' => $nameWidth));
+            }
+            $messages[] = '';
+        }
+
+        $output = implode("\n", $messages);
+
+        return isset($options['raw_text']) && $options['raw_text'] ? strip_tags($output) : $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeCommand(Command $command, array $options = array())
+    {
+        $command->getSynopsis();
+        $command->mergeApplicationDefinition(false);
+        $messages = array('<comment>Usage:</comment>', ' '.$command->getSynopsis(), '');
+
+        if ($command->getAliases()) {
+            $messages[] = '<comment>Aliases:</comment> <info>'.implode(', ', $command->getAliases()).'</info>';
+        }
+
+        $messages[] = $this->describeInputDefinition($command->getNativeDefinition());
+
+        if ($help = $command->getProcessedHelp()) {
+            $messages[] = '<comment>Help:</comment>';
+            $messages[] = ' '.str_replace("\n", "\n ", $help)."\n";
+        }
+
+        $output = implode("\n", $messages);
+
+        return isset($options['raw_text']) && $options['raw_text'] ? strip_tags($output) : $output;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeApplication(Application $application, array $options = array())
+    {
+        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $description = new ApplicationDescription($application, $describedNamespace);
+        $messages = array();
+
+        if (isset($options['raw_text']) && $options['raw_text']) {
+            $width = $this->getColumnWidth($description->getCommands());
+
+            foreach ($description->getCommands() as $command) {
+                $messages[] = sprintf("%-${width}s %s", $command->getName(), $command->getDescription());
+            }
+        } else {
+            $width = $this->getColumnWidth($description->getCommands());
+
+            $messages[] = $application->getHelp();
+            $messages[] = '';
+
+            if ($describedNamespace) {
+                $messages[] = sprintf("<comment>Available commands for the \"%s\" namespace:</comment>", $describedNamespace);
+            } else {
+                $messages[] = '<comment>Available commands:</comment>';
+            }
+
+            // add commands by namespace
+            foreach ($description->getNamespaces() as $namespace) {
+                if (!$describedNamespace && ApplicationDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
+                    $messages[] = '<comment>'.$namespace['id'].'</comment>';
+                }
+
+                foreach ($namespace['commands'] as $name) {
+                    $messages[] = sprintf("  <info>%-${width}s</info> %s", $name, $description->getCommand($name)->getDescription());
+                }
+            }
+        }
+
+        $output = implode("\n", $messages);
+
+        return isset($options['raw_text']) && $options['raw_text'] ? strip_tags($output) : $output;
+    }
+
+    /**
+     * Formats input option/argument default value.
+     *
+     * @param mixed $default
+     *
+     * @return string
+     */
+    private function formatDefaultValue($default)
+    {
+        if (version_compare(PHP_VERSION, '5.4', '<')) {
+            return str_replace('\/', '/', json_encode($default));
+        }
+
+        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+    }
+
+    /**
+     * @param Command[] $commands
+     *
+     * @return int
+     */
+    private function getColumnWidth(array $commands)
+    {
+        $width = 0;
+        foreach ($commands as $command) {
+            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
+        }
+
+        return $width + 2;
+    }
+}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
deleted file mode 100644
index 8dacc6f189e52..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Xml/AbstractXmlDescriptor.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Xml;
-
-use Symfony\Component\Console\Descriptor\AbstractDescriptor;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-abstract class AbstractXmlDescriptor extends AbstractDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describe($object)
-    {
-        $document = new \DOMDocument('1.0', 'UTF-8');
-        $document->formatOutput = true;
-        $this->buildDocument($document, $object);
-
-        return $document->saveXML();
-    }
-
-    /**
-     * Builds DOM document with object.
-     *
-     * @param \DOMNode $parent
-     * @param object   $object
-     */
-    abstract public function buildDocument(\DOMNode $parent, $object);
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFormat()
-    {
-        return 'xml';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function useFormatting()
-    {
-        return false;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
deleted file mode 100644
index 7392cb1de1af3..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Xml/ApplicationXmlDescriptor.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Xml;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Descriptor\ApplicationDescription;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class ApplicationXmlDescriptor extends AbstractXmlDescriptor
-{
-    /**
-     * @var string|null
-     */
-    private $namespace;
-
-    /**
-     * @param string|null $namespace
-     */
-    public function __construct($namespace = null)
-    {
-        $this->namespace = $namespace;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function configure(array $options)
-    {
-        if (isset($options['namespace'])) {
-            $this->namespace = $options['namespace'];
-        }
-
-        return parent::configure($options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function buildDocument(\DOMNode $parent, $object)
-    {
-        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
-        $dom->appendChild($rootXml = $dom->createElement('symfony'));
-        $rootXml->appendChild($commandsXML = $dom->createElement('commands'));
-
-        /** @var Application $object */
-        $description = new ApplicationDescription($object, $this->namespace);
-
-        if ($this->namespace) {
-            $commandsXML->setAttribute('namespace', $this->namespace);
-        }
-
-        foreach ($description->getCommands() as $command) {
-            $this->getDescriptor($command)->buildDocument($commandsXML, $command);
-        }
-
-        if (!$this->namespace) {
-            $rootXml->appendChild($namespacesXML = $dom->createElement('namespaces'));
-
-            foreach ($description->getNamespaces() as $namespace) {
-                $namespacesXML->appendChild($namespaceArrayXML = $dom->createElement('namespace'));
-                $namespaceArrayXML->setAttribute('id', $namespace['id']);
-
-                foreach ($namespace['commands'] as $name) {
-                    $namespaceArrayXML->appendChild($commandXML = $dom->createElement('command'));
-                    $commandXML->appendChild($dom->createTextNode($name));
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Application;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
deleted file mode 100644
index 7a044396c8ffd..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Xml/CommandXmlDescriptor.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Xml;
-
-use Symfony\Component\Console\Command\Command;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class CommandXmlDescriptor extends AbstractXmlDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function buildDocument(\DOMNode $parent, $object)
-    {
-        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
-        $parent->appendChild($commandXML = $dom->createElement('command'));
-
-        /** @var Command $object */
-        $object->getSynopsis();
-        $object->mergeApplicationDefinition(false);
-
-        $commandXML->setAttribute('id', $object->getName());
-        $commandXML->setAttribute('name', $object->getName());
-
-        $commandXML->appendChild($usageXML = $dom->createElement('usage'));
-        $usageXML->appendChild($dom->createTextNode(sprintf($object->getSynopsis(), '')));
-
-        $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getDescription())));
-
-        $commandXML->appendChild($helpXML = $dom->createElement('help'));
-        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $object->getProcessedHelp())));
-
-        $commandXML->appendChild($aliasesXML = $dom->createElement('aliases'));
-        foreach ($object->getAliases() as $alias) {
-            $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
-            $aliasXML->appendChild($dom->createTextNode($alias));
-        }
-
-        $definition = $object->getNativeDefinition();
-        $this->getDescriptor($definition)->buildDocument($commandXML, $definition);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof Command;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php
deleted file mode 100644
index b2391e6ff8c9b..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Xml/InputArgumentXmlDescriptor.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Xml;
-
-use Symfony\Component\Console\Input\InputArgument;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputArgumentXmlDescriptor extends AbstractXmlDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function buildDocument(\DOMNode $parent, $object)
-    {
-        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
-
-        /** @var InputArgument $object */
-        $parent->appendChild($objectXML = $dom->createElement('argument'));
-        $objectXML->setAttribute('name', $object->getName());
-        $objectXML->setAttribute('is_required', $object->isRequired() ? 1 : 0);
-        $objectXML->setAttribute('is_array', $object->isArray() ? 1 : 0);
-        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode($object->getDescription()));
-
-        $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-        $defaults = is_array($object->getDefault()) ? $object->getDefault() : (is_bool($object->getDefault()) ? array(var_export($object->getDefault(), true)) : ($object->getDefault() ? array($object->getDefault()) : array()));
-        foreach ($defaults as $default) {
-            $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-            $defaultXML->appendChild($dom->createTextNode($default));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputArgument;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
deleted file mode 100644
index 588653f1b3716..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Xml/InputDefinitionXmlDescriptor.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Xml;
-
-use Symfony\Component\Console\Input\InputDefinition;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputDefinitionXmlDescriptor extends AbstractXmlDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function buildDocument(\DOMNode $parent, $object)
-    {
-        if ($parent instanceof \DOMDocument) {
-            $dom = $parent;
-            $parent->appendChild($parent = $dom->createElement('definition'));
-        } else {
-            $dom = $parent->ownerDocument;
-        }
-
-        $parent->appendChild($argumentsXML = $dom->createElement('arguments'));
-        /** @var InputDefinition $object */
-        foreach ($object->getArguments() as $argument) {
-            $this->getDescriptor($argument)->buildDocument($argumentsXML, $argument);
-        }
-
-        $parent->appendChild($optionsXML = $dom->createElement('options'));
-        foreach ($object->getOptions() as $option) {
-            $this->getDescriptor($option)->buildDocument($optionsXML, $option);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputDefinition;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
deleted file mode 100644
index f11a7f26f728e..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/Xml/InputOptionXmlDescriptor.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor\Xml;
-
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class InputOptionXmlDescriptor extends AbstractXmlDescriptor
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function buildDocument(\DOMNode $parent, $object)
-    {
-        $dom = $parent instanceof \DOMDocument ? $parent : $parent->ownerDocument;
-
-        /** @var InputOption $object */
-        $parent->appendChild($objectXML = $dom->createElement('option'));
-        $objectXML->setAttribute('name', '--'.$object->getName());
-        $objectXML->setAttribute('shortcut', $object->getShortcut() ? '-'.$object->getShortcut() : '');
-        $objectXML->setAttribute('accept_value', $object->acceptValue() ? 1 : 0);
-        $objectXML->setAttribute('is_value_required', $object->isValueRequired() ? 1 : 0);
-        $objectXML->setAttribute('is_multiple', $object->isArray() ? 1 : 0);
-        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
-        $descriptionXML->appendChild($dom->createTextNode($object->getDescription()));
-
-        if ($object->acceptValue()) {
-            $defaults = is_array($object->getDefault()) ? $object->getDefault() : (is_bool($object->getDefault()) ? array(var_export($object->getDefault(), true)) : ($object->getDefault() ? array($object->getDefault()) : array()));
-            $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
-
-            if (!empty($defaults)) {
-                foreach ($defaults as $default) {
-                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-                    $defaultXML->appendChild($dom->createTextNode($default));
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($object)
-    {
-        return $object instanceof InputOption;
-    }
-}
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
new file mode 100644
index 0000000000000..f06e38fc17090
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -0,0 +1,197 @@
+<?php
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * XML descriptor.
+ *
+ * @author Jean-François Simon <contact@jfsimon.fr>
+ */
+class XmlDescriptor implements DescriptorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputArgument(InputArgument $argument, array $options = array())
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+
+        $dom->appendChild($objectXML = $dom->createElement('argument'));
+        $objectXML->setAttribute('name', $argument->getName());
+        $objectXML->setAttribute('is_required', $argument->isRequired() ? 1 : 0);
+        $objectXML->setAttribute('is_array', $argument->isArray() ? 1 : 0);
+        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode($argument->getDescription()));
+
+        $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
+        $defaults = is_array($argument->getDefault()) ? $argument->getDefault() : (is_bool($argument->getDefault()) ? array(var_export($argument->getDefault(), true)) : ($argument->getDefault() ? array($argument->getDefault()) : array()));
+        foreach ($defaults as $default) {
+            $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+            $defaultXML->appendChild($dom->createTextNode($default));
+        }
+
+        return $this->output($dom, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputOption(InputOption $option, array $options = array())
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+
+        $dom->appendChild($objectXML = $dom->createElement('option'));
+        $objectXML->setAttribute('name', '--'.$option->getName());
+        $objectXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
+        $objectXML->setAttribute('accept_value', $option->acceptValue() ? 1 : 0);
+        $objectXML->setAttribute('is_value_required', $option->isValueRequired() ? 1 : 0);
+        $objectXML->setAttribute('is_multiple', $option->isArray() ? 1 : 0);
+        $objectXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode($option->getDescription()));
+
+        if ($option->acceptValue()) {
+            $defaults = is_array($option->getDefault()) ? $option->getDefault() : (is_bool($option->getDefault()) ? array(var_export($option->getDefault(), true)) : ($option->getDefault() ? array($option->getDefault()) : array()));
+            $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
+
+            if (!empty($defaults)) {
+                foreach ($defaults as $default) {
+                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+                    $defaultXML->appendChild($dom->createTextNode($default));
+                }
+            }
+        }
+
+        return $this->output($dom, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->appendChild($definitionXML = $dom->createElement('definition'));
+
+        $definitionXML->appendChild($argumentsXML = $dom->createElement('arguments'));
+        foreach ($definition->getArguments() as $argument) {
+            $this->appendDocument($argumentsXML, $this->describeInputArgument($argument, array('as_dom' => true)));
+        }
+
+        $definitionXML->appendChild($optionsXML = $dom->createElement('options'));
+        foreach ($definition->getOptions() as $option) {
+            $this->appendDocument($optionsXML, $this->describeInputOption($option, array('as_dom' => true)));
+        }
+
+        return $this->output($dom, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeCommand(Command $command, array $options = array())
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->appendChild($commandXML = $dom->createElement('command'));
+
+        $command->getSynopsis();
+        $command->mergeApplicationDefinition(false);
+
+        $commandXML->setAttribute('id', $command->getName());
+        $commandXML->setAttribute('name', $command->getName());
+
+        $commandXML->appendChild($usageXML = $dom->createElement('usage'));
+        $usageXML->appendChild($dom->createTextNode(sprintf($command->getSynopsis(), '')));
+
+        $commandXML->appendChild($descriptionXML = $dom->createElement('description'));
+        $descriptionXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $command->getDescription())));
+
+        $commandXML->appendChild($helpXML = $dom->createElement('help'));
+        $helpXML->appendChild($dom->createTextNode(str_replace("\n", "\n ", $command->getProcessedHelp())));
+
+        $commandXML->appendChild($aliasesXML = $dom->createElement('aliases'));
+        foreach ($command->getAliases() as $alias) {
+            $aliasesXML->appendChild($aliasXML = $dom->createElement('alias'));
+            $aliasXML->appendChild($dom->createTextNode($alias));
+        }
+
+        $definitionXML = $this->describeInputDefinition($command->getNativeDefinition(), array('as_dom' => true));
+        $this->appendDocument($commandXML, $definitionXML->getElementsByTagName('definition')->item(0));
+
+        return $this->output($dom, $options);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describeApplication(Application $application, array $options = array())
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $dom->appendChild($rootXml = $dom->createElement('symfony'));
+        $rootXml->appendChild($commandsXML = $dom->createElement('commands'));
+
+        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $description = new ApplicationDescription($application, $describedNamespace);
+
+        if ($describedNamespace) {
+            $commandsXML->setAttribute('namespace', $describedNamespace);
+        }
+
+        foreach ($description->getCommands() as $command) {
+            $this->appendDocument($commandsXML, $this->describeCommand($command, array('as_dom' => true)));
+        }
+
+        if (!$describedNamespace) {
+            $rootXml->appendChild($namespacesXML = $dom->createElement('namespaces'));
+
+            foreach ($description->getNamespaces() as $namespace) {
+                $namespacesXML->appendChild($namespaceArrayXML = $dom->createElement('namespace'));
+                $namespaceArrayXML->setAttribute('id', $namespace['id']);
+
+                foreach ($namespace['commands'] as $name) {
+                    $namespaceArrayXML->appendChild($commandXML = $dom->createElement('command'));
+                    $commandXML->appendChild($dom->createTextNode($name));
+                }
+            }
+        }
+
+        return $this->output($dom, $options);
+    }
+
+    /**
+     * Appends document children to parent node.
+     *
+     * @param \DOMNode $parentNode
+     * @param \DOMNode $importedParent
+     */
+    private function appendDocument(\DOMNode $parentNode, \DOMNode $importedParent)
+    {
+        foreach ($importedParent->childNodes as $childNode) {
+            $parentNode->appendChild($parentNode->ownerDocument->importNode($childNode, true));
+        }
+    }
+
+    /**
+     * Outputs document as DOMDocument or string according to options.
+     *
+     * @param \DOMDocument $dom
+     * @param array        $options
+     *
+     * @return \DOMDocument|string
+     */
+    private function output(\DOMDocument $dom, array $options)
+    {
+        if (isset($options['as_dom']) && $options['as_dom']) {
+            return $dom;
+        }
+
+        $dom->formatOutput = true;
+
+        return $dom->saveXML();
+    }
+}
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index ed8dc44fb7a29..efca59c9d7a91 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -11,7 +11,12 @@
 
 namespace Symfony\Component\Console\Helper;
 
-use Symfony\Component\Console\Descriptor\DescriptorProvider;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\DescriptorProxy;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -22,18 +27,18 @@
 class DescriptorHelper extends Helper
 {
     /**
-     * @var DescriptorProvider
+     * @var DescriptorProxy
      */
-    private $provider;
+    private $descriptor;
 
     /**
      * Constructor.
      *
-     * @param DescriptorProvider $provider
+     * @param DescriptorProxy $descriptor
      */
-    public function __construct(DescriptorProvider $provider = null)
+    public function __construct(DescriptorProxy $descriptor = null)
     {
-        $this->provider = $provider ?: new DescriptorProvider();
+        $this->descriptor = $descriptor ?: new DescriptorProxy();
     }
 
     /**
@@ -46,11 +51,10 @@ public function __construct(DescriptorProvider $provider = null)
      */
     public function describe(OutputInterface $output, $object, $format = null, $raw = false)
     {
-        $format = $format ?: $this->provider->getDefaultFormat();
-        $descriptor = $this->provider->configure(array('raw_text' => $raw))->get($object, $format);
-        $type = !$raw && $descriptor->useFormatting() ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
+        $options = array('raw_text' => $raw, 'format' => $format ?: 'txt');
+        $type = !$raw && 'txt' === $options['format'] ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
 
-        $output->writeln($descriptor->describe($object), $type);
+        $output->writeln($this->getDescription($object, $options), $type);
     }
 
     /**
@@ -60,4 +64,22 @@ public function getName()
     {
         return 'descriptor';
     }
+
+    private function getDescription($object, array $options)
+    {
+        switch (true) {
+            case $object instanceof InputArgument:
+                return $this->descriptor->describeInputArgument($object, $options);
+            case $object instanceof InputOption:
+                return $this->descriptor->describeInputOption($object, $options);
+            case $object instanceof InputDefinition:
+                return $this->descriptor->describeInputDefinition($object, $options);
+            case $object instanceof Command:
+                return $this->descriptor->describeCommand($object, $options);
+            case $object instanceof Application:
+                return $this->descriptor->describeApplication($object, $options);
+        }
+
+        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
+    }
 }
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index 56c4bf09e8952..a627dd11d1056 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -11,7 +11,8 @@
 
 namespace Symfony\Component\Console\Input;
 
-use Symfony\Component\Console\Descriptor\DescriptorProvider;
+use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Descriptor\XmlDescriptor;
 
 /**
  * A InputDefinition represents a set of valid command line arguments and options.
@@ -412,9 +413,9 @@ public function getSynopsis()
      */
     public function asText()
     {
-        $descriptor = new DescriptorProvider();
+        $descriptor = new TextDescriptor();
 
-        return $descriptor->get($this, 'txt')->describe($this);
+        return $descriptor->describeInputDefinition($this);
     }
 
     /**
@@ -428,16 +429,8 @@ public function asText()
      */
     public function asXml($asDom = false)
     {
-        $provider = new DescriptorProvider();
-        $descriptor = $provider->get($this, 'xml');
+        $descriptor = new XmlDescriptor();
 
-        if ($asDom) {
-            $dom = new \DOMDocument('1.0', 'UTF-8');
-            $descriptor->buildDocument($dom, $this);
-
-            return $dom;
-        }
-
-        return $descriptor->describe($this);
+        return $descriptor->describeInputDefinition($this, array('as_dom' => $asDom));
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index 16d00b14d1ce4..f96f105699625 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -12,50 +12,87 @@
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
-use Symfony\Component\Console\Descriptor\DescriptorProvider;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
 
 abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
 {
-    /** @dataProvider getDescribeTestData */
-    public function testDescribe(DescriptorInterface $descriptor, $object, $description)
+    /** @dataProvider getDescribeInputArgumentTestData */
+    public function testDescribeInputArgument(DescriptorInterface $descriptor, InputArgument $argument, $expectedDescription)
     {
-        if ($object instanceof Application) {
-            $this->ensureStaticCommandHelp($object);
-        }
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeInputArgument($argument)));
+    }
 
-        $descriptor->setDescriptorProvider(new DescriptorProvider());
+    /** @dataProvider getDescribeInputOptionTestData */
+    public function testDescribeInputOption(DescriptorInterface $descriptor, InputOption $option, $expectedDescription)
+    {
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeInputOption($option)));
+    }
 
-        $this->assertTrue($descriptor->supports($object));
-        $this->assertEquals(trim($description), trim($descriptor->describe($object)));
+    /** @dataProvider getDescribeInputDefinitionTestData */
+    public function testDescribeInputDefinition(DescriptorInterface $descriptor, InputDefinition $definition, $expectedDescription)
+    {
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeInputDefinition($definition)));
     }
 
-    public function getDescribeTestData()
+    /** @dataProvider getDescribeCommandTestData */
+    public function testDescribeCommand(DescriptorInterface $descriptor, Command $command, $expectedDescription)
     {
-        $data = array();
-        $descriptor = $this->getDescriptor();
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeCommand($command)));
+    }
 
-        foreach ($this->getObjects() as $name => $object) {
-            $description = file_get_contents(sprintf('%s/../Fixtures/%s.%s', __DIR__, $name, $descriptor->getFormat()));
-            $data[] = array($descriptor, $object, $description);
+    /** @dataProvider getDescribeApplicationTestData */
+    public function testDescribeApplication(DescriptorInterface $descriptor, Application $application, $expectedDescription)
+    {
+        // Replaces the dynamic placeholders of the command help text with a static version.
+        // The placeholder %command.full_name% includes the script path that is not predictable
+        // and can not be tested against.
+        foreach ($application->all() as $command) {
+            $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp()));
         }
 
-        return $data;
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeApplication($application)));
+    }
+
+    public function getDescribeInputArgumentTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getInputArguments());
+    }
+
+    public function getDescribeInputOptionTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getInputOptions());
+    }
+
+    public function getDescribeInputDefinitionTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getInputDefinitions());
+    }
+
+    public function getDescribeCommandTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getCommands());
+    }
+
+    public function getDescribeApplicationTestData()
+    {
+        return $this->getDescriptionTestData(ObjectsProvider::getApplications());
     }
 
     abstract protected function getDescriptor();
-    abstract protected function getObjects();
+    abstract protected function getFormat();
 
-    /**
-     * Replaces the dynamic placeholders of the command help text with a static version.
-     * The placeholder %command.full_name% includes the script path that is not predictable
-     * and can not be tested against.
-     */
-    private function ensureStaticCommandHelp(Application $application)
+    private function getDescriptionTestData(array $objects)
     {
-        foreach ($application->all() as $command) {
-            $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp()));
+        $data = array();
+        foreach ($objects as $name => $object) {
+            $description = file_get_contents(sprintf('%s/../Fixtures/%s.%s', __DIR__, $name, $this->getFormat()));
+            $data[] = array($this->getDescriptor(), $object, $description);
         }
+
+        return $data;
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
deleted file mode 100644
index fc23056c8efb8..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/ApplicationJsonDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Json\ApplicationJsonDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class ApplicationJsonDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new ApplicationJsonDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getApplications();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
deleted file mode 100644
index 5ad11e3209fae..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/CommandJsonDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Json\CommandJsonDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class CommandJsonDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new CommandJsonDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getCommands();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
deleted file mode 100644
index 7c44b844d2a7e..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputArgumentJsonDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Json\InputArgumentJsonDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputArgumentJsonDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputArgumentJsonDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputArguments();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
deleted file mode 100644
index 24b93ebcdba4e..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputDefinitionJsonDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Json\InputDefinitionJsonDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputDefinitionJsonDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputDefinitionJsonDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputDefinitions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
deleted file mode 100644
index d23ffc85e0534..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Json/InputOptionJsonDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Json\InputOptionJsonDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputOptionJsonDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputOptionJsonDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputOptions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
new file mode 100644
index 0000000000000..301495ff5c9f3
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\JsonDescriptor;
+
+class JsonDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new JsonDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'json';
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
deleted file mode 100644
index d2a0144293d69..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/ApplicationMarkdownDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Markdown\ApplicationMarkdownDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class ApplicationMarkdownDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new ApplicationMarkdownDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getApplications();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
deleted file mode 100644
index e535df50e0d99..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/CommandMarkdownDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Markdown\CommandMarkdownDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class CommandMarkdownDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new CommandMarkdownDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getCommands();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
deleted file mode 100644
index 7e762f7807b5f..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputArgumentMarkdownDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Markdown\InputArgumentMarkdownDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputArgumentMarkdownDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputArgumentMarkdownDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputArguments();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
deleted file mode 100644
index 0faa4f56fd32a..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputDefinitionMarkdownDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Markdown\InputDefinitionMarkdownDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputDefinitionMarkdownDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputDefinitionMarkdownDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputDefinitions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
deleted file mode 100644
index 216496c1a5a13..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Markdown/InputOptionMarkdownDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Markdown\InputOptionMarkdownDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputOptionMarkdownDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputOptionMarkdownDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputOptions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
new file mode 100644
index 0000000000000..ebbe35ffcbbaf
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
+
+class MarkdownDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new MarkdownDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'md';
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php
deleted file mode 100644
index 5470744ca543a..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Text/ApplicationTextDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Text;
-
-use Symfony\Component\Console\Descriptor\Text\ApplicationTextDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class ApplicationTextDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new ApplicationTextDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getApplications();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php
deleted file mode 100644
index c5aeb838e1019..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Text/CommandTextDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Text;
-
-use Symfony\Component\Console\Descriptor\Text\CommandTextDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class CommandTextDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new CommandTextDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getCommands();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php
deleted file mode 100644
index 0f48099b0a8a8..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputArgumentTextDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Text;
-
-use Symfony\Component\Console\Descriptor\Text\InputArgumentTextDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputArgumentTextDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputArgumentTextDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputArguments();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php
deleted file mode 100644
index 9b710bf5e98d8..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputDefinitionTextDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Text;
-
-use Symfony\Component\Console\Descriptor\Text\InputDefinitionTextDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputDefinitionTextDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputDefinitionTextDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputDefinitions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php
deleted file mode 100644
index 3f0ceb798cb6b..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Text/InputOptionTextDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Text;
-
-use Symfony\Component\Console\Descriptor\Text\InputOptionTextDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputOptionTextDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputOptionTextDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputOptions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
new file mode 100644
index 0000000000000..7a53196dcb8ca
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\TextDescriptor;
+
+class TextDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new TextDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'txt';
+    }
+}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php
deleted file mode 100644
index 0fde188177461..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Xml/ApplicationXmlDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Xml\ApplicationXmlDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class ApplicationXmlDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new ApplicationXmlDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getApplications();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php
deleted file mode 100644
index ca7ac95a74e7b..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Xml/CommandXmlDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Xml\CommandXmlDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class CommandXmlDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new CommandXmlDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getCommands();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php
deleted file mode 100644
index 03cb73c27b44d..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputArgumentXmlDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Xml\InputArgumentXmlDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputArgumentXmlDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputArgumentXmlDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputArguments();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php
deleted file mode 100644
index 6ca79ef1ea8ac..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputDefinitionXmlDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Xml\InputDefinitionXmlDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputDefinitionXmlDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputDefinitionXmlDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputDefinitions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php
deleted file mode 100644
index e2da24f2c74f7..0000000000000
--- a/src/Symfony/Component/Console/Tests/Descriptor/Xml/InputOptionXmlDescriptorTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Tests\Descriptor\Json;
-
-use Symfony\Component\Console\Descriptor\Xml\InputOptionXmlDescriptor;
-use Symfony\Component\Console\Tests\Descriptor\AbstractDescriptorTest;
-use Symfony\Component\Console\Tests\Descriptor\ObjectsProvider;
-
-class InputOptionXmlDescriptorTest extends AbstractDescriptorTest
-{
-    protected function getDescriptor()
-    {
-        return new InputOptionXmlDescriptor();
-    }
-
-    protected function getObjects()
-    {
-        return ObjectsProvider::getInputOptions();
-    }
-}
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
new file mode 100644
index 0000000000000..fb5a91fdd65c8
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use Symfony\Component\Console\Descriptor\XmlDescriptor;
+
+class XmlDescriptorTest extends AbstractDescriptorTest
+{
+    protected function getDescriptor()
+    {
+        return new XmlDescriptor();
+    }
+
+    protected function getFormat()
+    {
+        return 'xml';
+    }
+}

From d3ec07335fc460f7dae470255ba2de173b7c6323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Tue, 23 Apr 2013 14:20:09 +0200
Subject: [PATCH 20/24] [Console] applied advices from github comments

---
 .../Descriptor/DescriptorInterface.php        |  34 ++++--
 .../Console/Descriptor/DescriptorProxy.php    |  65 ++++++++++-
 .../Console/Descriptor/JsonDescriptor.php     |   9 ++
 .../Console/Descriptor/MarkdownDescriptor.php |   9 ++
 .../Console/Descriptor/TextDescriptor.php     |   9 ++
 .../Console/Descriptor/XmlDescriptor.php      |   9 ++
 .../Console/Helper/DescriptorHelper.php       |  20 +---
 .../Tests/Descriptor/JsonDescriptorTest.php   |   9 ++
 .../Descriptor/MarkdownDescriptorTest.php     |   9 ++
 .../Tests/Descriptor/TextDescriptorTest.php   |   9 ++
 .../Tests/Descriptor/XmlDescriptorTest.php    |   9 ++
 .../Console/Tests/Fixtures/application_1.xml~ |  75 ------------
 .../Console/Tests/Fixtures/application_2.xml~ | 109 ------------------
 .../application_renderexception2.txt~         |  11 --
 .../Console/Tests/Fixtures/command_2.txt~     |  12 --
 .../Tests/Fixtures/input_definition_4.txt~    |   5 -
 16 files changed, 157 insertions(+), 246 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~
 delete mode 100644 src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~

diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index 635ce81d79ea2..af9d59c982854 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
@@ -16,45 +25,50 @@
 interface DescriptorInterface
 {
     /**
-     * @param InputArgument $argument
+     * Describes an InputArgument instance.
      *
-     * @param array $options
+     * @param InputArgument $argument
+     * @param array         $options
      *
      * @return string|mixed
      */
     public function describeInputArgument(InputArgument $argument, array $options = array());
 
     /**
-     * @param InputOption $option
+     * Describes an InputOption instance.
      *
-     * @param array $options
+     * @param InputOption $option
+     * @param array       $options
      *
      * @return string|mixed
      */
     public function describeInputOption(InputOption $option, array $options = array());
 
     /**
-     * @param InputDefinition $definition
+     * Describes an InputDefinition instance.
      *
-     * @param array $options
+     * @param InputDefinition $definition
+     * @param array           $options
      *
      * @return string|mixed
      */
     public function describeInputDefinition(InputDefinition $definition, array $options = array());
 
     /**
-     * @param Command $command
+     * Describes a Command instance.
      *
-     * @param array $options
+     * @param Command $command
+     * @param array   $options
      *
      * @return string|mixed
      */
     public function describeCommand(Command $command, array $options = array());
 
     /**
-     * @param Application $application
+     * Describes an Application instance.
      *
-     * @param array $options
+     * @param Application $application
+     * @param array       $options
      *
      * @return string|mixed
      */
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php b/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
index 45b149afbd16b..3cf29d8c04a31 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
@@ -66,6 +75,34 @@ public function register($format, DescriptorInterface $descriptor)
         return $this;
     }
 
+    /**
+     * Describes given object.
+     *
+     * @param object $object
+     * @param array  $options
+     *
+     * @return mixed|string
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function describe($object, array $options = array())
+    {
+        switch (true) {
+            case $object instanceof InputArgument:
+                return $this->describeInputArgument($object, $options);
+            case $object instanceof InputOption:
+                return $this->describeInputOption($object, $options);
+            case $object instanceof InputDefinition:
+                return $this->describeInputDefinition($object, $options);
+            case $object instanceof Command:
+                return $this->describeCommand($object, $options);
+            case $object instanceof Application:
+                return $this->describeApplication($object, $options);
+        }
+
+        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -73,7 +110,7 @@ public function describeInputArgument(InputArgument $argument, array $options =
     {
         $options = array_merge($this->defaultOptions, $options);
 
-        return $this->descriptors[$options['format']]->describeInputArgument($argument, $options);
+        return $this->getDescriptor($options['format'])->describeInputArgument($argument, $options);
     }
 
     /**
@@ -83,7 +120,7 @@ public function describeInputOption(InputOption $option, array $options = array(
     {
         $options = array_merge($this->defaultOptions, $options);
 
-        return $this->descriptors[$options['format']]->describeInputOption($option, $options);
+        return $this->getDescriptor($options['format'])->describeInputOption($option, $options);
     }
 
     /**
@@ -93,7 +130,7 @@ public function describeInputDefinition(InputDefinition $definition, array $opti
     {
         $options = array_merge($this->defaultOptions, $options);
 
-        return $this->descriptors[$options['format']]->describeInputDefinition($definition, $options);
+        return $this->getDescriptor($options['format'])->describeInputDefinition($definition, $options);
     }
 
     /**
@@ -103,7 +140,7 @@ public function describeCommand(Command $command, array $options = array())
     {
         $options = array_merge($this->defaultOptions, $options);
 
-        return $this->descriptors[$options['format']]->describeCommand($command, $options);
+        return $this->getDescriptor($options['format'])->describeCommand($command, $options);
     }
 
     /**
@@ -113,6 +150,24 @@ public function describeApplication(Application $application, array $options = a
     {
         $options = array_merge($this->defaultOptions, $options);
 
-        return $this->descriptors[$options['format']]->describeApplication($application, $options);
+        return $this->getDescriptor($options['format'])->describeApplication($application, $options);
+    }
+
+    /**
+     * Returns a descriptor according to gievn format.
+     *
+     * @param string $format
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return DescriptorInterface
+     */
+    private function getDescriptor($format)
+    {
+        if (!isset($this->descriptors[$format])) {
+            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
+        }
+
+        return $this->descriptors[$format];
     }
 }
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
index 40970c8ea92d3..63d210cdf1d3d 100644
--- a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
index f7b6da04943b6..cbdabbfd9d0a3 100644
--- a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index db873f0b71277..9b63de7c213db 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index f06e38fc17090..9a96c7daf1677 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Descriptor;
 
 use Symfony\Component\Console\Application;
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index efca59c9d7a91..eb2d5af0ff7f2 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -54,7 +54,7 @@ public function describe(OutputInterface $output, $object, $format = null, $raw
         $options = array('raw_text' => $raw, 'format' => $format ?: 'txt');
         $type = !$raw && 'txt' === $options['format'] ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
 
-        $output->writeln($this->getDescription($object, $options), $type);
+        $output->writeln($this->descriptor->describe($object, $options), $type);
     }
 
     /**
@@ -64,22 +64,4 @@ public function getName()
     {
         return 'descriptor';
     }
-
-    private function getDescription($object, array $options)
-    {
-        switch (true) {
-            case $object instanceof InputArgument:
-                return $this->descriptor->describeInputArgument($object, $options);
-            case $object instanceof InputOption:
-                return $this->descriptor->describeInputOption($object, $options);
-            case $object instanceof InputDefinition:
-                return $this->descriptor->describeInputDefinition($object, $options);
-            case $object instanceof Command:
-                return $this->descriptor->describeCommand($object, $options);
-            case $object instanceof Application:
-                return $this->descriptor->describeApplication($object, $options);
-        }
-
-        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
-    }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
index 301495ff5c9f3..943ea2956a6b3 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/JsonDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Descriptor\JsonDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
index ebbe35ffcbbaf..c85e8a594beae 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/MarkdownDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
index 7a53196dcb8ca..350b67950d2b1 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/TextDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Descriptor\TextDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
index fb5a91fdd65c8..59a5d1ed8a2a5 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/XmlDescriptorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Console\Tests\Descriptor;
 
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~
deleted file mode 100644
index 2fe106c4c23a4..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml~
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<symfony>
-  <commands>
-    <command id="help" name="help">
-      <usage>help [--format="..."] [--raw] [command_name]</usage>
-      <description>Displays help for a command</description>
-      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
- 
-   &lt;info&gt;php app/console help list&lt;/info&gt;
- 
- You can also output the help as XML by using the &lt;comment&gt;--format&lt;/comment&gt; option:
- 
-   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
- 
- To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
-      <aliases/>
-      <arguments>
-        <argument name="command_name" is_required="0" is_array="0">
-          <description>The command name</description>
-          <defaults>
-            <default>help</default>
-          </defaults>
-        </argument>
-      </arguments>
-      <options>
-        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats</description>
-        </option>
-        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
-        </option>
-      </options>
-    </command>
-    <command id="list" name="list">
-      <usage>list [--format="..."] [--raw] [namespace]</usage>
-      <description>Lists commands</description>
-      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
- 
-   &lt;info&gt;php app/console list&lt;/info&gt;
- 
- You can also display the commands for a specific namespace:
- 
-   &lt;info&gt;php app/console list test&lt;/info&gt;
- 
- You can also output the information as XML by using the &lt;comment&gt;--format&lt;/comment&gt; option:
- 
-   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
- 
- It's also possible to get raw list of commands (useful for embedding command runner):
- 
-   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
-      <aliases/>
-      <arguments>
-        <argument name="namespace" is_required="0" is_array="0">
-          <description>The namespace name</description>
-          <defaults/>
-        </argument>
-      </arguments>
-      <options>
-        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats</description>
-        </option>
-        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
-        </option>
-      </options>
-    </command>
-  </commands>
-  <namespaces>
-    <namespace id="_global">
-      <command>help</command>
-      <command>list</command>
-    </namespace>
-  </namespaces>
-</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~
deleted file mode 100644
index 7c792c3ec136c..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml~
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<symfony>
-  <commands>
-    <command id="help" name="help">
-      <usage>help [--format="..."] [--raw] [command_name]</usage>
-      <description>Displays help for a command</description>
-      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
- 
-   &lt;info&gt;php app/console help list&lt;/info&gt;
- 
- You can also output the help in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
- 
-   &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
- 
- To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
-      <aliases/>
-      <arguments>
-        <argument name="command_name" is_required="0" is_array="0">
-          <description>The command name</description>
-          <defaults>
-            <default>help</default>
-          </defaults>
-        </argument>
-      </arguments>
-      <options>
-        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>Output format (json, md)</description>
-        </option>
-        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
-        </option>
-      </options>
-    </command>
-    <command id="list" name="list">
-      <usage>list [--format="..."] [--raw] [namespace]</usage>
-      <description>Lists commands</description>
-      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
- 
-   &lt;info&gt;php app/console list&lt;/info&gt;
- 
- You can also display the commands for a specific namespace:
- 
-   &lt;info&gt;php app/console list test&lt;/info&gt;
- 
- You can also output the information in other formats by using the &lt;comment&gt;--format&lt;/comment&gt; option:
- 
-   &lt;info&gt;php app/console list --format=xml&lt;/info&gt;
- 
- It's also possible to get raw list of commands (useful for embedding command runner):
- 
-   &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
-      <aliases/>
-      <arguments>
-        <argument name="namespace" is_required="0" is_array="0">
-          <description>The namespace name</description>
-          <defaults/>
-        </argument>
-      </arguments>
-      <options>
-        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>Output format (json, md)</description>
-        </option>
-        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list</description>
-        </option>
-      </options>
-    </command>
-    <command id="descriptor:command1" name="descriptor:command1">
-      <usage>descriptor:command1</usage>
-      <description>command 1 description</description>
-      <help>command 1 help</help>
-      <aliases>
-        <alias>alias1</alias>
-        <alias>alias2</alias>
-      </aliases>
-      <arguments/>
-      <options/>
-    </command>
-    <command id="descriptor:command2" name="descriptor:command2">
-      <usage>descriptor:command2 [-o|--option_name] argument_name</usage>
-      <description>command 2 description</description>
-      <help>command 2 help</help>
-      <aliases/>
-      <arguments>
-        <argument name="argument_name" is_required="1" is_array="0">
-          <description></description>
-          <defaults/>
-        </argument>
-      </arguments>
-      <options>
-        <option name="--option_name" shortcut="-o" accept_value="0" is_value_required="0" is_multiple="0">
-          <description></description>
-        </option>
-      </options>
-    </command>
-  </commands>
-  <namespaces>
-    <namespace id="_global">
-      <command>alias1</command>
-      <command>alias2</command>
-      <command>help</command>
-      <command>list</command>
-    </namespace>
-    <namespace id="descriptor">
-      <command>descriptor:command1</command>
-      <command>descriptor:command2</command>
-    </namespace>
-  </namespaces>
-</symfony>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~
deleted file mode 100644
index 152eadf99377e..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt~
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- 
-  [InvalidArgumentException]
-  The "--foo" option does not exist.
- 
-
-
-list [--format="..."] [--raw] [namespace]
-
-
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~ b/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~
deleted file mode 100644
index 77e000213dd26..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/command_2.txt~
+++ /dev/null
@@ -1,12 +0,0 @@
-<comment>Usage:</comment>
- descriptor:command2 [-o|--option_name] argument_name
-
-<comment>Aliases:</comment> <info>alias1, alias2</info>
-<comment>Arguments:</comment>
- <info>argument_name     </info> 
-
-<comment>Options:</comment>
- <info>--option_name</info> (-o) 
-
-<comment>Help:</comment>
- command 2 help
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~ b/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~
deleted file mode 100644
index 1a530ffa2ef08..0000000000000
--- a/src/Symfony/Component/Console/Tests/Fixtures/input_definition_4.txt~
+++ /dev/null
@@ -1,5 +0,0 @@
-<comment>Arguments:</comment>
- <info>argument_name     </info>
-
-<comment>Options:</comment>
- <info>--option_name</info> (-o)

From d70e086baead30348e4dffc6dc324507b83fddc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Tue, 23 Apr 2013 14:55:14 +0200
Subject: [PATCH 21/24] [Console] removed proxy

---
 .../Console/Descriptor/DescriptorProxy.php    | 173 ------------------
 .../Console/Helper/DescriptorHelper.php       |  70 ++++++-
 2 files changed, 63 insertions(+), 180 deletions(-)
 delete mode 100644 src/Symfony/Component/Console/Descriptor/DescriptorProxy.php

diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php b/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
deleted file mode 100644
index 3cf29d8c04a31..0000000000000
--- a/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Console\Descriptor;
-
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
-/**
- * @author Jean-François Simon <contact@jfsimon.fr>
- */
-class DescriptorProxy implements DescriptorInterface
-{
-    /**
-     * @var array
-     */
-    private $defaultOptions = array();
-
-    /**
-     * @var DescriptorInterface[]
-     */
-    private $descriptors = array();
-
-    /**
-     * Constructor.
-     *
-     * Valid options are:
-     * * format:        string       default rendering format
-     * * namespace:     string|null  namespace for application description
-     * * raw_text:      boolean      for raw text description
-     * * json_encoding: integer      options for json encoding
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        $this->defaultOptions = array_merge(array(
-            'format'        => 'txt',
-            'namespace'     => null,
-            'raw_text'      => false,
-            'json_encoding' => 0,
-        ), $options);
-
-        $this
-            ->register('txt',  new TextDescriptor())
-            ->register('xml',  new XmlDescriptor())
-            ->register('json', new JsonDescriptor())
-            ->register('md',   new MarkdownDescriptor())
-        ;
-    }
-
-    /**
-     * Registers a descriptor.
-     *
-     * @param string              $format
-     * @param DescriptorInterface $descriptor
-     *
-     * @return DescriptorProxy
-     */
-    public function register($format, DescriptorInterface $descriptor)
-    {
-        $this->descriptors[$format] = $descriptor;
-
-        return $this;
-    }
-
-    /**
-     * Describes given object.
-     *
-     * @param object $object
-     * @param array  $options
-     *
-     * @return mixed|string
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function describe($object, array $options = array())
-    {
-        switch (true) {
-            case $object instanceof InputArgument:
-                return $this->describeInputArgument($object, $options);
-            case $object instanceof InputOption:
-                return $this->describeInputOption($object, $options);
-            case $object instanceof InputDefinition:
-                return $this->describeInputDefinition($object, $options);
-            case $object instanceof Command:
-                return $this->describeCommand($object, $options);
-            case $object instanceof Application:
-                return $this->describeApplication($object, $options);
-        }
-
-        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describeInputArgument(InputArgument $argument, array $options = array())
-    {
-        $options = array_merge($this->defaultOptions, $options);
-
-        return $this->getDescriptor($options['format'])->describeInputArgument($argument, $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describeInputOption(InputOption $option, array $options = array())
-    {
-        $options = array_merge($this->defaultOptions, $options);
-
-        return $this->getDescriptor($options['format'])->describeInputOption($option, $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describeInputDefinition(InputDefinition $definition, array $options = array())
-    {
-        $options = array_merge($this->defaultOptions, $options);
-
-        return $this->getDescriptor($options['format'])->describeInputDefinition($definition, $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describeCommand(Command $command, array $options = array())
-    {
-        $options = array_merge($this->defaultOptions, $options);
-
-        return $this->getDescriptor($options['format'])->describeCommand($command, $options);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function describeApplication(Application $application, array $options = array())
-    {
-        $options = array_merge($this->defaultOptions, $options);
-
-        return $this->getDescriptor($options['format'])->describeApplication($application, $options);
-    }
-
-    /**
-     * Returns a descriptor according to gievn format.
-     *
-     * @param string $format
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return DescriptorInterface
-     */
-    private function getDescriptor($format)
-    {
-        if (!isset($this->descriptors[$format])) {
-            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $format));
-        }
-
-        return $this->descriptors[$format];
-    }
-}
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index eb2d5af0ff7f2..5a2293a779875 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -13,7 +13,12 @@
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\DescriptorInterface;
 use Symfony\Component\Console\Descriptor\DescriptorProxy;
+use Symfony\Component\Console\Descriptor\JsonDescriptor;
+use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
+use Symfony\Component\Console\Descriptor\TextDescriptor;
+use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
@@ -27,18 +32,21 @@
 class DescriptorHelper extends Helper
 {
     /**
-     * @var DescriptorProxy
+     * @var DescriptorInterface[]
      */
-    private $descriptor;
+    private $descriptors = array();
 
     /**
      * Constructor.
-     *
-     * @param DescriptorProxy $descriptor
      */
-    public function __construct(DescriptorProxy $descriptor = null)
+    public function __construct()
     {
-        $this->descriptor = $descriptor ?: new DescriptorProxy();
+        $this
+            ->register('txt',  new TextDescriptor())
+            ->register('xml',  new XmlDescriptor())
+            ->register('json', new JsonDescriptor())
+            ->register('md',   new MarkdownDescriptor())
+        ;
     }
 
     /**
@@ -53,8 +61,56 @@ public function describe(OutputInterface $output, $object, $format = null, $raw
     {
         $options = array('raw_text' => $raw, 'format' => $format ?: 'txt');
         $type = !$raw && 'txt' === $options['format'] ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
+        $output->writeln($this->getDescription($object, $options), $type);
+    }
+
+    /**
+     * Registers a descriptor.
+     *
+     * @param string              $format
+     * @param DescriptorInterface $descriptor
+     *
+     * @return DescriptorHelper
+     */
+    public function register($format, DescriptorInterface $descriptor)
+    {
+        $this->descriptors[$format] = $descriptor;
+
+        return $this;
+    }
+
+    /**
+     * Gets the descriptor associated with the given object.
+     *
+     * @param object $object  The object to describe
+     * @param array  $options The options
+     *
+     * @return DescriptorInterface The descritptor to use for the given object
+     *
+     * @throws \InvalidArgumentException when no descriptor supports the given object or when the format is not supported
+     */
+    private function getDescription($object, array $options)
+    {
+        if (!isset($this->descriptors[$options['format']])) {
+            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format']));
+        }
+
+        $descriptor = $this->descriptors[$options['format']];
+
+        switch (true) {
+            case $object instanceof InputArgument:
+                return $descriptor->describeInputArgument($object, $options);
+            case $object instanceof InputOption:
+                return $descriptor->describeInputOption($object, $options);
+            case $object instanceof InputDefinition:
+                return $descriptor->describeInputDefinition($object, $options);
+            case $object instanceof Command:
+                return $descriptor->describeCommand($object, $options);
+            case $object instanceof Application:
+                return $descriptor->describeApplication($object, $options);
+        }
 
-        $output->writeln($this->descriptor->describe($object, $options), $type);
+        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
     }
 
     /**

From ce60fb7c624c6fafd1017de6d56d8cca8d25cba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Tue, 23 Apr 2013 15:04:34 +0200
Subject: [PATCH 22/24] [Console] simplified descriptor interface

---
 src/Symfony/Component/Console/Application.php |  4 +-
 .../Component/Console/Command/Command.php     |  4 +-
 .../Console/Descriptor/Descriptor.php         | 92 +++++++++++++++++++
 .../Descriptor/DescriptorInterface.php        | 52 +----------
 .../Console/Descriptor/JsonDescriptor.php     | 12 +--
 .../Console/Descriptor/MarkdownDescriptor.php | 12 +--
 .../Console/Descriptor/TextDescriptor.php     | 12 +--
 .../Console/Descriptor/XmlDescriptor.php      | 12 +--
 .../Console/Helper/DescriptorHelper.php       | 43 ++-------
 .../Console/Input/InputDefinition.php         |  4 +-
 .../Descriptor/AbstractDescriptorTest.php     | 10 +-
 11 files changed, 138 insertions(+), 119 deletions(-)
 create mode 100644 src/Symfony/Component/Console/Descriptor/Descriptor.php

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index 64f101084b714..bf273933e1e11 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -696,7 +696,7 @@ public function asText($namespace = null, $raw = false)
     {
         $descriptor = new TextDescriptor();
 
-        return $descriptor->describeApplication($this, array('namespace' => $namespace, 'raw_text' => $raw));
+        return $descriptor->describe($this, array('namespace' => $namespace, 'raw_text' => $raw));
     }
 
     /**
@@ -713,7 +713,7 @@ public function asXml($namespace = null, $asDom = false)
     {
         $descriptor = new XmlDescriptor();
 
-        return $descriptor->describeApplication($this, array('namespace' => $namespace, 'as_dom' => $asDom));
+        return $descriptor->describe($this, array('namespace' => $namespace, 'as_dom' => $asDom));
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 083fae10ff608..86d5cb6bdc764 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -568,7 +568,7 @@ public function asText()
     {
         $descriptor = new TextDescriptor();
 
-        return $descriptor->describeCommand($this);
+        return $descriptor->describe($this);
     }
 
     /**
@@ -584,7 +584,7 @@ public function asXml($asDom = false)
     {
         $descriptor = new XmlDescriptor();
 
-        return $descriptor->describeCommand($this, array('as_dom' => $asDom));
+        return $descriptor->describe($this, array('as_dom' => $asDom));
     }
 
     private function validateName($name)
diff --git a/src/Symfony/Component/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Console/Descriptor/Descriptor.php
new file mode 100644
index 0000000000000..659b8f4cc76ad
--- /dev/null
+++ b/src/Symfony/Component/Console/Descriptor/Descriptor.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Descriptor;
+
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+abstract class Descriptor implements DescriptorInterface
+{
+    public function describe($object, array $options = array())
+    {
+        switch (true) {
+            case $object instanceof InputArgument:
+                return $this->describeInputArgument($object, $options);
+            case $object instanceof InputOption:
+                return $this->describeInputOption($object, $options);
+            case $object instanceof InputDefinition:
+                return $this->describeInputDefinition($object, $options);
+            case $object instanceof Command:
+                return $this->describeCommand($object, $options);
+            case $object instanceof Application:
+                return $this->describeApplication($object, $options);
+        }
+
+        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
+    }
+
+    /**
+     * Describes an InputArgument instance.
+     *
+     * @param InputArgument $argument
+     * @param array         $options
+     *
+     * @return string|mixed
+     */
+    abstract protected function describeInputArgument(InputArgument $argument, array $options = array());
+
+    /**
+     * Describes an InputOption instance.
+     *
+     * @param InputOption $option
+     * @param array       $options
+     *
+     * @return string|mixed
+     */
+    abstract protected function describeInputOption(InputOption $option, array $options = array());
+
+    /**
+     * Describes an InputDefinition instance.
+     *
+     * @param InputDefinition $definition
+     * @param array           $options
+     *
+     * @return string|mixed
+     */
+    abstract protected function describeInputDefinition(InputDefinition $definition, array $options = array());
+
+    /**
+     * Describes a Command instance.
+     *
+     * @param Command $command
+     * @param array   $options
+     *
+     * @return string|mixed
+     */
+    abstract protected function describeCommand(Command $command, array $options = array());
+
+    /**
+     * Describes an Application instance.
+     *
+     * @param Application $application
+     * @param array       $options
+     *
+     * @return string|mixed
+     */
+    abstract protected function describeApplication(Application $application, array $options = array());
+}
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
index af9d59c982854..a4e8633e8b50c 100644
--- a/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
+++ b/src/Symfony/Component/Console/Descriptor/DescriptorInterface.php
@@ -11,12 +11,6 @@
 
 namespace Symfony\Component\Console\Descriptor;
 
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-
 /**
  * Descriptor interface.
  *
@@ -27,50 +21,10 @@ interface DescriptorInterface
     /**
      * Describes an InputArgument instance.
      *
-     * @param InputArgument $argument
-     * @param array         $options
-     *
-     * @return string|mixed
-     */
-    public function describeInputArgument(InputArgument $argument, array $options = array());
-
-    /**
-     * Describes an InputOption instance.
-     *
-     * @param InputOption $option
-     * @param array       $options
-     *
-     * @return string|mixed
-     */
-    public function describeInputOption(InputOption $option, array $options = array());
-
-    /**
-     * Describes an InputDefinition instance.
-     *
-     * @param InputDefinition $definition
-     * @param array           $options
-     *
-     * @return string|mixed
-     */
-    public function describeInputDefinition(InputDefinition $definition, array $options = array());
-
-    /**
-     * Describes a Command instance.
-     *
-     * @param Command $command
-     * @param array   $options
-     *
-     * @return string|mixed
-     */
-    public function describeCommand(Command $command, array $options = array());
-
-    /**
-     * Describes an Application instance.
-     *
-     * @param Application $application
-     * @param array       $options
+     * @param object $object
+     * @param array  $options
      *
      * @return string|mixed
      */
-    public function describeApplication(Application $application, array $options = array());
+    public function describe($object, array $options = array());
 }
diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
index 63d210cdf1d3d..0edef847af4ce 100644
--- a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php
@@ -22,12 +22,12 @@
  *
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-class JsonDescriptor implements DescriptorInterface
+class JsonDescriptor extends Descriptor
 {
     /**
      * {@inheritdoc}
      */
-    public function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = array())
     {
         return $this->output(array(
             'name'        => $argument->getName(),
@@ -41,7 +41,7 @@ public function describeInputArgument(InputArgument $argument, array $options =
     /**
      * {@inheritdoc}
      */
-    public function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = array())
     {
         return $this->output(array(
             'name'              => '--'.$option->getName(),
@@ -57,7 +57,7 @@ public function describeInputOption(InputOption $option, array $options = array(
     /**
      * {@inheritdoc}
      */
-    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
     {
         $inputArguments = array();
         foreach ($definition->getArguments() as $name => $argument) {
@@ -75,7 +75,7 @@ public function describeInputDefinition(InputDefinition $definition, array $opti
     /**
      * {@inheritdoc}
      */
-    public function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = array())
     {
         $command->getSynopsis();
         $command->mergeApplicationDefinition(false);
@@ -93,7 +93,7 @@ public function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    public function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = array())
     {
         $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
         $description = new ApplicationDescription($application, $describedNamespace);
diff --git a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
index cbdabbfd9d0a3..694c4b1def403 100644
--- a/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
@@ -22,12 +22,12 @@
  *
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-class MarkdownDescriptor implements DescriptorInterface
+class MarkdownDescriptor extends Descriptor
 {
     /**
      * {@inheritdoc}
      */
-    public function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = array())
     {
         return '**'.$argument->getName().':**'."\n\n"
             .'* Name: '.($argument->getName() ?: '<none>')."\n"
@@ -40,7 +40,7 @@ public function describeInputArgument(InputArgument $argument, array $options =
     /**
      * {@inheritdoc}
      */
-    public function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = array())
     {
         return '**'.$option->getName().':**'."\n\n"
             .'* Name: `--'.$option->getName().'`'."\n"
@@ -55,7 +55,7 @@ public function describeInputOption(InputOption $option, array $options = array(
     /**
      * {@inheritdoc}
      */
-    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
     {
         $blocks = array();
 
@@ -79,7 +79,7 @@ public function describeInputDefinition(InputDefinition $definition, array $opti
     /**
      * {@inheritdoc}
      */
-    public function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = array())
     {
         $command->getSynopsis();
         $command->mergeApplicationDefinition(false);
@@ -104,7 +104,7 @@ public function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    public function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = array())
     {
         $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
         $description = new ApplicationDescription($application, $describedNamespace);
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
index 9b63de7c213db..2003237441cef 100644
--- a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -22,12 +22,12 @@
  *
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-class TextDescriptor implements DescriptorInterface
+class TextDescriptor extends Descriptor
 {
     /**
      * {@inheritdoc}
      */
-    public function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = array())
     {
         if (null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault()))) {
             $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($argument->getDefault()));
@@ -45,7 +45,7 @@ public function describeInputArgument(InputArgument $argument, array $options =
     /**
      * {@inheritdoc}
      */
-    public function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = array())
     {
         if ($option->acceptValue() && null !== $option->getDefault() && (!is_array($option->getDefault()) || count($option->getDefault()))) {
             $default = sprintf('<comment> (default: %s)</comment>', $this->formatDefaultValue($option->getDefault()));
@@ -70,7 +70,7 @@ public function describeInputOption(InputOption $option, array $options = array(
     /**
      * {@inheritdoc}
      */
-    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
     {
         $nameWidth = 0;
         foreach ($definition->getOptions() as $option) {
@@ -111,7 +111,7 @@ public function describeInputDefinition(InputDefinition $definition, array $opti
     /**
      * {@inheritdoc}
      */
-    public function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = array())
     {
         $command->getSynopsis();
         $command->mergeApplicationDefinition(false);
@@ -136,7 +136,7 @@ public function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    public function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = array())
     {
         $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
         $description = new ApplicationDescription($application, $describedNamespace);
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index 9a96c7daf1677..5e1f93f4fc96e 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -22,12 +22,12 @@
  *
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-class XmlDescriptor implements DescriptorInterface
+class XmlDescriptor extends Descriptor
 {
     /**
      * {@inheritdoc}
      */
-    public function describeInputArgument(InputArgument $argument, array $options = array())
+    protected function describeInputArgument(InputArgument $argument, array $options = array())
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
 
@@ -51,7 +51,7 @@ public function describeInputArgument(InputArgument $argument, array $options =
     /**
      * {@inheritdoc}
      */
-    public function describeInputOption(InputOption $option, array $options = array())
+    protected function describeInputOption(InputOption $option, array $options = array())
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
 
@@ -82,7 +82,7 @@ public function describeInputOption(InputOption $option, array $options = array(
     /**
      * {@inheritdoc}
      */
-    public function describeInputDefinition(InputDefinition $definition, array $options = array())
+    protected function describeInputDefinition(InputDefinition $definition, array $options = array())
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($definitionXML = $dom->createElement('definition'));
@@ -103,7 +103,7 @@ public function describeInputDefinition(InputDefinition $definition, array $opti
     /**
      * {@inheritdoc}
      */
-    public function describeCommand(Command $command, array $options = array())
+    protected function describeCommand(Command $command, array $options = array())
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($commandXML = $dom->createElement('command'));
@@ -138,7 +138,7 @@ public function describeCommand(Command $command, array $options = array())
     /**
      * {@inheritdoc}
      */
-    public function describeApplication(Application $application, array $options = array())
+    protected function describeApplication(Application $application, array $options = array())
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($rootXml = $dom->createElement('symfony'));
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 5a2293a779875..761f717642c20 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -61,7 +61,14 @@ public function describe(OutputInterface $output, $object, $format = null, $raw
     {
         $options = array('raw_text' => $raw, 'format' => $format ?: 'txt');
         $type = !$raw && 'txt' === $options['format'] ? OutputInterface::OUTPUT_NORMAL : OutputInterface::OUTPUT_RAW;
-        $output->writeln($this->getDescription($object, $options), $type);
+
+        if (!isset($this->descriptors[$options['format']])) {
+            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format']));
+        }
+
+        $descriptor = $this->descriptors[$options['format']];
+
+        $output->writeln($descriptor->describe($object, $options), $type);
     }
 
     /**
@@ -79,40 +86,6 @@ public function register($format, DescriptorInterface $descriptor)
         return $this;
     }
 
-    /**
-     * Gets the descriptor associated with the given object.
-     *
-     * @param object $object  The object to describe
-     * @param array  $options The options
-     *
-     * @return DescriptorInterface The descritptor to use for the given object
-     *
-     * @throws \InvalidArgumentException when no descriptor supports the given object or when the format is not supported
-     */
-    private function getDescription($object, array $options)
-    {
-        if (!isset($this->descriptors[$options['format']])) {
-            throw new \InvalidArgumentException(sprintf('Unsupported format "%s".', $options['format']));
-        }
-
-        $descriptor = $this->descriptors[$options['format']];
-
-        switch (true) {
-            case $object instanceof InputArgument:
-                return $descriptor->describeInputArgument($object, $options);
-            case $object instanceof InputOption:
-                return $descriptor->describeInputOption($object, $options);
-            case $object instanceof InputDefinition:
-                return $descriptor->describeInputDefinition($object, $options);
-            case $object instanceof Command:
-                return $descriptor->describeCommand($object, $options);
-            case $object instanceof Application:
-                return $descriptor->describeApplication($object, $options);
-        }
-
-        throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index a627dd11d1056..edffd88fb2b91 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -415,7 +415,7 @@ public function asText()
     {
         $descriptor = new TextDescriptor();
 
-        return $descriptor->describeInputDefinition($this);
+        return $descriptor->describe($this);
     }
 
     /**
@@ -431,6 +431,6 @@ public function asXml($asDom = false)
     {
         $descriptor = new XmlDescriptor();
 
-        return $descriptor->describeInputDefinition($this, array('as_dom' => $asDom));
+        return $descriptor->describe($this, array('as_dom' => $asDom));
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
index f96f105699625..703a72c451855 100644
--- a/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
+++ b/src/Symfony/Component/Console/Tests/Descriptor/AbstractDescriptorTest.php
@@ -23,25 +23,25 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase
     /** @dataProvider getDescribeInputArgumentTestData */
     public function testDescribeInputArgument(DescriptorInterface $descriptor, InputArgument $argument, $expectedDescription)
     {
-        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeInputArgument($argument)));
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describe($argument)));
     }
 
     /** @dataProvider getDescribeInputOptionTestData */
     public function testDescribeInputOption(DescriptorInterface $descriptor, InputOption $option, $expectedDescription)
     {
-        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeInputOption($option)));
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describe($option)));
     }
 
     /** @dataProvider getDescribeInputDefinitionTestData */
     public function testDescribeInputDefinition(DescriptorInterface $descriptor, InputDefinition $definition, $expectedDescription)
     {
-        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeInputDefinition($definition)));
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describe($definition)));
     }
 
     /** @dataProvider getDescribeCommandTestData */
     public function testDescribeCommand(DescriptorInterface $descriptor, Command $command, $expectedDescription)
     {
-        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeCommand($command)));
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describe($command)));
     }
 
     /** @dataProvider getDescribeApplicationTestData */
@@ -54,7 +54,7 @@ public function testDescribeApplication(DescriptorInterface $descriptor, Applica
             $command->setHelp(str_replace('%command.full_name%', 'app/console %command.name%', $command->getHelp()));
         }
 
-        $this->assertEquals(trim($expectedDescription), trim($descriptor->describeApplication($application)));
+        $this->assertEquals(trim($expectedDescription), trim($descriptor->describe($application)));
     }
 
     public function getDescribeInputArgumentTestData()

From 28f082e2178bf21a8cda3f443c0255d63112e95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Tue, 23 Apr 2013 15:10:06 +0200
Subject: [PATCH 23/24] [Console] removed changes

---
 src/Symfony/Component/Console/Application.php |  2 ++
 .../Component/Console/Command/Command.php     |  4 +++
 .../Component/Console/Command/HelpCommand.php |  6 ++--
 .../Component/Console/Command/ListCommand.php | 30 +++++++++----------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
index bf273933e1e11..0290b5bcd9d9d 100644
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@@ -1013,6 +1013,8 @@ private function getAbbreviationSuggestions($abbrevs)
     /**
      * Returns the namespace part of the command name.
      *
+     * This method is not part of public API and should not be used directly.
+     *
      * @param string $name  The full name of the command
      * @param string $limit The maximum number of parts of the namespace
      *
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 86d5cb6bdc764..e59854eda256f 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -275,6 +275,8 @@ public function setCode($code)
     /**
      * Merges the application definition with the command definition.
      *
+     * This method is not part of public API and should not be used directly.
+     *
      * @param Boolean $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments
      */
     public function mergeApplicationDefinition($mergeArgs = true)
@@ -334,6 +336,8 @@ public function getDefinition()
      * Can be overridden to provide the original command representation when it would otherwise
      * be changed by merging with the application InputDefinition.
      *
+     * This method is not part of public API and should not be used directly.
+     *
      * @return InputDefinition An InputDefinition instance
      */
     public function getNativeDefinition()
diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 3bcdf73f71f20..46bb3005de5ae 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -35,13 +35,13 @@ protected function configure()
 
         $this
             ->setName('help')
-            ->setDescription('Displays help for a command')
             ->setDefinition(array(
+                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
+                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML.'),
                 new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats.'),
                 new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help.'),
-                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML.'),
-                new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
             ))
+            ->setDescription('Displays help for a command')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command displays help for a given command:
 
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index d1c8d2b5434cf..4b3374756e593 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -13,10 +13,10 @@
 
 use Symfony\Component\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputDefinition;
 
 /**
  * ListCommand displays the list of all available commands for the application.
@@ -32,8 +32,8 @@ protected function configure()
     {
         $this
             ->setName('list')
-            ->setDescription('Lists commands')
             ->setDefinition($this->createDefinition())
+            ->setDescription('Lists commands')
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command lists all commands:
 
@@ -55,19 +55,6 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    private function createDefinition()
-    {
-        return new InputDefinition(array(
-            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats.'),
-            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
-            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML.'),
-            new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
-        ));
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -88,4 +75,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $helper = new DescriptorHelper();
         $helper->describe($output, $this->getApplication(), $input->getOption('format'), $input->getOption('raw'));
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    private function createDefinition()
+    {
+        return new InputDefinition(array(
+            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats.'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
+            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML.'),
+            new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
+        ));
+    }
 }

From cbb8105b0d94601d729897659f1a992393e444f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= <contact@jfsimon.fr>
Date: Tue, 23 Apr 2013 17:12:24 +0200
Subject: [PATCH 24/24] [Console] moved commands arguments

---
 .../Component/Console/Command/HelpCommand.php |  6 +--
 .../Component/Console/Command/ListCommand.php |  6 +--
 .../Console/Helper/DescriptorHelper.php       |  1 -
 .../Console/Input/InputDefinition.php         |  1 -
 .../Console/Tests/Command/HelpCommandTest.php |  8 +--
 .../Console/Tests/Fixtures/application_1.json |  2 +-
 .../Console/Tests/Fixtures/application_1.md   | 54 +++++++++----------
 .../Console/Tests/Fixtures/application_1.xml  | 26 ++++-----
 .../Console/Tests/Fixtures/application_2.json |  2 +-
 .../Console/Tests/Fixtures/application_2.md   | 54 +++++++++----------
 .../Console/Tests/Fixtures/application_2.xml  | 26 ++++-----
 .../Tests/Fixtures/application_asxml1.txt     | 26 ++++-----
 .../Fixtures/application_renderexception2.txt |  2 +-
 .../Tests/Fixtures/application_run2.txt       |  8 +--
 .../Tests/Fixtures/application_run3.txt       |  8 +--
 15 files changed, 114 insertions(+), 116 deletions(-)

diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php
index 46bb3005de5ae..2aa933ea0f7a7 100644
--- a/src/Symfony/Component/Console/Command/HelpCommand.php
+++ b/src/Symfony/Component/Console/Command/HelpCommand.php
@@ -37,9 +37,9 @@ protected function configure()
             ->setName('help')
             ->setDefinition(array(
                 new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
-                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML.'),
-                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats.'),
-                new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help.'),
+                new InputOption('xml', null, InputOption::VALUE_NONE, 'To output help as XML'),
+                new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output help in other formats'),
+                new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
             ))
             ->setDescription('Displays help for a command')
             ->setHelp(<<<EOF
diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php
index 4b3374756e593..bc047a87fd057 100644
--- a/src/Symfony/Component/Console/Command/ListCommand.php
+++ b/src/Symfony/Component/Console/Command/ListCommand.php
@@ -82,10 +82,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
     private function createDefinition()
     {
         return new InputDefinition(array(
-            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats.'),
-            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list.'),
-            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML.'),
             new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
+            new InputOption('xml', null, InputOption::VALUE_NONE, 'To output list as XML'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list'),
+            new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output list in other formats'),
         ));
     }
 }
diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
index 761f717642c20..a114096562c71 100644
--- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php
+++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Descriptor\DescriptorInterface;
-use Symfony\Component\Console\Descriptor\DescriptorProxy;
 use Symfony\Component\Console\Descriptor\JsonDescriptor;
 use Symfony\Component\Console\Descriptor\MarkdownDescriptor;
 use Symfony\Component\Console\Descriptor\TextDescriptor;
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index edffd88fb2b91..204d293cd0053 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -403,7 +403,6 @@ public function getSynopsis()
         return implode(' ', $elements);
     }
 
-
     /**
      * Returns a textual representation of the InputDefinition.
      *
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
index 0610a47113f40..d60f3e4a67fae 100644
--- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -24,7 +24,7 @@ public function testExecuteForCommandAlias()
         $command->setApplication(new Application());
         $commandTester = new CommandTester($command);
         $commandTester->execute(array('command_name' => 'li'));
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
+        $this->assertRegExp('/list \[--xml\] \[--raw\] \[--format="\.\.\."\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias');
     }
 
     public function testExecuteForCommand()
@@ -33,7 +33,7 @@ public function testExecuteForCommand()
         $commandTester = new CommandTester($command);
         $command->setCommand(new ListCommand());
         $commandTester->execute(array());
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--xml\] \[--raw\] \[--format="\.\.\."\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
     public function testExecuteForCommandWithXmlOption()
@@ -50,7 +50,7 @@ public function testExecuteForApplicationCommand()
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
         $commandTester->execute(array('command_name' => 'list'));
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--xml\] \[--raw\] \[--format="\.\.\."\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
     }
 
 
@@ -59,7 +59,7 @@ public function testExecuteForApplicationCommandWithXmlOption()
         $application = new Application();
         $commandTester = new CommandTester($application->get('help'));
         $commandTester->execute(array('command_name' => 'list', '--format' => 'xml'));
-        $this->assertRegExp('/list \[--format="\.\.\."\] \[--raw\] \[--xml\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
+        $this->assertRegExp('/list \[--xml\] \[--raw\] \[--format="\.\.\."\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command');
         $this->assertRegExp('/<command/', $commandTester->getDisplay(), '->execute() returns an XML help text if --format=xml is passed');
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
index 394724d98818a..116e125ecfa98 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--format=\"...\"] [--raw] [--xml] [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":{"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},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML.","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 [--format=\"...\"] [--raw] [--xml] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML.","default":false}}}}],"namespaces":[{"id":"_global","commands":["help","list"]}]}
\ No newline at end of file
+{"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"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
index 851faaa92caba..ca564e45ca1b2 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.md
@@ -8,7 +8,7 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help [--format="..."] [--raw] [--xml] [command_name]`
+* Usage: `help [--xml] [--format="..."] [--raw] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
@@ -33,6 +33,16 @@ To display the list of available commands, please use the <info>list</info> comm
 
 ### Options:
 
+**xml:**
+
+* Name: `--xml`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output help as XML
+* Default: `false`
+
 **format:**
 
 * Name: `--format`
@@ -40,7 +50,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats.
+* Description: To output help in other formats
 * Default: `NULL`
 
 **raw:**
@@ -50,17 +60,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command help.
-* Default: `false`
-
-**xml:**
-
-* Name: `--xml`
-* Shortcut: <none>
-* Accept value: no
-* Is value required: no
-* Is multiple: no
-* Description: To output help as XML.
+* Description: To output raw command help
 * Default: `false`
 
 **help:**
@@ -137,7 +137,7 @@ list
 ----
 
 * Description: Lists commands
-* Usage: `list [--format="..."] [--raw] [--xml] [namespace]`
+* Usage: `list [--xml] [--raw] [--format="..."] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
@@ -168,15 +168,15 @@ It's also possible to get raw list of commands (useful for embedding command run
 
 ### Options:
 
-**format:**
+**xml:**
 
-* Name: `--format`
+* Name: `--xml`
 * Shortcut: <none>
-* Accept value: yes
-* Is value required: yes
+* Accept value: no
+* Is value required: no
 * Is multiple: no
-* Description: To output list in other formats.
-* Default: `NULL`
+* Description: To output list as XML
+* Default: `false`
 
 **raw:**
 
@@ -185,15 +185,15 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list.
+* Description: To output raw command list
 * Default: `false`
 
-**xml:**
+**format:**
 
-* Name: `--xml`
+* Name: `--format`
 * Shortcut: <none>
-* Accept value: no
-* Is value required: no
+* Accept value: yes
+* Is value required: yes
 * Is multiple: no
-* Description: To output list as XML.
-* Default: `false`
+* Description: To output list in other formats
+* Default: `NULL`
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index 9d882568b97f1..ba5decadfe781 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
@@ -2,7 +2,7 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-      <usage>help [--format="..."] [--raw] [--xml] [command_name]</usage>
+      <usage>help [--xml] [--format="..."] [--raw] [command_name]</usage>
       <description>Displays help for a command</description>
       <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
  
@@ -23,15 +23,15 @@
         </argument>
       </arguments>
       <options>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output help as XML</description>
+        </option>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats.</description>
+          <description>To output help in other formats</description>
           <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command help.</description>
-        </option>
-        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output help as XML.</description>
+          <description>To output raw command help</description>
         </option>
         <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this help message.</description>
@@ -57,7 +57,7 @@
       </options>
     </command>
     <command id="list" name="list">
-      <usage>list [--format="..."] [--raw] [--xml] [namespace]</usage>
+      <usage>list [--xml] [--raw] [--format="..."] [namespace]</usage>
       <description>Lists commands</description>
       <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
  
@@ -82,15 +82,15 @@
         </argument>
       </arguments>
       <options>
-        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output list in other formats.</description>
-          <defaults/>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output list as XML</description>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list.</description>
+          <description>To output raw command list</description>
         </option>
-        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output list as XML.</description>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output list in other formats</description>
+          <defaults/>
         </option>
       </options>
     </command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
index 8c17081ea9f58..c45e58943fea7 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.json
@@ -1 +1 @@
-{"commands":[{"name":"help","usage":"help [--format=\"...\"] [--raw] [--xml] [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":{"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},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output help as XML.","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 [--format=\"...\"] [--raw] [--xml] [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":{"format":{"name":"--format","shortcut":"","accept_value":true,"is_value_required":true,"is_multiple":false,"description":"To output list in other formats.","default":null},"raw":{"name":"--raw","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output raw command list.","default":false},"xml":{"name":"--xml","shortcut":"","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"To output list as XML.","default":false}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
+{"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}}}},{"name":"descriptor:command1","usage":"descriptor:command1","description":"command 1 description","help":"command 1 help","aliases":["alias1","alias2"],"definition":{"arguments":[],"options":{"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":"descriptor:command2","usage":"descriptor:command2 [-o|--option_name] argument_name","description":"command 2 description","help":"command 2 help","aliases":[],"definition":{"arguments":{"argument_name":{"name":"argument_name","is_required":true,"is_array":false,"description":"","default":null}},"options":{"option_name":{"name":"--option_name","shortcut":"-o","accept_value":false,"is_value_required":false,"is_multiple":false,"description":"","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}}}}],"namespaces":[{"id":"_global","commands":["alias1","alias2","help","list"]},{"id":"descriptor","commands":["descriptor:command1","descriptor:command2"]}]}
\ No newline at end of file
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
index 0dde6d3a65e61..f8225ae2531e4 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.md
@@ -15,7 +15,7 @@ help
 ----
 
 * Description: Displays help for a command
-* Usage: `help [--format="..."] [--raw] [--xml] [command_name]`
+* Usage: `help [--xml] [--format="..."] [--raw] [command_name]`
 * Aliases: <none>
 
 The <info>help</info> command displays help for a given command:
@@ -40,6 +40,16 @@ To display the list of available commands, please use the <info>list</info> comm
 
 ### Options:
 
+**xml:**
+
+* Name: `--xml`
+* Shortcut: <none>
+* Accept value: no
+* Is value required: no
+* Is multiple: no
+* Description: To output help as XML
+* Default: `false`
+
 **format:**
 
 * Name: `--format`
@@ -47,7 +57,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: yes
 * Is value required: yes
 * Is multiple: no
-* Description: To output help in other formats.
+* Description: To output help in other formats
 * Default: `NULL`
 
 **raw:**
@@ -57,17 +67,7 @@ To display the list of available commands, please use the <info>list</info> comm
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command help.
-* Default: `false`
-
-**xml:**
-
-* Name: `--xml`
-* Shortcut: <none>
-* Accept value: no
-* Is value required: no
-* Is multiple: no
-* Description: To output help as XML.
+* Description: To output raw command help
 * Default: `false`
 
 **help:**
@@ -144,7 +144,7 @@ list
 ----
 
 * Description: Lists commands
-* Usage: `list [--format="..."] [--raw] [--xml] [namespace]`
+* Usage: `list [--xml] [--raw] [--format="..."] [namespace]`
 * Aliases: <none>
 
 The <info>list</info> command lists all commands:
@@ -175,15 +175,15 @@ It's also possible to get raw list of commands (useful for embedding command run
 
 ### Options:
 
-**format:**
+**xml:**
 
-* Name: `--format`
+* Name: `--xml`
 * Shortcut: <none>
-* Accept value: yes
-* Is value required: yes
+* Accept value: no
+* Is value required: no
 * Is multiple: no
-* Description: To output list in other formats.
-* Default: `NULL`
+* Description: To output list as XML
+* Default: `false`
 
 **raw:**
 
@@ -192,18 +192,18 @@ It's also possible to get raw list of commands (useful for embedding command run
 * Accept value: no
 * Is value required: no
 * Is multiple: no
-* Description: To output raw command list.
+* Description: To output raw command list
 * Default: `false`
 
-**xml:**
+**format:**
 
-* Name: `--xml`
+* Name: `--format`
 * Shortcut: <none>
-* Accept value: no
-* Is value required: no
+* Accept value: yes
+* Is value required: yes
 * Is multiple: no
-* Description: To output list as XML.
-* Default: `false`
+* Description: To output list in other formats
+* Default: `NULL`
 
 descriptor:command1
 -------------------
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index fbc78cca5c362..b48546849209e 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
@@ -2,7 +2,7 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-      <usage>help [--format="..."] [--raw] [--xml] [command_name]</usage>
+      <usage>help [--xml] [--format="..."] [--raw] [command_name]</usage>
       <description>Displays help for a command</description>
       <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
  
@@ -23,15 +23,15 @@
         </argument>
       </arguments>
       <options>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output help as XML</description>
+        </option>
         <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output help in other formats.</description>
+          <description>To output help in other formats</description>
           <defaults/>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command help.</description>
-        </option>
-        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output help as XML.</description>
+          <description>To output raw command help</description>
         </option>
         <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
           <description>Display this help message.</description>
@@ -57,7 +57,7 @@
       </options>
     </command>
     <command id="list" name="list">
-      <usage>list [--format="..."] [--raw] [--xml] [namespace]</usage>
+      <usage>list [--xml] [--raw] [--format="..."] [namespace]</usage>
       <description>Lists commands</description>
       <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
  
@@ -82,15 +82,15 @@
         </argument>
       </arguments>
       <options>
-        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-          <description>To output list in other formats.</description>
-          <defaults/>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output list as XML</description>
         </option>
         <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output raw command list.</description>
+          <description>To output raw command list</description>
         </option>
-        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-          <description>To output list as XML.</description>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>To output list in other formats</description>
+          <defaults/>
         </option>
       </options>
     </command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
index 136ba7ed31be3..965bc704f2372 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -2,7 +2,7 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-  <usage>help [--format="..."] [--raw] [--xml] [command_name]</usage>
+  <usage>help [--xml] [--format="..."] [--raw] [command_name]</usage>
   <description>Displays help for a command</description>
   <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
  
@@ -23,15 +23,15 @@
     </argument>
   </arguments>
   <options>
+    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>To output help as XML</description>
+    </option>
     <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-      <description>To output help in other formats.</description>
+      <description>To output help in other formats</description>
       <defaults/>
     </option>
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output raw command help.</description>
-    </option>
-    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output help as XML.</description>
+      <description>To output raw command help</description>
     </option>
     <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Display this help message.</description>
@@ -57,7 +57,7 @@
   </options>
 </command>
     <command id="list" name="list">
-  <usage>list [--format="..."] [--raw] [--xml] [namespace]</usage>
+  <usage>list [--xml] [--raw] [--format="..."] [namespace]</usage>
   <description>Lists commands</description>
   <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
  
@@ -82,15 +82,15 @@
     </argument>
   </arguments>
   <options>
-    <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-      <description>To output list in other formats.</description>
-      <defaults/>
+    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+      <description>To output list as XML</description>
     </option>
     <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output raw command list.</description>
+      <description>To output raw command list</description>
     </option>
-    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output list as XML.</description>
+    <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+      <description>To output list in other formats</description>
+      <defaults/>
     </option>
   </options>
 </command>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
index 5cc75b7413ddd..c758129bee967 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception2.txt
@@ -6,6 +6,6 @@
                                       
 
 
-list [--format="..."] [--raw] [--xml] [namespace]
+list [--xml] [--raw] [--format="..."] [namespace]
 
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
index 4fee44aefcf1a..627d9ba69b486 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
@@ -1,14 +1,14 @@
 Usage:
- help [--format="..."] [--raw] [--xml] [command_name]
+ help [--xml] [--format="..."] [--raw] [command_name]
 
 Arguments:
  command               The command to execute
  command_name          The command name (default: "help")
 
 Options:
- --format              To output help in other formats.
- --raw                 To output raw command help.
- --xml                 To output help as XML.
+ --xml                 To output help as XML
+ --format              To output help in other formats
+ --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.
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
index d478348026e79..68bf516ded16a 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_run3.txt
@@ -1,13 +1,13 @@
 Usage:
- list [--format="..."] [--raw] [--xml] [namespace]
+ list [--xml] [--raw] [--format="..."] [namespace]
 
 Arguments:
  namespace  The namespace name
 
 Options:
- --format   To output list in other formats.
- --raw      To output raw command list.
- --xml      To output list as XML.
+ --xml      To output list as XML
+ --raw      To output raw command list
+ --format   To output list in other formats
 
 Help:
  The list command lists all commands: