Merge branch '2.6' into 2.7

fabpot · fabpot · commit 33ff623cb044 · 2015-04-04T14:23:51.000+02:00
* 2.6:
  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);`