Merge branch '7.4' into 8.0

* 7.4:
  [DependencyInjection][Routing] Fix nested config imports when returning PHP arrays
  fix compatibility with Relay 0.12.1
  [TypeInfo] Fix resolving use statements with line breaks
  [FrameworkBundle] Fix normalization of enums in workflow transitions
  Add missing return type for docblock Closure
  don't use a fixed date fixture when assertions depend on relative times
  [FrameworkBundle] Fix secrets:encrypt-from-local
  [Security] Add support for `Sec-Fetch-Site` to `SameOriginCsrfTokenManager`
  [Console] Optimize mostRecentlyEnteredValue() method
  [HttpClient] Add QUERY to the list of retriable HTTP methods
  Update regular expression in URL validator
  [AssetMapper] Fix parsing @import that don't use url()
  [Messenger] Add retry delay on amazon sqs
  [Serializer] CsvEncoder to escape values starting with line feed when escape formulas is enabled

Author: nicolas-grekas

CHANGELOG.md

@@ -11,10 +11,11 @@ CHANGELOG
 7.4
 ---
 
- * Deprecate using amphp/http-client < 5
  * Add RFC 9111–based caching support to `CachingHttpClient`
- * Deprecate passing an instance of `StoreInterface` as `$cache` argument to `CachingHttpClient` constructor
  * Add option `auto_upgrade_http_version` to control how the request HTTP version is handled in `HttplugClient` and `Psr18Client`
+ * Add QUERY to the list of retriable HTTP methods
+ * Deprecate using amphp/http-client < 5
+ * Deprecate passing an instance of `StoreInterface` as `$cache` argument to `CachingHttpClient` constructor
 
 7.3
 ---

Response/CurlResponse.php

@@ -79,7 +79,7 @@ public function __construct(
 
         if (!$info['response_headers']) {
             // Used to keep track of what we're waiting for
-            curl_setopt($ch, \CURLOPT_PRIVATE, \in_array($method, ['GET', 'HEAD', 'OPTIONS', 'TRACE'], true) && 1.0 < (float) ($options['http_version'] ?? 1.1) ? 'H2' : 'H0'); // H = headers + retry counter
+            curl_setopt($ch, \CURLOPT_PRIVATE, \in_array($method, ['GET', 'HEAD', 'OPTIONS', 'TRACE', 'QUERY'], true) && 1.0 < (float) ($options['http_version'] ?? 1.1) ? 'H2' : 'H0'); // H = headers + retry counter
         }
 
         curl_setopt($ch, \CURLOPT_HEADERFUNCTION, static function ($ch, string $data) use (&$info, &$headers, $options, $multi, $id, &$location, $resolveRedirect, $logger): int {

Retry/GenericRetryStrategy.php

@@ -22,7 +22,7 @@
  */
 class GenericRetryStrategy implements RetryStrategyInterface
 {
-    public const IDEMPOTENT_METHODS = ['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'];
+    public const IDEMPOTENT_METHODS = ['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS', 'TRACE', 'QUERY'];
     public const DEFAULT_RETRY_STATUS_CODES = [
         0 => self::IDEMPOTENT_METHODS, // for transport exceptions
         423,