Merge branch '3.0' into 3.1

fabpot · fabpot · commit defe88fee1e3 · 2016-05-26T10:07:35.000+02:00
* 3.0:
  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
@@ -749,7 +749,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
`@@ -749,7 +749,7 @@ public function testAddingOptionWithDuplicateShortcut()`
`749`	`749`
`750`	`750`	`$application`
`751`	`751`	`->register('foo')`
`752`		`- ->setAliases(['f'])`
	`752`	`+ ->setAliases(array('f'))`
`753`	`753`	`->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))`
`754`	`754`	`->setCode(function (InputInterface $input, OutputInterface $output) {})`
`755`	`755`	`;`