[HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM

Request#getUser() and Request#getPassword() introduced in
aecfd0a891 do not handle the lack of
PHP_AUTH_USER and PHP_AUTH_PW in $this->server when using PHP-FPM. Use
$this->headers instead.
Furthermore, the test of empty password now expects an empty string
instead of NULL according to a450d002f2.
This commit is contained in:
Kevin Decherf 2014-06-10 23:24:49 +02:00
parent 6bd80277f1
commit 7a75adf6f1
2 changed files with 3 additions and 3 deletions

View File

@ -949,7 +949,7 @@ class Request
*/
public function getUser()
{
return $this->server->get('PHP_AUTH_USER');
return $this->headers->get('PHP_AUTH_USER');
}
/**
@ -959,7 +959,7 @@ class Request
*/
public function getPassword()
{
return $this->server->get('PHP_AUTH_PW');
return $this->headers->get('PHP_AUTH_PW');
}
/**

View File

@ -209,7 +209,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(80, $request->getPort());
$this->assertEquals('test.com', $request->getHttpHost());
$this->assertEquals('testnopass', $request->getUser());
$this->assertNull($request->getPassword());
$this->assertSame('',$request->getPassword());
$this->assertFalse($request->isSecure());
$request = Request::create('http://test.com/?foo');