symfony
diff --git a/‎src/Symfony/Component/Form/Form.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Form.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/Form.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Form.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/CompoundFormTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/CompoundFormTest.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/CompoundFormTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/CompoundFormTest.php
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+5-1Lines changed: 5 additions & 1 deletion
@@ -547,7 +547,7 @@ public function submit($submittedData, $clearMissing = true)
                 $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')) {
+        } elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->getOption('multiple', false)) {
             $submittedData = null;
             $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
         }
 
@@ -1057,7 +1057,8 @@ public function testArrayTransformationFailureOnSubmit()
         $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(['bar'], $this->form->get('bar')->getData());
+        $this->assertNull($this->form->get('bar')->getData());
+        $this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('bar')->getTransformationFailure()->getMessage());
     }
 
     public function testFileUpload()
 
@@ -1918,7 +1918,11 @@ public function testSubmitInvalidNestedValue($multiple, $expanded, $submissionDa
 
         $form->submit($submissionData);
         $this->assertFalse($form->isSynchronized());
-        $this->assertEquals('All choices submitted must be NULL, strings or ints.', $form->getTransformationFailure()->getMessage());
+        if (!$multiple && !$expanded) {
+            $this->assertEquals('Submitted data was expected to be text or number, array given.', $form->getTransformationFailure()->getMessage());
+        } else {
+            $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
`@@ -547,7 +547,7 @@ public function submit($submittedData, $clearMissing = true)`
`547`	`547`	`$submittedData = null;`
`548`	`548`	`$this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, file upload given.');`
`549`	`549`	`}`
`550`		`- } elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->hasOption('multiple')) {`
	`550`	`+ } elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->getOption('multiple', false)) {`
`551`	`551`	`$submittedData = null;`
`552`	`552`	`$this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');`
`553`	`553`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1057,7 +1057,8 @@ public function testArrayTransformationFailureOnSubmit()`
`1057`	`1057`	`$this->assertNull($this->form->get('foo')->getData());`
`1058`	`1058`	`$this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('foo')->getTransformationFailure()->getMessage());`
`1059`	`1059`
`1060`		`- $this->assertSame(['bar'], $this->form->get('bar')->getData());`
	`1060`	`+ $this->assertNull($this->form->get('bar')->getData());`
	`1061`	`+ $this->assertSame('Submitted data was expected to be text or number, array given.', $this->form->get('bar')->getTransformationFailure()->getMessage());`
`1061`	`1062`	`}`
`1062`	`1063`
`1063`	`1064`	`public function testFileUpload()`