bug #14205 Fix currently broken tests (mpdude)

fabpot · fabpot · commit c29f779eded4 · 2015-04-04T14:23:37.000+02:00
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14205). Discussion ---------- Fix currently broken tests Glitch from 8f72338 Commits ------- 1122160 Fix currently broken tests
diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php
@@ -61,7 +61,7 @@ public function execute(array $input, array $options = array())
             && (null !== $application = $this->command->getApplication())
             && $application->getDefinition()->hasArgument('command')
         ) {
-            $input['command'] = $this->command->getName();
+            $input = array_merge(array('command' => $this->command->getName()), $input);
         }
 
         $this->input = new ArrayInput($input);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function execute(array $input, array $options = array())`
`61`	`61`	`&& (null !== $application = $this->command->getApplication())`
`62`	`62`	`&& $application->getDefinition()->hasArgument('command')`
`63`	`63`	`) {`
`64`		`- $input['command'] = $this->command->getName();`
	`64`	`+ $input = array_merge(array('command' => $this->command->getName()), $input);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$this->input = new ArrayInput($input);`