Merge branch '2.7' into 2.8

* 2.7:
  Require symfony/intl ~2.4 when Locale::setDefault() is used
  [Form][2.7][ Choice type] fixed groups with empty array.

Conflicts:
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json

Author: nicolas-grekas

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -172,6 +172,10 @@ private static function addChoiceView($choice, $value, $label, $keys, &$index, $
     private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
     {
         foreach ($groupBy as $key => $value) {
+            if (null === $value) {
+                continue;
+            }
+
             // Add the contents of groups to new ChoiceGroupView instances
             if (is_array($value)) {
                 $preferredViewsForGroup = array();

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -536,6 +536,7 @@ public function testCreateViewFlatGroupByOriginalStructure()
         $list = new ArrayChoiceList(array(
             'Group 1' => array('A' => $this->obj1, 'B' => $this->obj2),
             'Group 2' => array('C' => $this->obj3, 'D' => $this->obj4),
+            'Group empty' => array(),
         ));
 
         $view = $this->factory->createView(

composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/event-dispatcher": "~2.1|~3.0.0",
-        "symfony/intl": "~2.3|~3.0.0",
+        "symfony/intl": "~2.4|~3.0.0",
         "symfony/options-resolver": "~2.6",
         "symfony/property-access": "~2.3|~3.0.0"
     },