Merge branch '5.4' into 6.2

* 5.4:
  [Serializer] Preserve array keys while denormalize variadic parameters
  [FrameworkBundle] enable metadata cache when annotation is disabled
  TranslatorBag::diff now iterates over catalogue domains instead of operation domains
  [HttpClient] Fix not calling the on progress callback when canceling a MockResponse
  [TwigBridge] Fix raw content rendering in HTML notification emails

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -1773,9 +1773,6 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
     private function registerSerializerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)
     {
         $loader->load('serializer.php');
-        if ($container->getParameter('kernel.debug')) {
-            $container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
-        }
 
         $chainLoader = $container->getDefinition('serializer.mapping.chain_loader');
 
@@ -1798,6 +1795,10 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
 
         $serializerLoaders = [];
         if (isset($config['enable_annotations']) && $config['enable_annotations']) {
+            if ($container->getParameter('kernel.debug')) {
+                $container->removeDefinition('serializer.mapping.cache_class_metadata_factory');
+            }
+
             $annotationLoader = new Definition(
                 AnnotationLoader::class,
                 [new Reference('annotation_reader', ContainerInterface::NULL_ON_INVALID_REFERENCE)]

Resources/config/validator.php

@@ -28,7 +28,7 @@
     $container->parameters()
         ->set('validator.mapping.cache.file', param('kernel.cache_dir').'/validation.php');
 
-    $validatorsDir = \dirname((new \ReflectionClass(WhenValidator::class))->getFileName());
+    $validatorsDir = \dirname((new \ReflectionClass(EmailValidator::class))->getFileName());
 
     $container->services()
         ->set('validator', ValidatorInterface::class)

Tests/DependencyInjection/Fixtures/php/serializer_mapping_without_annotations.php

@@ -0,0 +1,14 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'serializer' => [
+        'enable_annotations' => false,
+        'mapping' => [
+            'paths' => [
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml',
+                '%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml',
+            ],
+        ],
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/serializer_mapping_without_annotations.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony">
+
+    <framework:config>
+        <framework:serializer enable-annotations="false">
+            <framework:mapping>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml</framework:path>
+                <framework:path>%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml</framework:path>
+            </framework:mapping>
+        </framework:serializer>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/serializer_mapping_without_annotations.yml

@@ -0,0 +1,8 @@
+framework:
+    serializer:
+        enable_annotations: false
+        mapping:
+            paths:
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/files"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yml"
+                - "%kernel.project_dir%/Fixtures/TestBundle/Resources/config/serializer_mapping/serialization.yaml"

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -1516,9 +1516,15 @@ public function testSerializerCacheActivated()
         $this->assertEquals(new Reference('serializer.mapping.cache.symfony'), $cache);
     }
 
-    public function testSerializerCacheNotActivatedDebug()
+    public function testSerializerCacheUsedWithoutAnnotationsAndMappingFiles()
     {
-        $container = $this->createContainerFromFile('serializer_enabled', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
+        $container = $this->createContainerFromFile('serializer_mapping_without_annotations', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
+        $this->assertTrue($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
+    }
+
+    public function testSerializerCacheNotActivatedWithAnnotations()
+    {
+        $container = $this->createContainerFromFile('serializer_mapping', ['kernel.debug' => true, 'kernel.container_class' => __CLASS__]);
         $this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
     }