[Console] removed proxy

symfony · jfsimon · Mar 22, 2013 · Apr 1, 2013 · Apr 3, 2013 · Apr 3, 2013
commit d70e086baead30348e4dffc6dc324507b83fddc7
diff --git a/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php b/src/Symfony/Component/Console/Descriptor/DescriptorProxy.php
diff --git 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)));
     }
 
     /**