Skip to content

Commit ac0a755

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: Minor doc fix. Simplified the way to update PHPUnit to the latest version [Process] Minor README update [HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM Fixed a html error "Element ul is not closed" in logger.html.twig [HttpFoundation] Officialize the 308 redirect RFC issue #10808 crawler test Empty select with attribute name="foo[]" bug fix Fixed contextually wrong translation
2 parents 1b6f7c6 + ed640a4 commit ac0a755

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Request.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ public function getPort()
972972
*/
973973
public function getUser()
974974
{
975-
return $this->server->get('PHP_AUTH_USER');
975+
return $this->headers->get('PHP_AUTH_USER');
976976
}
977977

978978
/**
@@ -982,7 +982,7 @@ public function getUser()
982982
*/
983983
public function getPassword()
984984
{
985-
return $this->server->get('PHP_AUTH_PW');
985+
return $this->headers->get('PHP_AUTH_PW');
986986
}
987987

988988
/**

Tests/RequestTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function testCreate()
209209
$this->assertEquals(80, $request->getPort());
210210
$this->assertEquals('test.com', $request->getHttpHost());
211211
$this->assertEquals('testnopass', $request->getUser());
212-
$this->assertNull($request->getPassword());
212+
$this->assertSame('',$request->getPassword());
213213
$this->assertFalse($request->isSecure());
214214

215215
$request = Request::create('http://test.com/?foo');

0 commit comments

Comments
 (0)