Merge branch '5.4' into 6.4

* 5.4: [Security][Tests] Update functional tests to better reflect end-user scenarios [HttpClient] Fix deprecation on PHP 8.3
symfony · Mar 2, 2024 · f3c86a6 · f3c86a6
2 parents aa6281d + 63d93fd
commit f3c86a6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/NativeHttpClient.php b/NativeHttpClient.php
@@ -404,7 +404,11 @@ private static function createRedirectResolver(array $options, string $host, str
                     $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);
                     $redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
 
-                    stream_context_set_option($context, ['http' => $options]);
+                    if (\PHP_VERSION_ID >= 80300) {
+                        stream_context_set_options($context, ['http' => $options]);
+                    } else {
+                        stream_context_set_option($context, ['http' => $options]);
+                    }
                 }
             }