Add a data_help method in Form

Mathieu Piot · mpiot · commit c8914f591e0e · 2018-03-23T15:53:01.000+01:00
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -47,6 +47,7 @@ public function getFunctions()
             new TwigFunction('form_widget', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
             new TwigFunction('form_errors', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
             new TwigFunction('form_label', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
+            new TwigFunction('form_help', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
             new TwigFunction('form_row', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
             new TwigFunction('form_rest', null, array('node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => array('html'))),
             new TwigFunction('form', null, array('node_class' => 'Symfony\Bridge\Twig\Node\RenderBlockNode', 'is_safe' => array('html'))),
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig
@@ -260,6 +260,7 @@
     <{{ element|default('div') }} class="form-group">
         {{- form_label(form) -}}
         {{- form_widget(form) -}}
+        {{- form_help(form) -}}
     </{{ element|default('div') }}>
 {%- endblock form_row %}
 
@@ -276,3 +277,11 @@
         </span>
     {%- endif %}
 {%- endblock form_errors %}
+
+{# Help #}
+
+{% block form_help -%}
+    {% if form.vars.help is not empty %}
+        <small class="form-text text-muted">{{ form.vars.help|raw }}</small>
+    {% endif %}
+{%- endblock form_help %}
diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -34,6 +34,7 @@ class UndefinedCallableHandler
         'form_widget' => 'form',
         'form_errors' => 'form',
         'form_label' => 'form',
+        'form_help' => 'form',
         'form_row' => 'form',
         'form_rest' => 'form',
         'form' => 'form',
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -89,6 +89,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'required' => $form->isRequired(),
             'size' => null,
             'label_attr' => $options['label_attr'],
+            'help' => $options['help'],
             'compound' => $formConfig->getCompound(),
             'method' => $formConfig->getMethod(),
             'action' => $formConfig->getAction(),
@@ -178,10 +179,12 @@ public function configureOptions(OptionsResolver $resolver)
             'attr' => array(),
             'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
             'upload_max_size_message' => $uploadMaxSizeMessage, // internal
+            'help' => '',
         ));
 
         $resolver->setAllowedTypes('label_attr', 'array');
         $resolver->setAllowedTypes('upload_max_size_message', array('callable'));
+        $resolver->setAllowedTypes('help', 'string');
     }
 
     /**
