Fixed bug that incorrectly causes the "required" attribute to be omitted from select even though it contains the "multiple" attribute

Nick Stemerdink · fabpot · commit f9aa67672f6f · 2014-03-19T14:36:02.000+01:00
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
@@ -67,7 +67,7 @@
 
 {% block choice_widget_collapsed %}
 {% spaceless %}
-    {% if required and empty_value is none and not empty_value_in_choices %}
+    {% if required and empty_value is none and not empty_value_in_choices and not multiple %}
         {% set required = false %}
     {% endif %}
     <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
@@ -1,6 +1,9 @@
 <select
+    <?php if ($required && $empty_value === null && $empty_value_in_choices === false && $multiple === false):
+        $required = false;
+    endif; ?>
     <?php echo $view['form']->block($form, 'widget_attributes', array(
-        'required' => $required && (null !== $empty_value || $empty_value_in_choices)
+        'required' => $required
     )) ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -636,13 +636,15 @@ public function testMultipleChoice()
     {
         $form = $this->factory->createNamed('name', 'choice', array('&a'), array(
             'choices' => array('&a' => 'Choice&A', '&b' => 'Choice&B'),
+            'required' => true,
             'multiple' => true,
             'expanded' => false,
         ));
 
         $this->assertWidgetMatchesXpath($form->createView(), array(),
 '/select
     [@name="name[]"]
+    [@required="required"]
     [@multiple="multiple"]
     [
         ./option[@value="&a"][@selected="selected"][.="[trans]Choice&A[/trans]"]
