Merge branch '2.6' into 2.7

* 2.6:
  Fix currently broken tests
This commit is contained in:
Fabien Potencier 2015-04-04 14:23:51 +02:00
commit 33ff623cb0

View File

@ -61,7 +61,7 @@ class CommandTester
&& (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);