Merge branch '2.8' into 3.3

* 2.8:
  fix HHVM tests
  minor #25752 Don't right trim the deprecation message (alexpott)
This commit is contained in:
Christian Flothmann 2018-01-15 16:14:43 +01:00
commit ff40995e95

View File

@ -52,18 +52,18 @@ class RequestTest extends TestCase
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()