Merge branch '2.8' into 3.0

* 2.8:
  [Form] refactor CheckboxListMapper and RadioListMapper
  Revert "[Form] refactor `RadioListMapper::mapDataToForm()`"

Author: fabpot

Tests/Form/Type/EntityTypeTest.php

@@ -274,7 +274,7 @@ public function testSubmitSingleExpandedNull()
         $field->submit(null);
 
         $this->assertNull($field->getData());
-        $this->assertNull($field->getViewData());
+        $this->assertSame('', $field->getViewData(), 'View data is always a string');
     }
 
     public function testSubmitSingleNonExpandedNull()

composer.json

@@ -21,11 +21,19 @@
         "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
+<<<<<<< HEAD
         "symfony/stopwatch": "~2.8|~3.0",
         "symfony/dependency-injection": "~2.8|~3.0",
         "symfony/form": "~3.0",
         "symfony/http-kernel": "~2.8|~3.0",
         "symfony/property-access": "~2.8|~3.0",
+=======
+        "symfony/stopwatch": "~2.2|~3.0.0",
+        "symfony/dependency-injection": "~2.2|~3.0.0",
+        "symfony/form": "~2.8.5|~3.0.5",
+        "symfony/http-kernel": "~2.2|~3.0.0",
+        "symfony/property-access": "~2.3|~3.0.0",
+>>>>>>> 2.8
         "symfony/property-info": "~2.8|3.0",
         "symfony/security": "~2.8|~3.0",
         "symfony/expression-language": "~2.8|~3.0",