[Console] unmerge application args when needed

bamarni · bamarni · commit 73a4a3655351 · 2016-06-25T15:09:00.000+02:00
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -294,6 +294,19 @@ public function setCode($code)
     public function mergeApplicationDefinition($mergeArgs = true)
     {
         if (null === $this->application || (true === $this->applicationDefinitionMerged && ($this->applicationDefinitionMergedWithArgs || !$mergeArgs))) {
+            if (!$mergeArgs && $this->applicationDefinitionMergedWithArgs)  {
+                $commandArgs = array_udiff(
+                    $this->definition->getArguments(),
+                    $this->application->getDefinition()->getArguments(),
+                    function ($arg1, $arg2) {
+                        return strcmp($arg1->getName(), $arg2->getName());
+                    }
+                );
+
+                $this->definition->setArguments($commandArgs);
+                $this->applicationDefinitionMergedWithArgs = false;
+            }
+
             return;
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run2.txt
@@ -2,7 +2,6 @@ Usage:
   help [options] [--] [<command_name>]
 
 Arguments:
-  command               The command to execute
   command_name          The command name [default: "help"]
 
 Options:
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_astext.txt
@@ -2,9 +2,6 @@
   namespace:name
   name
 
-<comment>Arguments:</comment>
-  <info>command</info>               The command to execute
-
 <comment>Options:</comment>
   <info>-h, --help</info>            Display this help message
   <info>-q, --quiet</info>           Do not output any message
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt b/src/Symfony/Component/Console/Tests/Fixtures/command_asxml.txt
@@ -6,12 +6,7 @@
   </usages>
   <description>description</description>
   <help>help</help>
-  <arguments>
-    <argument name="command" is_required="1" is_array="0">
-      <description>The command to execute</description>
-      <defaults/>
-    </argument>
-  </arguments>
+  <arguments/>
   <options>
     <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
       <description>Display this help message</description>
