Merge branch '2.8' into 3.0

fabpot · fabpot · commit afece71f7c96 · 2016-05-26T10:07:28.000+02:00
* 2.8:
  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
@@ -726,7 +726,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
`@@ -726,7 +726,7 @@ public function testAddingOptionWithDuplicateShortcut()`
`726`	`726`
`727`	`727`	`$application`
`728`	`728`	`->register('foo')`
`729`		`- ->setAliases(['f'])`
	`729`	`+ ->setAliases(array('f'))`
`730`	`730`	`->setDefinition(array(new InputOption('survey', 'e', InputOption::VALUE_REQUIRED, 'My option with a shortcut.')))`
`731`	`731`	`->setCode(function (InputInterface $input, OutputInterface $output) {})`
`732`	`732`	`;`