From d723756331caffe12526a2edbcadca74a0e94a46 Mon Sep 17 00:00:00 2001
From: Mathieu Piot <math.piot@gmail.com>
Date: Fri, 23 Mar 2018 10:14:41 +0100
Subject: [PATCH] Fix some mistakes

---
 .../bootstrap_3_horizontal_layout.html.twig   | 20 ++++++++---------
 .../views/Form/bootstrap_3_layout.html.twig   |  8 ++++++-
 .../bootstrap_4_horizontal_layout.html.twig   | 22 +++++++++----------
 .../views/Form/bootstrap_4_layout.html.twig   |  8 ++++++-
 .../views/Form/form_div_layout.html.twig      |  8 ++++++-
 .../Resources/views/Form/form_row.html.php    |  4 ++--
 .../views/Form/widget_attributes.html.php     |  6 ++---
 .../views/FormTable/form_row.html.php         |  4 ++--
 .../Form/Extension/Core/Type/FormType.php     |  2 +-
 9 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
index b082d9236b..332d97e4a7 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_horizontal_layout.html.twig
@@ -34,24 +34,24 @@ col-sm-2
             {{- form_help(form) -}}
             {{- form_errors(form) -}}
         </div>
-{##}</div>
+    </div>
 {%- endblock form_row %}
 
 {% block submit_row -%}
-    <div class="form-group">{#--#}
-        <div class="{{ block('form_label_class') }}"></div>{#--#}
+    <div class="form-group">
+        <div class="{{ block('form_label_class') }}"></div>
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
-        </div>{#--#}
+        </div>
     </div>
 {%- endblock submit_row %}
 
 {% block reset_row -%}
-    <div class="form-group">{#--#}
-        <div class="{{ block('form_label_class') }}"></div>{#--#}
+    <div class="form-group">
+        <div class="{{ block('form_label_class') }}"></div>
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
-        </div>{#--#}
+        </div>
     </div>
 {%- endblock reset_row %}
 
@@ -60,11 +60,11 @@ col-sm-10
 {%- endblock form_group_class %}
 
 {% block checkbox_row -%}
-    <div class="form-group{% if not valid %} has-error{% endif %}">{#--#}
-        <div class="{{ block('form_label_class') }}"></div>{#--#}
+    <div class="form-group{% if not valid %} has-error{% endif %}">
+        <div class="{{ block('form_label_class') }}"></div>
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
             {{- form_errors(form) -}}
-        </div>{#--#}
+        </div>
     </div>
 {%- endblock checkbox_row %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
index 3d3627853c..f8d230d5fa 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -159,6 +159,12 @@
 
 {% block form_help -%}
     {%- if help is not empty -%}
-        <span id="{{ id }}_help" class="help-block">{{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }}</span>
+        <span id="{{ id }}_help" class="help-block">
+            {%- if translation_domain is same as(false) -%}
+                {{- help -}}
+            {%- else -%}
+                {{- help|trans({}, translation_domain) -}}
+            {%- endif -%}
+        </span>
     {%- endif -%}
 {%- endblock form_help %}
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 ca40981ec8..1ae9e9fa25 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
@@ -34,7 +34,7 @@ col-sm-2
                 {{- form_widget(form, widget_attr) -}}
                 {{- form_help(form) -}}
             </div>
-    {##}</div>
+        </div>
     {%- endif -%}
 {%- endblock form_row %}
 
@@ -51,24 +51,24 @@ col-sm-2
                 {{- form_help(form) -}}
             </div>
         </div>
-{##}</fieldset>
+    </fieldset>
 {%- endblock fieldset_form_row %}
 
 {% block submit_row -%}
-    <div class="form-group row">{#--#}
-        <div class="{{ block('form_label_class') }}"></div>{#--#}
+    <div class="form-group row">
+        <div class="{{ block('form_label_class') }}"></div>
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
-        </div>{#--#}
+        </div>
     </div>
 {%- endblock submit_row %}
 
 {% block reset_row -%}
-    <div class="form-group row">{#--#}
-        <div class="{{ block('form_label_class') }}"></div>{#--#}
+    <div class="form-group row">
+        <div class="{{ block('form_label_class') }}"></div>
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
-        </div>{#--#}
+        </div>
     </div>
 {%- endblock reset_row %}
 
@@ -77,11 +77,11 @@ col-sm-10
 {%- endblock form_group_class %}
 
 {% block checkbox_row -%}
-    <div class="form-group row">{#--#}
-        <div class="{{ block('form_label_class') }}"></div>{#--#}
+    <div class="form-group row">
+        <div class="{{ block('form_label_class') }}"></div>
         <div class="{{ block('form_group_class') }}">
             {{- form_widget(form) -}}
             {{- form_errors(form) -}}
-        </div>{#--#}
+        </div>
     </div>
 {%- endblock checkbox_row %}
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
index 51db619446..b8aa6b8cd1 100644
--- 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
@@ -286,6 +286,12 @@
 
 {% block form_help -%}
     {%- if help is not empty -%}
-        <small id="{{ id }}_help" class="form-text text-muted">{{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }}</small>
+        <small id="{{ id }}_help" class="form-text text-muted">
+            {%- if translation_domain is same as(false) -%}
+                {{- help -}}
+            {%- else -%}
+                {{- help|trans({}, translation_domain) -}}
+            {%- endif -%}
+        </small>
     {%- endif -%}
 {%- endblock form_help %}
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
index 739ccb2b84..11d5783dd5 100644
--- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -291,7 +291,13 @@
 
 {% block form_help -%}
     {%- if help is not empty -%}
-        <p id="{{ id }}_help" class="help-text">{{ translation_domain is same as(false) ? help : help|trans({}, translation_domain) }}</p>
+        <p id="{{ id }}_help" class="help-text">
+            {%- if translation_domain is same as(false) -%}
+                {{- help -}}
+            {%- else -%}
+                {{- help|trans({}, translation_domain) -}}
+            {%- endif -%}
+        </p>
     {%- endif -%}
 {%- endblock form_help %}
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_row.html.php
index 8491460398..ba81f45b5d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_row.html.php
@@ -1,7 +1,7 @@
 <div>
-    <?php $widgetAtt = empty($help) ? array() : array('attr' => array('aria-describedby' => $id.'_help')); ?>
+    <?php $widgetAttr = empty($help) ? array() : array('attr' => array('aria-describedby' => $id.'_help')); ?>
     <?php echo $view['form']->label($form); ?>
     <?php echo $view['form']->errors($form); ?>
-    <?php echo $view['form']->widget($form, $widgetAtt); ?>
+    <?php echo $view['form']->widget($form, $widgetAttr); ?>
     <?php echo $view['form']->help($form); ?>
 </div>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
index a2c87e3f12..1626a9cc63 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/widget_attributes.html.php
@@ -1,3 +1,3 @@
-id="<?php echo $view->escape($id); ?>" name="<?php echo $view->escape($full_name); ?>"<?php if ($disabled): ?> disabled="disabled"<?php endif; ?>
-<?php if ($required): ?> required="required"<?php endif; ?>
-<?php echo $attr ? ' '.$view['form']->block($form, 'attributes') : ''; ?>
\ No newline at end of file
+id="<?php echo $view->escape($id) ?>" name="<?php echo $view->escape($full_name) ?>"<?php if ($disabled): ?> disabled="disabled"<?php endif ?>
+<?php if ($required): ?> required="required"<?php endif ?>
+<?php echo $attr ? ' '.$view['form']->block($form, 'attributes') : '' ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
index 4a60c9081d..71d606c3d4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/form_row.html.php
@@ -1,11 +1,11 @@
 <tr>
-    <?php $widgetAtt = empty($help) ? array() : array('attr' => array('aria-describedby' => $id.'_help')); ?>
+    <?php $widgetAttr = empty($help) ? array() : array('attr' => array('aria-describedby' => $id.'_help')); ?>
     <td>
         <?php echo $view['form']->label($form); ?>
     </td>
     <td>
         <?php echo $view['form']->errors($form); ?>
-        <?php echo $view['form']->widget($form, $widgetAtt); ?>
+        <?php echo $view['form']->widget($form, $widgetAttr); ?>
         <?php echo $view['form']->help($form); ?>
     </td>
 </tr>
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 755e75f891..3f671d8216 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -184,7 +184,7 @@ class FormType extends BaseType
 
         $resolver->setAllowedTypes('label_attr', 'array');
         $resolver->setAllowedTypes('upload_max_size_message', array('callable'));
-        $resolver->setAllowedTypes('help', array('string', 'NULL'));
+        $resolver->setAllowedTypes('help', array('string', 'null'));
     }
 
     /**