[Form] Filter arrays out of scalar form types

nicolas-grekas · nicolas-grekas · commit b7da2a581667 · 2018-11-24T21:27:06.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php b/src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
@@ -129,6 +129,7 @@ public function configureOptions(OptionsResolver $resolver)
             'entry_type' => $entryType,
             'entry_options' => $entryOptions,
             'delete_empty' => false,
+            'multiple' => true,
         ));
 
         $resolver->setNormalizer('type', $typeNormalizer);
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -537,6 +537,9 @@ public function submit($submittedData, $clearMissing = true)
             $submittedData = null;
         } elseif (is_scalar($submittedData)) {
             $submittedData = (string) $submittedData;
+        } 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();
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -93,14 +93,6 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()
         ));
     }
 
-    public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener()
-    {
-        $form = $this->factory->create(static::TESTED_TYPE);
-        $form->submit(array('domain.com', 'www.domain.com'));
-
-        $this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());
-    }
-
     public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, array(
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -248,7 +248,7 @@ public function testDontValidateConstraintsIfNoValidationGroups()
             ->getForm();
 
         // Launch transformer
-        $form->submit(array());
+        $form->submit('foo');
 
         $this->expectNoValidate();
 

Original file line number	Diff line number	Diff line change
`@@ -537,6 +537,9 @@ public function submit($submittedData, $clearMissing = true)`
`537`	`537`	`$submittedData = null;`
`538`	`538`	`} elseif (is_scalar($submittedData)) {`
`539`	`539`	`$submittedData = (string) $submittedData;`
	`540`	`+ } elseif (\is_array($submittedData) && !$this->config->getCompound() && !$this->config->hasOption('multiple')) {`
	`541`	`+ $submittedData = null;`
	`542`	`+ $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');`
`540`	`543`	`}`
`541`	`544`
`542`	`545`	`$dispatcher = $this->config->getEventDispatcher();`
Original file line number	Diff line number	Diff line change
`@@ -93,14 +93,6 @@ public function testThrowExceptionIfDefaultProtocolIsInvalid()`
`93`	`93`	`));`
`94`	`94`	`}`
`95`	`95`
`96`		`- public function testSubmitWithNonStringDataDoesNotBreakTheFixUrlProtocolListener()`
`97`		`- {`
`98`		`- $form = $this->factory->create(static::TESTED_TYPE);`
`99`		`- $form->submit(array('domain.com', 'www.domain.com'));`
`100`		`-`
`101`		`- $this->assertSame(array('domain.com', 'www.domain.com'), $form->getData());`
`102`		`- }`
`103`		`-`
`104`	`96`	`public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = 'http://empty')`
`105`	`97`	`{`
`106`	`98`	`$form = $this->factory->create(static::TESTED_TYPE, null, array(`