From 1483c87aab39d6370d45d5ba621f1d4a0089fca9 Mon Sep 17 00:00:00 2001
From: Jannik Zschiesche <jz@becklyn.com>
Date: Thu, 2 Aug 2018 11:42:21 +0200
Subject: [PATCH] Add help texts for checkboxes in horizontal bootstrap 4 forms

---
 .../bootstrap_4_horizontal_layout.html.twig   |  1 +
 ...AbstractBootstrap4HorizontalLayoutTest.php | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
index ca40981ec8524..7fcea4b0ecd25 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_horizontal_layout.html.twig
@@ -81,6 +81,7 @@ col-sm-10
         <div class="{{ block('form_label_class') }}"></div>{#--#}
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
+            {{- form_help(form) -}}
             {{- form_errors(form) -}}
         </div>{#--#}
     </div>
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
index 9d216e38194f2..588c9a422bc5c 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php
@@ -214,4 +214,24 @@ public function testCheckboxRow()
 
         $this->assertMatchesXpath($html, '/div[@class="form-group row"]/div[@class="col-sm-2" or @class="col-sm-10"]', 2);
     }
+
+    public function testCheckboxRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $view = $form->createView();
+        $html = $this->renderRow($view, array('label' => 'foo', 'help' => 'really helpful text'));
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="form-group row"]
+    [
+        ./div[@class="col-sm-2" or @class="col-sm-10"]
+        /following-sibling::div[@class="col-sm-2" or @class="col-sm-10"]
+        [
+            ./small[text() = "[trans]really helpful text[/trans]"]
+        ]
+    ]
+'
+        );
+    }
 }