Merge branch '3.3' into 3.4

* 3.3:
  fix HHVM tests
  minor symfony#25752 Don't right trim the deprecation message (alexpott)

Author: xabbuh

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()