symfony
diff --git a/‎src/Symfony/Component/Console/Application.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Application.php
+10-3Lines changed: 10 additions & 3 deletions b/‎src/Symfony/Component/Console/Application.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Application.php
+10-3Lines changed: 10 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Console/Input/InputArgument.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Input/InputArgument.php
-10Lines changed: 0 additions & 10 deletions b/‎src/Symfony/Component/Console/Input/InputArgument.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Input/InputArgument.php
-10Lines changed: 0 additions & 10 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/ApplicationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/ApplicationTest.php
+16Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Component/Console/Tests/ApplicationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/ApplicationTest.php
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
Copy file name to clipboard
+41Lines changed: 41 additions & 0 deletions b/‎src/Symfony/Component/Console/Tests/Fixtures/FooOptCommand.php
Copy file name to clipboard
+41Lines changed: 41 additions & 0 deletions
@@ -179,9 +179,16 @@ public function doRun(InputInterface $input, OutputInterface $output)
 
         if (!$name) {
             $name = $this->defaultCommand;
-            $inputArgument = $this->definition->getArgument('command');
-            $inputArgument->setMode(InputArgument::OPTIONAL);
-            $inputArgument->setDefault($name);
+            $this->definition->setArguments(array_merge(
+                $this->definition->getArguments(),
+                array(
+                    'command' => new InputArgument(
+                        'command',
+                        InputArgument::OPTIONAL,
+                        $this->definition->getArgument('command')->getDescription(),
+                        $name),
+                )
+            ));
         }
 
         // the command name MUST be the first element of the input
 
@@ -106,16 +106,6 @@ public function setDefault($default = null)
         $this->default = $default;
     }
 
-    /**
-     * Sets argument's mode.
-     *
-     * @param int $mode
-     */
-    public function setMode($mode)
-    {
-        $this->mode = $mode;
-    }
-
     /**
      * Returns the default value.
      *
 
@@ -39,6 +39,7 @@ public static function setUpBeforeClass()
     {
         self::$fixturesPath = realpath(__DIR__.'/Fixtures/');
         require_once self::$fixturesPath.'/FooCommand.php';
+        require_once self::$fixturesPath.'/FooOptCommand.php';
         require_once self::$fixturesPath.'/Foo1Command.php';
         require_once self::$fixturesPath.'/Foo2Command.php';
         require_once self::$fixturesPath.'/Foo3Command.php';
@@ -1135,6 +1136,21 @@ public function testSetRunCustomDefaultCommand()
         $this->assertEquals('interact called'.PHP_EOL.'called'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
     }
 
+    public function testSetRunCustomDefaultCommandWithOption()
+    {
+        $command = new \FooOptCommand();
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->add($command);
+        $application->setDefaultCommand($command->getName());
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('--fooopt' => 'opt'));
+
+        $this->assertEquals('interact called'.PHP_EOL.'called'.PHP_EOL.'opt'.PHP_EOL, $tester->getDisplay(), 'Application runs the default set command if different from \'list\' command');
+    }
+
     /**
      * @requires function posix_isatty
      */
 
@@ -0,0 +1,41 @@
+<?php
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class FooOptCommand extends Command
+{
+    public $input;
+    public $output;
+
+    protected function configure()
+    {
+        $this
+            ->setName('foo:bar')
+            ->setDescription('The foo:bar command')
+            ->setAliases(array('afoobar'))
+            ->addOption(
+                'fooopt',
+                'fo',
+                InputOption::VALUE_OPTIONAL,
+                'fooopt description'
+            )
+        ;
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('interact called');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        $output->writeln('called');
+        $output->writeln($this->input->getOption('fooopt'));
+    }
+}