Merge branch '2.3' into 2.7

fabpot · fabpot · commit 557bc51c5b8d · 2016-05-26T10:07:14.000+02:00
* 2.3:
  fixed PHP 5.3 compat in tests
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -746,7 +746,7 @@ public function testAddingOptionWithDuplicateShortcut()
 
         $application
             ->register('foo')
-            ->setAliases(['f'])
+            ->setAliases(array('f'))
             ->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))
             ->setCode(function (InputInterface $input, OutputInterface $output) {})
         ;

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ public function testAddingOptionWithDuplicateShortcut()`
`746`	`746`
`747`	`747`	`$application`
`748`	`748`	`->register('foo')`
`749`		`- ->setAliases([ 50E2 'f'])`
	`749`	`+ ->setAliases(array('f'))`
`750`	`750`	`->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))`
`751`	`751`	`->setCode(function (InputInterface $input, OutputInterface $output) {})`
`752`	`752`	`;`