Merge branch '5.2' into 5.3

* 5.2:
  [Cache] clarify RedisStore::evaluate()
  [Messenger] Fixed BC layer for RedeliveryStamp
  [DoctrineBridge] fix setting default mapping type to attribute/annotation on php 8/7 respectively
  do not render the same label id attribute twice
  make AbstractDataCollector extend DataCollector to reduce boilerplate

Author: nicolas-grekas

Resources/views/Form/bootstrap_4_layout.html.twig

@@ -125,7 +125,7 @@
         {% if app is defined and app.request is defined %}{%- set input_lang = app.request.locale -%}{%- endif -%}
         {%- set attr = {lang: input_lang} | merge(attr) -%}
         {{- block('form_widget_simple') -}}
-        {%- set label_attr = label_attr|merge({ class: (label_attr.class|default('') ~ ' custom-file-label')|trim }) -%}
+        {%- set label_attr = label_attr|merge({ class: (label_attr.class|default('') ~ ' custom-file-label')|trim })|filter((value, key) => key != 'id') -%}
         <label for="{{ form.vars.id }}" {% with { attr: label_attr } %}{{ block('attributes') }}{% endwith %}>
             {%- if attr.placeholder is defined and attr.placeholder is not none -%}
                 {{- translation_domain is same as(false) ? attr.placeholder : attr.placeholder|trans({}, translation_domain) -}}

Tests/Extension/AbstractBootstrap4LayoutTest.php

@@ -1121,6 +1121,24 @@ public function testFile()
         );
     }
 
+    public function testFileLabelIdNotDuplicated()
+    {
+        $form = $this->factory->createNamed('name', FileType::class);
+
+        $this->assertWidgetMatchesXpath($form->createView(), ['id' => 'n/a', 'attr' => ['class' => 'my&class form-control-file'], 'label_attr' => ['id' => 'label-id']],
+'/div
+    [@class="custom-file"]
+    [
+        ./input
+            [@type="file"]
+            [@name="name"]
+        /following-sibling::label
+            [@for="name"][not(@id)]
+    ]
+'
+        );
+    }
+
     public function testFileWithPlaceholder()
     {
         $form = $this->factory->createNamed('name', FileType::class);