Skip to content

Commit ce743cf

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Security/Core] fix checking for bcrypt [HttpFoundation] Fixes for PHP 8.1 deprecations [Mime] DataPart: remove confusing fix-me comment expose references detected in inline notation structures
2 parents 99fc4b0 + 842fcca commit ce743cf

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Request.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ public static function createFromGlobals()
305305
{
306306
$request = self::createRequestFromFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
307307

308-
if (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
308+
if (0 === strpos($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
309309
&& \in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])
310310
) {
311311
parse_str($request->getContent(), $data);
@@ -1404,7 +1404,7 @@ public function setRequestFormat(?string $format)
14041404
*/
14051405
public function getContentType()
14061406
{
1407-
return $this->getFormat($this->headers->get('CONTENT_TYPE'));
1407+
return $this->getFormat($this->headers->get('CONTENT_TYPE', ''));
14081408
}
14091409

14101410
/**
@@ -1599,7 +1599,7 @@ public function toArray()
15991599
*/
16001600
public function getETags()
16011601
{
1602-
return preg_split('/\s*,\s*/', $this->headers->get('if_none_match'), -1, \PREG_SPLIT_NO_EMPTY);
1602+
return preg_split('/\s*,\s*/', $this->headers->get('if_none_match', ''), -1, \PREG_SPLIT_NO_EMPTY);
16031603
}
16041604

16051605
/**
@@ -1848,13 +1848,13 @@ protected function prepareRequestUri()
18481848
*/
18491849
protected function prepareBaseUrl()
18501850
{
1851-
$filename = basename($this->server->get('SCRIPT_FILENAME'));
1851+
$filename = basename($this->server->get('SCRIPT_FILENAME', ''));
18521852

1853-
if (basename($this->server->get('SCRIPT_NAME')) === $filename) {
1853+
if (basename($this->server->get('SCRIPT_NAME', '')) === $filename) {
18541854
$baseUrl = $this->server->get('SCRIPT_NAME');
1855-
} elseif (basename($this->server->get('PHP_SELF')) === $filename) {
1855+
} elseif (basename($this->server->get('PHP_SELF', '')) === $filename) {
18561856
$baseUrl = $this->server->get('PHP_SELF');
1857-
} elseif (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) {
1857+
} elseif (basename($this->server->get('ORIG_SCRIPT_NAME', '')) === $filename) {
18581858
$baseUrl = $this->server->get('ORIG_SCRIPT_NAME'); // 1and1 shared hosting compatibility
18591859
} else {
18601860
// Backtrack up the script_filename to find the portion matching
@@ -1894,7 +1894,7 @@ protected function prepareBaseUrl()
18941894
$truncatedRequestUri = substr($requestUri, 0, $pos);
18951895
}
18961896

1897-
$basename = basename($baseUrl);
1897+
$basename = basename($baseUrl ?? '');
18981898
if (empty($basename) || !strpos(rawurldecode($truncatedRequestUri), $basename)) {
18991899
// no match whatsoever; set it blank
19001900
return '';
@@ -2045,7 +2045,7 @@ private static function createRequestFromFactory(array $query = [], array $reque
20452045
*/
20462046
public function isFromTrustedProxy()
20472047
{
2048-
return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR'), self::$trustedProxies);
2048+
return self::$trustedProxies && IpUtils::checkIp($this->server->get('REMOTE_ADDR', ''), self::$trustedProxies);
20492049
}
20502050

20512051
private function getTrustedValues(int $type, string $ip = null): array

Tests/Fixtures/response-functional/cookie_raw_urlencode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
$r->headers->setCookie(new Cookie($str, $str, 0, '/', null, false, false, true, null));
1010
$r->sendHeaders();
1111

12-
setrawcookie($str, $str, 0, '/', null, false, false);
12+
setrawcookie($str, $str, 0, '/', '', false, false);

0 commit comments

Comments
 (0)