symfony
diff --git a/‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig‎
Lines changed: 12 additions & 13 deletions b/‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig‎
Lines changed: 12 additions & 13 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig‎
Lines changed: 17 additions & 15 deletions b/‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig‎
Lines changed: 17 additions & 15 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig‎
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php‎
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget.html.php‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_empty.html.php‎
Lines changed: 0 additions & 10 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_empty.html.php‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/empty_row.html.php‎
Lines changed: 7 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/empty_row.html.php‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php‎
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/empty_row.html.php‎
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Resources/views/FormTable/empty_row.html.php‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php‎
Lines changed: 13 additions & 9 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php‎
Lines changed: 13 additions & 9 deletions
diff --git a/‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php‎
Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php‎
Lines changed: 12 additions & 0 deletions
@@ -114,19 +114,6 @@
     {%- endif %}
 {%- endblock choice_widget_expanded %}
 
-{% block choice_widget_empty -%}
-    {%- if empty_choices is empty %}
-        {%- set empty_choices = 'No choice available' %}
-        {%- set choice_translation_domain = 'sf_form' %}
-    {%- endif -%}
-    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %}
-    <div {{ block('widget_container_attributes') }}>
-        <p>
-            {{- choice_translation_domain is same as(false) ? empty_choices : empty_choices|trans({}, choice_translation_domain) -}}
-        </p>
-    </div>
-{%- endblock %}
-
 {% block checkbox_widget -%}
     {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
     {% if 'checkbox-inline' in parent_label_class %}
@@ -245,6 +232,18 @@
     </div>
 {%- endblock radio_row %}
 
+{# Support #}
+
+{% block empty_row -%}
+    {%- set translation_domain = translation_domain ?: 'sf_form' -%}
+    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) %}
+    <div {{ block('widget_container_attributes') }}>
+        <p>
+            {{- translation_domain is same as(false) ? empty_view : empty_view|trans({}, translation_domain) -}}
+        </p>
+    </div>
+{%- endblock empty_row %}
+
 {# Errors #}
 
 {% block form_errors -%}
 
@@ -2,7 +2,12 @@
 
 {%- block form_widget -%}
     {% if compound %}
-        {{- block('form_widget_compound') -}}
+        {%- if empty_view %}
+            {{- block('empty_row') -}}
+            {{ form_rest(form) }}
+        {%- else -%}
+            {{- block('form_widget_compound') -}}
+        {%- endif -%}
     {% else %}
         {{- block('form_widget_simple') -}}
     {% endif %}
@@ -35,15 +40,15 @@
 {%- endblock textarea_widget -%}
 
 {%- block choice_widget -%}
-    {% if choices is not empty or preferred_choices is not empty -%}
+    {%- if empty_view is defined and empty_view -%}
+        {{- block('empty_row') -}}
+    {%- else -%}
         {%- if expanded -%}
             {{- block('choice_widget_expanded') -}}
         {%- else -%}
             {{- block('choice_widget_collapsed') -}}
         {%- endif -%}
-    {%- elseif empty_choices is defined -%}
-        {{- block('choice_widget_empty') -}}
-    {% endif %}
+    {%- endif -%}
 {%- endblock choice_widget -%}
 
 {%- block choice_widget_expanded -%}
@@ -75,16 +80,6 @@
     </select>
 {%- endblock choice_widget_collapsed -%}
 
-{%- block choice_widget_empty -%}
-    {%- if empty_choices is empty -%}
-        {%- set empty_choices = 'No choice available' -%}
-        {%- set choice_translation_domain = 'sf_form' -%}
-    {%- endif -%}
-    <div {{ block('widget_container_attributes') }}>
-        {{- choice_translation_domain is same as(false) ? empty_choices : empty_choices|trans({}, choice_translation_domain) -}}
-    </div>
-{%- endblock choice_widget_empty -%}
-
 {%- block choice_widget_options -%}
     {% for group_label, choice in options %}
         {%- if choice is iterable -%}
@@ -327,6 +322,13 @@
     {% endfor %}
 {%- endblock form_rows -%}
 
+{%- block empty_row -%}
+    {%- set translation_domain = translation_domain ?: 'sf_form' -%}
+    <div {{ block('widget_container_attributes') }}>
+        {{- translation_domain is same as(false) ? empty_view : empty_view|trans({}, translation_domain) -}}
+    </div>
+{%- endblock empty_row -%}
+
 {%- block widget_attributes -%}
     id="{{ id }}" name="{{ full_name }}"
     {%- if disabled %} disabled="disabled"{% endif -%}
 
@@ -42,3 +42,14 @@
         {{- form_rest(form) -}}
     </table>
 {%- endblock form_widget_compound -%}
+
+{%- block empty_row -%}
+    {%- set translation_domain = translation_domain ?: 'sf_form' -%}
+    <table {{ block('widget_container_attributes') }}>
+        <tr>
+            <td colspan="2">
+                {{ translation_domain is same as(false) ? empty_view : empty_view|trans({}, translation_domain) }}
+            </td>
+        </tr>
+    </table>
+{%- endblock empty_row -%}
@@ -1,9 +1,9 @@
-<?php if (0 < count($choices) || 0 < count($preferred_choices)): ?>
+<?php if (isset($empty_view)  && $empty_view): ?>
+    <?php echo $view['form']->block($form, 'empty_row')?>
+<?php else: ?>
     <?php if ($expanded): ?>
         <?php echo $view['form']->block($form, 'choice_widget_expanded') ?>
     <?php else: ?>
         <?php echo $view['form']->block($form, 'choice_widget_collapsed') ?>
     <?php endif ?>
-<?php elseif (isset($empty_choices)): ?>
-    <?php echo $view['form']->block($form, 'choice_widget_empty'); ?>
 <?php endif ?>
@@ -0,0 +1,7 @@
+<?php $translation_domain = $translation_domain ?: 'sf_form'; ?>
+<div <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
+    <?php echo $view->escape(false !== $translation_domain
+        ? $view['translator']->trans($empty_view, array(), $translation_domain)
+        : $empty_view
+    ); ?>
+</div>
@@ -1,5 +1,10 @@
 <?php if ($compound): ?>
-<?php echo $view['form']->block($form, 'form_widget_compound')?>
+    <?php if (isset($empty_view)  && $empty_view): ?>
+        <?php echo $view['form']->block($form, 'empty_row')?>
+        <?php echo $view['form']->rest($form) ?>
+    <?php else: ?>
+        <?php echo $view['form']->block($form, 'form_widget_compound')?>
+    <?php endif ?>
 <?php else: ?>
 <?php echo $view['form']->block($form, 'form_widget_simple')?>
 <?php endif ?>
@@ -0,0 +1,11 @@
+<?php $translation_domain = $translation_domain ?: 'sf_form'; ?>
+<table <?php echo $view['form']->block($form, 'widget_container_attributes') ?>>
+    <tr>
+        <td colspan="2">
+            <?php echo $view->escape(false !== $translation_domain
+                ? $view['translator']->trans($empty_view, array(), $translation_domain)
+                : $empty_view
+            ); ?>
+        </td>
+    </tr>
+</table>
@@ -224,13 +224,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             // POST request.
             $view->vars['full_name'] .= '[]';
         }
-
-        // If choices are empty set an alternative string which defaults to "null" casted to an empty string.
-        // It should be handled in the layout and is translated with "choice_translation_domain" if any.
-        // In default form themes it results with the string "<em>No choice available</em>".
-        if (array() === $view->vars['choices'] && array() === $view->vars['preferred_choices']) {
-            $view->vars['empty_choices'] = (string) $options['empty_choices'];
-        }
     }
 
     /**
@@ -251,6 +244,18 @@ public function finishView(FormView $view, FormInterface $form, array $options)
                 $childView->vars['full_name'] = $childName;
             }
         }
+
+        // We have to override parent {@link FormType} condition of the empty_view option here,
+        // even if there is no choices the field view may not be empty because:
+        //
+        //  - a select input is not "compound" but should be considered as any empty HTML tag,
+        //
+        //  - when expanded it could hold a placeholder which has been counted as a children,
+        //    we should ignore it in any case since its role is to be a "null" alternative to
+        //    choices, not a choice itself. Think of "Choose something" with no choices.
+        if (array() === $view->vars['choices'] && array() === $view->vars['preferred_choices']) {
+            $view->vars['empty_view'] = $options['empty_view'];
+        }
     }
 
     /**
@@ -330,7 +335,7 @@ public function configureOptions(OptionsResolver $resolver)
             'preferred_choices' => array(),
             'group_by' => null,
             'empty_data' => $emptyData,
-            'empty_choices' => null,
+            'empty_view' => 'No choice available',
             'placeholder' => $placeholderDefault,
             'error_bubbling' => false,
             'compound' => $compound,
@@ -346,7 +351,6 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setNormalizer('choices_as_values', $choicesAsValuesNormalizer);
 
         $resolver->setAllowedTypes('choices', array('null', 'array', '\Traversable'));
-        $resolver->setAllowedTypes('empty_choices', array('null', 'string'));
         $resolver->setAllowedTypes('choice_translation_domain', array('null', 'bool', 'string'));
         $resolver->setAllowedTypes('choice_loader', array('null', 'Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface'));
         $resolver->setAllowedTypes('choice_label', array('null', 'bool', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath'));
 
@@ -113,6 +113,10 @@ public function finishView(FormView $view, FormInterface $form, array $options)
         }
 
         $view->vars['multipart'] = $multipart;
+
+        if ($form->getConfig()->getCompound()) {
+            $view->vars['empty_view'] = (bool) $view->count() ? false : $options['empty_view'];
+        }
     }
 
     /**
@@ -142,6 +146,12 @@ public function configureOptions(OptionsResolver $resolver)
             };
         };
 
+        // For any compound form which has no children, show some text
+        // instead of an empty HTML tag by default
+        $emptyView = function (Options $options) {
+            return $options['compound'] ? 'No fields' : false;
+        };
+
         // For any form that is not represented by a single HTML control,
         // errors should bubble up by default
         $errorBubbling = function (Options $options) {
@@ -157,6 +167,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefaults(array(
             'data_class' => $dataClass,
             'empty_data' => $emptyData,
+            'empty_view' => $emptyView,
             'trim' => true,
             'required' => true,
             'property_path' => null,
@@ -175,6 +186,7 @@ public function configureOptions(OptionsResolver $resolver)
         ));
 
         $resolver->setAllowedTypes('label_attr', 'array');
+        $resolver->setAllowedTypes('empty_view', array('null', 'string', 'bool'));
     }
 
     /**