[Console] removed changes

symfony · jfsimon · Mar 22, 2013 · Apr 1, 2013 · Apr 3, 2013 · Apr 3, 2013
commit 28f082e2178bf21a8cda3f443c0255d63112e95f
diff --git 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
@@ -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
@@ -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
@@ -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'),
+        ));
+    }
 }