Merge branch '7.4' into 8.0

* 7.4:
  [Form][Intl] Allow the developer to choose if he want to include/exclude currencies that do not have validity dates.
  [Serializer] Allow forcing timezone in `DateTimeNormalizer` during denormalization
  [HttpFoundation] Allow Request::setFormat() to override predefined formats

Author: nicolas-grekas

Request.php

@@ -1290,15 +1290,22 @@ public function getFormat(?string $mimeType, bool $subtypeFallback = false): ?st
             static::initializeFormats();
         }
 
+        $exactFormat = null;
+        $canonicalFormat = null;
+
         foreach (static::$formats as $format => $mimeTypes) {
-            if (\in_array($mimeType, (array) $mimeTypes, true)) {
-                return $format;
+            if (\in_array($mimeType, $mimeTypes, true)) {
+                $exactFormat = $format;
             }
-            if (null !== $canonicalMimeType && \in_array($canonicalMimeType, (array) $mimeTypes, true)) {
-                return $format;
+            if (null !== $canonicalMimeType && \in_array($canonicalMimeType, $mimeTypes, true)) {
+                $canonicalFormat = $format;
             }
         }
 
+        if ($format = $exactFormat ?? $canonicalFormat) {
+            return $format;
+        }
+
         if (!$canonicalMimeType ??= $mimeType) {
             return null;
         }
@@ -1334,7 +1341,7 @@ public function setFormat(?string $format, string|array $mimeTypes): void
             static::initializeFormats();
         }
 
-        static::$formats[$format] = \is_array($mimeTypes) ? $mimeTypes : [$mimeTypes];
+        static::$formats[$format ?? ''] = (array) $mimeTypes;
     }
 
     /**

Tests/Test/Constraint/ResponseFormatSameTest.php

@@ -47,4 +47,14 @@ public function testNullFormat()
 
         $constraint->evaluate(new Response('', 200, ['Content-Type' => 'application/ld+json']));
     }
+
+    public function testOverriddenFormat()
+    {
+        $request = new Request();
+        $request->setFormat('jsonapi', ['application/vnd.api+json']);
+        $request->setFormat('apijson', ['application/vnd.api+json']);
+
+        $constraint = new ResponseFormatSame($request, 'apijson');
+        $this->assertTrue($constraint->evaluate(new Response('', 200, ['Content-Type' => 'application/vnd.api+json']), '', true));
+    }
 }