Skip to content

Commit 8083124

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [Security][Tests] Update functional tests to better reflect end-user scenarios [Clock] Add PHPUnit 10 attributes [AssetMapper] Fix `JavaScriptImportPathCompiler` regression in regex [HttpClient] Fix deprecation on PHP 8.3 [Mailer][Brevo] Remove tags from mandatory event arguments [Validator] Simplify `NoSuspiciousCharactersValidator`
2 parents 10ebb26 + 425f462 commit 8083124

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

NativeHttpClient.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,11 @@ private static function createRedirectResolver(array $options, string $host, str
404404
$redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);
405405
$redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
406406

407-
stream_context_set_option($context, ['http' => $options]);
407+
if (\PHP_VERSION_ID >= 80300) {
408+
stream_context_set_options($context, ['http' => $options]);
409+
} else {
410+
stream_context_set_option($context, ['http' => $options]);
411+
}
408412
}
409413
}
410414

0 commit comments

Comments
 (0)