Merge branch '2.7' into 2.8

* 2.7:
  [HttpKernel] Fix test
  Remove port from default host in server:status command
  [Console] Escape exception messages

src/Symfony/Bundle/FrameworkBundle/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')

src/Symfony/Component/Console/Application.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Descriptor\TextDescriptor;
 use Symfony\Component\Console\Descriptor\XmlDescriptor;
 use Symfony\Component\Console\Exception\ExceptionInterface;
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\DebugFormatterHelper;
 use Symfony\Component\Console\Helper\ProcessHelper;
 use Symfony\Component\Console\Helper\QuestionHelper;
@@ -654,7 +655,7 @@ public function renderException($e, $output)
             }
             $formatter = $output->getFormatter();
             $lines = array();
-            foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
+            foreach (preg_split('/\r?\n/', OutputFormatter::escape($e->getMessage())) as $line) {
                 foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
                     // pre-format lines to get the right string length
                     $lineLength = $this->stringWidth(preg_replace('/\[[^m]*m/', '', $formatter->format($line))) + 4;

src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3.txt

@@ -1,13 +1,13 @@
 
-
-  [Exception]              
-  Third exception comment  
-
+                                              
+  [Exception]                                 
+  Third exception <fg=blue;bg=red>comment</>  
+                                              
 
-
-  [Exception]               
-  Second exception comment  
-
+                                               
+  [Exception]                                  
+  Second exception <comment>comment</comment>  
+                                               
 
 
   [Exception]                          

src/Symfony/Component/Console/Tests/Fixtures/application_renderexception3decorated.txt

@@ -1,17 +1,17 @@
 
-                           
-  [Exception]              
-  Third exception comment  
-                           
+                                              
+  [Exception]                                 
+  Third exception <fg=blue;bg=red>comment</>  
+                                              
 
-                            
-  [Exception]               
-  Second exception comment  
-                            
+                                               
+  [Exception]                                  
+  Second exception <comment>comment</comment>  
+                                               
 
                                        
   [Exception]                          
-  First exception <p>this is html</p>  
+  First exception <p>this is html</p>  
                                        
 
 foo3:bar