Merge branch '5.4' into 6.4

wouterj · wouterj · commit f3c86a60a361 · 2024-03-02T13:45:30.000+01:00
* 5.4:
  [Security][Tests] Update functional tests to better reflect end-user scenarios
  [HttpClient] Fix deprecation on PHP 8.3
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]);
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,11 @@ private static function createRedirectResolver(array $options, string $host, str`
`404`	`404`	`$redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);`
`405`	`405`	`$redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);`
`406`	`406`
`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`	`+ }`
`408`	`412`	`}`
`409`	`413`	`}`
`410`	`414`