Merge branch '2.8' into 3.3

xabbuh · xabbuh · commit ff40995e95b5 · 2018-01-15T16:14:43.000+01:00
* 2.8: fix HHVM tests minor #25752 Don't right trim the deprecation message (alexpott)
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/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()

Original file line number	Diff line number	Diff line change
`@@ -52,18 +52,18 @@ public function testGetLocale()`
`52`	`52`
`53`	`53`	`public function testGetUser()`
`54`	`54`	`{`
`55`		`- $request = Request::create('http://user_test:password_test@test.com/');`
	`55`	`+ $request = Request::create('http://user:password@test.com');`
`56`	`56`	`$user = $request->getUser();`
`57`	`57`
`58`		`- $this->assertEquals('user_test', $user);`
	`58`	`+ $this->assertEquals('user', $user);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function testGetPassword()`
`62`	`62`	`{`
`63`		`- $request = Request::create('http://user_test:password_test@test.com/');`
	`63`	`+ $request = Request::create('http://user:password@test.com');`
`64`	`64`	`$password = $request->getPassword();`
`65`	`65`
`66`		`- $this->assertEquals('password_test', $password);`
	`66`	`+ $this->assertEquals('password', $password);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function testIsNoCache()`