Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 1d6576da8604 · 2017-03-27T16:49:15.000+02:00
* 2.7:
  [HttpKernel] Fix test
  Remove port from default host in server:status command
  [Console] Escape exception messages
diff --git a/Command/ServerStatusCommand.php b/Command/ServerStatusCommand.php
@@ -32,7 +32,7 @@ protected function configure()
     {
         $this
             ->setDefinition(array(
-                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1:8000'),
+                new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1'),
                 new InputOption('port', 'p', InputOption::VALUE_REQUIRED, 'Address port number', '8000'),
             ))
             ->setName('server:status')

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected function configure()`
`32`	`32`	`{`
`33`	`33`	`$this`
`34`	`34`	`->setDefinition(array(`
`35`		`- new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1:8000'),`
	`35`	`+ new InputArgument('address', InputArgument::OPTIONAL, 'Address:port', '127.0.0.1'),`
`36`	`36`	`new InputOption('port', 'p', InputOption::VALUE_REQUIRED, 'Address port number', '8000'),`
`37`	`37`	`))`
`38`	`38`	`->setName('server:status')`