Merge branch '2.7' into 2.8

fabpot · fabpot · commit 3c3703713835 · 2017-03-12T08:18:05.000-07:00
* 2.7:
  [Form] Choice type int values (BC Fix)
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -171,8 +171,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             }
 
             foreach ($data as $v) {
-                if (null !== $v && !is_string($v)) {
-                    throw new TransformationFailedException('All choices submitted must be NULL or strings.');
+                if (null !== $v && !is_string($v) && !is_int($v)) {
+                    throw new TransformationFailedException('All choices submitted must be NULL, strings or ints.');
                 }
             }
         }, 256);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -1698,6 +1698,19 @@ public function testSubmitMultipleExpandedNumericChoices()
         $this->assertNull($form[4]->getViewData());
     }
 
+    public function testSubmitMultipleChoicesInts()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, array(
+            'multiple' => true,
+            'choices' => array_flip($this->numericChoicesFlipped),
+            'choices_as_values' => true,
+        ));
+
+        $form->submit(array(1, 2));
+
+        $this->assertTrue($form->isSynchronized());
+    }
+
     public function testSingleSelectedObjectChoices()
     {
         $view = $this->factory->create(static::TESTED_TYPE, $this->objectChoices[3], array(
@@ -2315,7 +2328,7 @@ public function testSubmitInvalidNestedValue($multiple, $expanded, $submissionDa
 
         $form->submit($submissionData);
         $this->assertFalse($form->isSynchronized());
-        $this->assertEquals('All choices submitted must be NULL or strings.', $form->getTransformationFailure()->getMessage());
+        $this->assertEquals('All choices submitted must be NULL, strings or ints.', $form->getTransformationFailure()->getMessage());
     }
 
     public function invalidNestedValueTestMatrix()

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`foreach ($data as $v) {`
`174`		`- if (null !== $v && !is_string($v)) {`
`175`		`- throw new TransformationFailedException('All choices submitted must be NULL or strings.');`
	`174`	`+ if (null !== $v && !is_string($v) && !is_int($v)) {`
	`175`	`+ throw new TransformationFailedException('All choices submitted must be NULL, strings or ints.');`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`}, 256);`