Merge branch '4.0'

* 4.0:
  [Console] Add placeholder for line number in console exception fixtures
  fix HHVM tests
  minor symfony#25752 Don't right trim the deprecation message (alexpott)

Author: xabbuh

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -727,10 +727,10 @@ public function testRenderExceptionWithDoubleWidthCharacters()
         $tester = new ApplicationTester($application);
 
         $tester->run(array('command' => 'foo'), array('decorated' => false, 'capture_stderr_separately' => true));
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_doublewidth1.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth1.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
         $tester->run(array('command' => 'foo'), array('decorated' => true, 'capture_stderr_separately' => true));
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_doublewidth1decorated.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth1decorated.txt', $tester->getErrorOutput(true), '->renderException() renders a pretty exceptions with previous exceptions');
 
         $application = new Application();
         $application->setAutoExit(false);
@@ -740,7 +740,7 @@ public function testRenderExceptionWithDoubleWidthCharacters()
         });
         $tester = new ApplicationTester($application);
         $tester->run(array('command' => 'foo'), array('decorated' => false, 'capture_stderr_separately' => true));
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_doublewidth2.txt', $tester->getErrorOutput(true), '->renderException() wraps messages when they are bigger than the terminal');
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_doublewidth2.txt', $tester->getErrorOutput(true), '->renderException() wraps messages when they are bigger than the terminal');
         putenv('COLUMNS=120');
     }
 
@@ -755,7 +755,7 @@ public function testRenderExceptionEscapesLines()
         $tester = new ApplicationTester($application);
 
         $tester->run(array('command' => 'foo'), array('decorated' => false));
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_escapeslines.txt', $tester->getDisplay(true), '->renderException() escapes lines containing formatting');
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_escapeslines.txt', $tester->getDisplay(true), '->renderException() escapes lines containing formatting');
         putenv('COLUMNS=120');
     }
 
@@ -772,7 +772,7 @@ public function testRenderExceptionLineBreaks()
         $tester = new ApplicationTester($application);
 
         $tester->run(array('command' => 'foo'), array('decorated' => false));
-        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_renderexception_linebreaks.txt', $tester->getDisplay(true), '->renderException() keep multiple line breaks');
     }
 
     public function testRun()

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

@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 725:
+In ApplicationTest.php line %d:
 
   エラーメッセージ  
 

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

@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 725:
+In ApplicationTest.php line %d:
                     
   エラーメッセージ  
                     

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

@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 739:
+In ApplicationTest.php line %d:
 
   コマンドの実行中にエラーが  
   発生しました。              

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

@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 753:
+In ApplicationTest.php line %d:
 
   dont break here <  
   info>!</info>      

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

@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 770:
+In ApplicationTest.php line %d:
 
   line 1 with extra spaces          
   line 2                            

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

@@ -52,18 +52,18 @@ public function testGetLocale()
 
     public function testGetUser()
     {
-        $request = Request::create('http://user_test:password_test@test.com/');
+        $request = Request::create('http://user:password@test.com');
         $user = $request->getUser();
 
-        $this->assertEquals('user_test', $user);
+        $this->assertEquals('user', $user);
     }
 
     public function testGetPassword()
     {
-        $request = Request::create('http://user_test:password_test@test.com/');
+        $request = Request::create('http://user:password@test.com');
         $password = $request->getPassword();
 
-        $this->assertEquals('password_test', $password);
+        $this->assertEquals('password', $password);
     }
 
     public function testIsNoCache()