Skip to content

Commit 842fcca

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [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 ccc7bc0 + 90e4071 commit 842fcca

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
@@ -306,7 +306,7 @@ public static function createFromGlobals()
306306

307307
if ($_POST) {
308308
$request->request = new InputBag($_POST);
309-
} elseif (0 === strpos($request->headers->get('CONTENT_TYPE'), 'application/x-www-form-urlencoded')
309+
} elseif (0 === strpos($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
310310
&& \in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])
311311
) {
312312
parse_str($request->getContent(), $data);
@@ -1405,7 +1405,7 @@ public function setRequestFormat(?string $format)
14051405
*/
14061406
public function getContentType()
14071407
{
1408-
return $this->getFormat($this->headers->get('CONTENT_TYPE'));
1408+
return $this->getFormat($this->headers->get('CONTENT_TYPE', ''));
14091409
}
14101410

14111411
/**
@@ -1600,7 +1600,7 @@ public function toArray()
16001600
*/
16011601
public function getETags()
16021602
{
1603-
return preg_split('/\s*,\s*/', $this->headers->get('if_none_match'), -1, \PREG_SPLIT_NO_EMPTY);
1603+
return preg_split('/\s*,\s*/', $this->headers->get('if_none_match', ''), -1, \PREG_SPLIT_NO_EMPTY);
16041604
}
16051605

16061606
/**
@@ -1849,13 +1849,13 @@ protected function prepareRequestUri()
18491849
*/
18501850
protected function prepareBaseUrl()
18511851
{
1852-
$filename = basename($this->server->get('SCRIPT_FILENAME'));
1852+
$filename = basename($this->server->get('SCRIPT_FILENAME', ''));
18531853

1854-
if (basename($this->server->get('SCRIPT_NAME')) === $filename) {
1854+
if (basename($this->server->get('SCRIPT_NAME', '')) === $filename) {
18551855
$baseUrl = $this->server->get('SCRIPT_NAME');
1856-
} elseif (basename($this->server->get('PHP_SELF')) === $filename) {
1856+
} elseif (basename($this->server->get('PHP_SELF', '')) === $filename) {
18571857
$baseUrl = $this->server->get('PHP_SELF');
1858-
} elseif (basename($this->server->get('ORIG_SCRIPT_NAME')) === $filename) {
1858+
} elseif (basename($this->server->get('ORIG_SCRIPT_NAME', '')) === $filename) {
18591859
$baseUrl = $this->server->get('ORIG_SCRIPT_NAME'); // 1and1 shared hosting compatibility
18601860
} else {
18611861
// Backtrack up the script_filename to find the portion matching
@@ -1895,7 +1895,7 @@ protected function prepareBaseUrl()
18951895
$truncatedRequestUri = substr($requestUri, 0, $pos);
18961896
}
18971897

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

20522052
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)