[Form] Filter arrays out of scalar form types

symfony · Nov 24, 2018 · b7da2a5 · b7da2a5
1 parent e4a7fd8
commit b7da2a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
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();