Merge branch '3.4' into 4.1

* 3.4:
  [Validator] Added IBAN format for Vatican City State
  filter out invalid Intl values
  [Validator] Fixed grouped composite constraints
  [Form] Filter arrays out of scalar form types

Author: nicolas-grekas

Extension/Core/Type/CountryType.php

@@ -101,11 +101,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/Type/CurrencyType.php

@@ -101,11 +101,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/Type/LanguageType.php

@@ -101,11 +101,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Extension/Core/Type/LocaleType.php

@@ -101,11 +101,6 @@ public function loadChoicesForValues(array $values, $value = null)
             return array();
         }
 
-        // If no callable is set, values are the same as choices
-        if (null === $value) {
-            return $values;
-        }
-
         return $this->loadChoiceList($value)->getChoicesForValues($values);
     }
 

Form.php

@@ -532,11 +532,12 @@ public function submit($submittedData, $clearMissing = true)
             $submittedData = null;
         } elseif (is_scalar($submittedData)) {
             $submittedData = (string) $submittedData;
-        } elseif ($this->config->getOption('allow_file_upload')) {
-            // no-op
-        } elseif ($this->config->getRequestHandler()->isFileUpload($submittedData)) {
+        } elseif (!$this->config->getOption('allow_file_upload') && $this->config->getRequestHandler()->isFileUpload($submittedData)) {
             $submittedData = null;
             $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, file upload given.');
+        } elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->hasOption('multiple')) {
+            $submittedData = null;
+            $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
         }
 
         $dispatcher = $this->config->getEventDispatcher();

Tests/CompoundFormTest.php

@@ -1039,6 +1039,22 @@ public function testDisabledButtonIsNotSubmitted()
         $this->assertFalse($submit->isSubmitted());
     }
 
+    public function testArrayTransformationFailureOnSubmit()
+    {
+        $this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
+        $this->form->add($this->getBuilder('bar', null, null, array('multiple' => false))->setCompound(false)->getForm());
+
+        $this->form->submit(array(
+            'foo' => array('foo'),
+            'bar' => array('bar'),
+        ));
+
+        $this->assertNull($this->form->get('foo')->getData());
+        $this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('foo')->getTransformationFailure()->getMessage());
+
+        $this->assertSame(array('bar'), $this->form->get('bar')->getData());
+    }
+
     public function testFileUpload()
     {
         $reqHandler = new HttpFoundationRequestHandler();

Tests/Extension/Core/Type/CountryTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\CountryType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class CountryTypeTest extends BaseTypeTest
@@ -80,4 +81,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'FR', $expectedD
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new CountryType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/CurrencyTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class CurrencyTypeTest extends BaseTypeTest
@@ -61,4 +62,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'EUR', $expected
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new CurrencyType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/LanguageTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class LanguageTypeTest extends BaseTypeTest
@@ -73,4 +74,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'en', $expectedD
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new LanguageType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }

Tests/Extension/Core/Type/LocaleTypeTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
+use Symfony\Component\Form\Extension\Core\Type\LocaleType;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
 class LocaleTypeTest extends BaseTypeTest
@@ -61,4 +62,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'en', $expectedD
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testInvalidChoiceValuesAreDropped()
+    {
+        $type = new LocaleType();
+
+        $this->assertSame(array(), $type->loadChoicesForValues(array('foo')));
+    }
 }