Merge branch '2.2' into 2.3

* 2.2:
  fixed CS
  Fixed the error handling when decoding invalid XML to avoid a Warning
  [Form] Fixed: The "data" option is taken into account even if it is NULL
  [DomCrawler] [HttpFoundation] Make `Content-Type` attributes identification case-insensitive

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FormType.php

Author: fabpot

Extension/Core/Type/FormType.php

@@ -41,6 +41,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         parent::buildForm($builder, $options);
 
+        $isDataOptionSet = array_key_exists('data', $options);
+
         $builder
             ->setRequired($options['required'])
             ->setErrorBubbling($options['error_bubbling'])
@@ -50,8 +52,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->setByReference($options['by_reference'])
             ->setInheritData($options['inherit_data'])
             ->setCompound($options['compound'])
-            ->setData(isset($options['data']) ? $options['data'] : null)
-            ->setDataLocked(isset($options['data']))
+            ->setData($isDataOptionSet ? $options['data'] : null)
+            ->setDataLocked($isDataOptionSet)
             ->setDataMapper($options['compound'] ? new PropertyPathMapper($this->propertyAccessor) : null)
             ->setMethod($options['method'])
             ->setAction($options['action'])

Tests/Extension/Core/ChoiceList/AbstractChoiceListTest.php

@@ -257,14 +257,12 @@ public function testGetValuesForChoices()
         $this->assertSame(array($this->value1, $this->value2), $this->list->getValuesForChoices($choices));
     }
 
-
     public function testGetValuesForChoicesPreservesKeys()
     {
         $choices = array(5 => $this->choice1, 8 => $this->choice2);
         $this->assertSame(array(5 => $this->value1, 8 => $this->value2), $this->list->getValuesForChoices($choices));
     }
 
-
     public function testGetValuesForChoicesPreservesOrder()
     {
         $choices = array($this->choice2, $this->choice1);

Tests/Extension/Core/Type/FormTypeTest.php

@@ -546,6 +546,18 @@ public function testDataOptionSupersedesSetDataCalls()
         $this->assertSame('default', $form->getData());
     }
 
+    public function testDataOptionSupersedesSetDataCallsIfNull()
+    {
+        $form = $this->factory->create('form', null, array(
+            'data' => null,
+            'compound' => false,
+        ));
+
+        $form->setData('foobar');
+
+        $this->assertNull($form->getData());
+    }
+
     public function testNormDataIsPassedToView()
     {
         $view = $this->factory->createBuilder('form')