Merge branch '7.2' into 7.3

* 7.2:
  [WebProfilerBundle] Fix tests
  [Cache] Tests for Redis Replication with cache
  [BrowserKit] Fix submitting forms with empty file fields
  [Notifier] [BlueSky] Change the value returned as the message ID
  [WebProfilerBundle] Fix interception for non conventional redirects
  [DependencyInjection] Do not preload functions
  [DependencyInjection] Fix cloned lazy services not sharing their dependencies when dumped with PhpDumper
  [Form][FrameworkBundle] Use auto-configuration to make the default CSRF token id apply only to the app; not to bundles
  [HttpClient] Fix activity tracking leading to negative timeout errors
  [Serializer] Handle default context in named Serializer
  [Security] Return null instead of empty username to fix deprecation notice
  [DependencyInjection] Fix env default processor with scalar node

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -644,7 +644,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->registerForAutoconfiguration(DataCollectorInterface::class)
             ->addTag('data_collector');
         $container->registerForAutoconfiguration(FormTypeInterface::class)
-            ->addTag('form.type');
+            ->addTag('form.type', ['csrf_token_id' => '%.form.type_extension.csrf.token_id%']);
         $container->registerForAutoconfiguration(FormTypeGuesserInterface::class)
             ->addTag('form.type_guesser');
         $container->registerForAutoconfiguration(FormTypeExtensionInterface::class)
@@ -815,9 +815,7 @@ private function registerFormConfiguration(array $config, ContainerBuilder $cont
             $container->setParameter('form.type_extension.csrf.enabled', true);
             $container->setParameter('form.type_extension.csrf.field_name', $config['form']['csrf_protection']['field_name']);
             $container->setParameter('form.type_extension.csrf.field_attr', $config['form']['csrf_protection']['field_attr']);
-
-            $container->getDefinition('form.type_extension.csrf')
-                ->replaceArgument(7, $config['form']['csrf_protection']['token_id']);
+            $container->setParameter('.form.type_extension.csrf.token_id', $config['form']['csrf_protection']['token_id']);
         } else {
             $container->setParameter('form.type_extension.csrf.enabled', false);
         }

Resources/config/form_csrf.php

@@ -24,7 +24,7 @@
                 param('validator.translation_domain'),
                 service('form.server_params'),
                 param('form.type_extension.csrf.field_attr'),
-                abstract_arg('framework.form.csrf_protection.token_id'),
+                param('.form.type_extension.csrf.token_id'),
             ])
             ->tag('form.type_extension')
     ;