[TwigBridge][Form] Added missing help messages in form themes

Author: cmen

Resources/views/Form/bootstrap_3_horizontal_layout.html.twig

@@ -64,6 +64,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>

Resources/views/Form/bootstrap_3_layout.html.twig

@@ -148,13 +148,15 @@
 {% block checkbox_row -%}
     <div{% with {attr: row_attr|merge({class: (row_attr.class|default('') ~ ' form-group' ~ (not valid ? ' has-error'))|trim})} %}{{ block('attributes') }}{% endwith %}>
         {{- form_widget(form) -}}
+        {{- form_help(form) -}}
         {{- form_errors(form) -}}
     </div>
 {%- endblock checkbox_row %}
 
 {% block radio_row -%}
     <div{% with {attr: row_attr|merge({class: (row_attr.class|default('') ~ ' form-group' ~ (not valid ? ' has-error'))|trim})} %}{{ block('attributes') }}{% endwith %}>
         {{- form_widget(form) -}}
+        {{- form_help(form) -}}
         {{- form_errors(form) -}}
     </div>
 {%- endblock radio_row %}

Resources/views/Form/foundation_5_layout.html.twig

@@ -311,6 +311,7 @@
     <div{% with {attr: row_attr|merge({class: (row_attr.class|default('') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>
         <div class="large-12 columns{% if not valid %} error{% endif %}">
             {{ form_widget(form) }}
+            {{- form_help(form) -}}
             {{ form_errors(form) }}
         </div>
     </div>
@@ -320,6 +321,7 @@
     <div{% with {attr: row_attr|merge({class: (row_attr.class|default('') ~ ' row')|trim})} %}{{ block('attributes') }}{% endwith %}>
         <div class="large-12 columns{% if not valid %} error{% endif %}">
             {{ form_widget(form) }}
+            {{- form_help(form) -}}
             {{ form_errors(form) }}
         </div>
     </div>

Tests/Extension/AbstractBootstrap3HorizontalLayoutTest.php

@@ -163,4 +163,23 @@ public function testCheckboxRow()
 
         $this->assertMatchesXpath($html, '/div[@class="form-group"]/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');
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="form-group"]
+    [
+        ./div[@class="col-sm-2" or @class="col-sm-10"]
+        /following-sibling::div[@class="col-sm-2" or @class="col-sm-10"]
+        [
+            ./span[text() = "[trans]really helpful text[/trans]"]
+        ]
+    ]
+'
+        );
+    }
 }

Tests/Extension/AbstractBootstrap3LayoutTest.php

@@ -333,6 +333,21 @@ public function testCheckboxWithValue()
         );
     }
 
+    public function testCheckboxRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="form-group"]
+    [
+        ./span[text() = "[trans]really helpful text[/trans]"]
+    ]
+'
+        );
+    }
+
     public function testSingleChoice()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', '&a', [
@@ -2277,6 +2292,21 @@ public function testRadioWithValue()
         );
     }
 
+    public function testRadioRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false);
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="form-group"]
+    [
+        ./span[text() = "[trans]really helpful text[/trans]"]
+    ]
+'
+        );
+    }
+
     public function testRange()
     {
         $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RangeType', 42, ['attr' => ['min' => 5]]);

Tests/Extension/AbstractBootstrap4HorizontalLayoutTest.php

@@ -231,6 +231,25 @@ public function testCheckboxRowWithHelp()
             ./small[text() = "[trans]really helpful text[/trans]"]
         ]
     ]
+'
+        );
+    }
+
+    public function testRadioRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false);
+        $html = $this->renderRow($form->createView(), ['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]"]
+        ]
+    ]
 '
         );
     }

Tests/Extension/AbstractBootstrap4LayoutTest.php

@@ -422,6 +422,21 @@ public function testCheckboxWithValue()
         );
     }
 
+    public function testCheckboxRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\CheckboxType');
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+            '/div
+    [@class="form-group"]
+    [
+        ./small[text() = "[trans]really helpful text[/trans]"]
+    ]
+'
+        );
+    }
+
     public function testSingleChoiceExpanded()
     {
         $form = $this->factory->createNamed('name', ChoiceType::class, '&a', [
@@ -1027,6 +1042,21 @@ public function testRadioWithValue()
         );
     }
 
+    public function testRadioRowWithHelp()
+    {
+        $form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\RadioType', false);
+        $html = $this->renderRow($form->createView(), ['label' => 'foo', 'help' => 'really helpful text']);
+
+        $this->assertMatchesXpath($html,
+'/div
+    [@class="form-group"]
+    [
+        ./small[text() = "[trans]really helpful text[/trans]"]
+    ]
+'
+        );
+    }
+
     public function testButtonAttributeNameRepeatedIfTrue()
     {
         $form = $this->factory->createNamed('button', ButtonType::class, null, [