[Console] added some tests for previous merge (refs #8626)

fabpot · fabpot · commit d80e840b7f35 · 2013-09-30T21:59:36.000+02:00
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -57,14 +57,11 @@ public function execute(array $input, array $options = array())
     {
         // set the command name automatically if the application requires
         // this argument and no command name was passed
-        if (!isset($input['command'])) {
-            $application = $this->command->getApplication();
-            if (null !== $application) {
-                $definition = $application->getDefinition();
-                if ($definition->hasArgument('command')) {
-                    $input['command'] = $this->command->getName();
-                }
-            }
+        if (!isset($input['command'])
+            && (null !== $application = $this->command->getApplication())
+            && $application->getDefinition()->hasArgument('command')
+        ) {
+            $input['command'] = $this->command->getName();
         }
 
         $this->input = new ArrayInput($input);
diff --git a/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php b/src/Symfony/Component/Console/Tests/Tester/CommandTesterTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Tester;
 
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -64,4 +65,20 @@ public function testGetStatusCode()
     {
         $this->assertSame(0, $this->tester->getStatusCode(), '->getStatusCode() returns the status code');
     }
+
+    public function testCommandFromApplication()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+
+        $command = new Command('foo');
+        $command->setCode(function ($input, $output) { $output->writeln('foo'); });
+
+        $application->add($command);
+
+        $tester = new CommandTester($application->find('foo'));
+
+        // check that there is no need to pass the command name here
+        $this->assertEquals(0, $tester->execute(array()));
+    }
 }
