nicolas-grekas
diff --git a/‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
Lines changed: 14 additions & 3 deletions b/‎src/Symfony/Component/Form/Tests/AbstractBootstrap4LayoutTest.php
Lines changed: 14 additions & 3 deletions
@@ -114,6 +114,16 @@
     </div>
 {%- endblock percent_widget %}
 
+{% block file_widget -%}
+    <div class="form-group">
+        <{{ element|default('div') }} class="custom-file">
+            {%- set type = type|default('file') -%}
+            {{- block('form_widget_simple') -}}
+            <label for="{{ form.vars.id }}" class="custom-file-label">Choose File</label>
+        </{{ element|default('div') }}>
+    </div>
+{% endblock %}
+
 {% block form_widget_simple -%}
     {% if type is not defined or type != 'hidden' %}
         {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control' ~ (type|default('') == 'file' ? '-file' : ''))|trim}) -%}
 
@@ -923,9 +923,20 @@ public function testFile()
     {
         $form = $this->factory->createNamed('name', FileType::class);
 
-        $this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class form-control-file')),
-'/input
-    [@type="file"]
+        $this->assertWidgetMatchesXpath($form->createView(), array('id' => 'nope', 'attr' => array('class' => 'my&class form-control-file')),
+'/div
+    [@class="form-group"]
+    [
+        ./div
+            [@class="custom-file"]
+            [
+                ./input
+                    [@type="file"]
+                    [@name="name"]
+                /following-sibling::label
+                    [@for="name"]
+            ]
+    ]
 '
         );
     }