weaken the rejection of submitted array data

xabbuh · xabbuh · commit d51aea365b70 · 2019-01-16T23:09:24.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -1521,4 +1521,18 @@ public function testSubmitNullMultipleUsesDefaultEmptyData()
         $this->assertEquals($collection, $form->getNormData());
         $this->assertEquals($collection, $form->getData());
     }
+
+    public function testSubmitArray()
+    {
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $this->persist([$entity1]);
+
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'em' => 'default',
+            'class' => self::SINGLE_IDENT_CLASS,
+        ]);
+        $form->submit([]);
+
+        $this->assertFalse($form->isSynchronized());
+    }
 }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -59,6 +59,7 @@ public function configureOptions(OptionsResolver $resolver)
             'value' => '1',
             'empty_data' => $emptyData,
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -328,6 +328,8 @@ public function configureOptions(OptionsResolver $resolver)
             'placeholder' => $placeholderDefault,
             'error_bubbling' => false,
             'compound' => $compound,
+            // submitted arrays are dealt with in data transformers
+            'accept_multiple_values' => true,
             // The view data is always a string, even if the "data" option
             // is manually set to an object.
             // See https://github.com/symfony/symfony/pull/5582
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php
@@ -12,9 +12,18 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ColorType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('accept_multiple_values', false);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateIntervalType.php
@@ -233,6 +233,9 @@ public function configureOptions(OptionsResolver $resolver)
                 // this option.
                 'data_class' => null,
                 'compound' => $compound,
+                'accept_multiple_values' => function (Options $options) {
+                    return $options['compound'];
+                },
                 'empty_data' => $emptyData,
                 'labels' => [],
             ]
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -235,6 +235,9 @@ public function configureOptions(OptionsResolver $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
+            'accept_multiple_values' => function (Options $options) {
+                return $options['compound'];
+            },
             'empty_data' => function (Options $options) {
                 return $options['compound'] ? [] : '';
             },
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -276,6 +276,9 @@ public function configureOptions(OptionsResolver $resolver)
             // this option.
             'data_class' => null,
             'compound' => $compound,
+            'accept_multiple_values' => function (Options $options) {
+                return $options['compound'];
+            },
             'empty_data' => function (Options $options) {
                 return $options['compound'] ? [] : '';
             },
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
@@ -12,9 +12,18 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class EmailType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('accept_multiple_values', false);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -105,6 +105,8 @@ public function configureOptions(OptionsResolver $resolver)
             'data_class' => $dataClass,
             'empty_data' => $emptyData,
             'multiple' => false,
+            // invalid submitted arrays will be detected when the submitted data are processed by the type
+            'accept_multiple_values' => true,
             'allow_file_upload' => true,
         ]);
     }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -179,10 +179,18 @@ public function configureOptions(OptionsResolver $resolver)
             'post_max_size_message' => 'The uploaded file was too large. Please try to upload a smaller file.',
             'upload_max_size_message' => $uploadMaxSizeMessage, // internal
             'allow_file_upload' => false,
+            'accept_multiple_values' => function (Options $options) {
+                if ($options['compound']) {
+                    return true;
+                }
+
+                return null;
+            },
         ]);
 
         $resolver->setAllowedTypes('label_attr', 'array');
         $resolver->setAllowedTypes('upload_max_size_message', ['callable']);
+        $resolver->setAllowedTypes('accept_multiple_values', ['bool', 'null']);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php b/src/Symfony/Component/Form/Extension/Core/Type/HiddenType.php
@@ -27,6 +27,7 @@ public function configureOptions(OptionsResolver $resolver)
             // Pass errors to the parent
             'error_bubbling' => true,
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
@@ -43,6 +43,7 @@ public function configureOptions(OptionsResolver $resolver)
             // Integer cast rounds towards 0, so do the same when displaying fractions
             'rounding_mode' => IntegerToLocalizedStringTransformer::ROUND_DOWN,
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
 
         $resolver->setAllowedValues('rounding_mode', [
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -56,6 +56,7 @@ public function configureOptions(OptionsResolver $resolver)
             'divisor' => 1,
             'currency' => 'EUR',
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
 
         $resolver->setAllowedTypes('scale', 'int');
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -41,6 +41,7 @@ public function configureOptions(OptionsResolver $resolver)
             'grouping' => false,
             'rounding_mode' => NumberToLocalizedStringTransformer::ROUND_HALF_UP,
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
 
         $resolver->setAllowedValues('rounding_mode', [
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
@@ -35,6 +35,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'always_empty' => true,
+            'accept_multiple_values' => false,
             'trim' => false,
         ]);
     }
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php b/src/Symfony/Component/Form/Extension/Core/Type/PercentType.php
@@ -35,6 +35,7 @@ public function configureOptions(OptionsResolver $resolver)
             'scale' => 0,
             'type' => 'fractional',
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
 
         $resolver->setAllowedValues('type', [
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php b/src/Symfony/Component/Form/Extension/Core/Type/RangeType.php
@@ -12,9 +12,18 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class RangeType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('accept_multiple_values', false);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
@@ -12,9 +12,18 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SearchType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('accept_multiple_values', false);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
@@ -12,9 +12,18 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TelType extends AbstractType
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('accept_multiple_values', false);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php
@@ -37,6 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
             'compound' => false,
+            'accept_multiple_values' => false,
         ]);
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TextareaType extends AbstractType
 {
@@ -25,6 +26,14 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['pattern'] = null;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('accept_multiple_values', false);
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -273,6 +273,9 @@ public function configureOptions(OptionsResolver $resolver)
                 return $options['compound'] ? [] : '';
             },
             'compound' => $compound,
+            'accept_multiple_values' => function (Options $options) {
+                return $options['compound'];
+            },
             'choice_translation_domain' => false,
         ]);
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php b/src/Symfony/Component/Form/Extension/Core/Type/UrlType.php
@@ -34,6 +34,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('default_protocol', 'http');
+        $resolver->setDefault('accept_multiple_values', false);
 
         $resolver->setAllowedTypes('default_protocol', ['null', 'string']);
     }
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -535,7 +535,7 @@ public function submit($submittedData, $clearMissing = true)
         } 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')) {
+        } elseif (\is_array($submittedData) && !$this->config->getCompound() && false === $this->config->getOption('accept_multiple_values', null)) {
             $submittedData = null;
             $this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
         }
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -1036,20 +1036,38 @@ public function testDisabledButtonIsNotSubmitted()
         $this->assertFalse($submit->isSubmitted());
     }
 
-    public function testArrayTransformationFailureOnSubmit()
+    public function testArrayTransformationFailureOnSubmitWhenMultipleValuesNotAccepted()
     {
-        $this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
-        $this->form->add($this->getBuilder('bar', null, null, ['multiple' => false])->setCompound(false)->getForm());
+        $this->form->add($this->getBuilder('foo', null, null, ['accept_multiple_values' => false])->getForm());
 
         $this->form->submit([
             'foo' => ['foo'],
-            'bar' => ['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());
+    }
+
+    public function testArrayDataIsAllowedWhenFormIsCompound()
+    {
+        $this->form->add($this->getBuilder('foo', null, null, ['compound' => true])->getForm());
+
+        $this->form->submit([
+            'foo' => ['foo'],
+        ]);
+
+        $this->assertSame(['foo'], $this->form->get('foo')->getData());
+    }
+
+    public function testArrayDataIsAllowedWhenNotExplicitlyForbidden()
+    {
+        $this->form->add($this->getBuilder('foo')->getForm());
+
+        $this->form->submit([
+            'foo' => ['foo'],
+        ]);
 
-        $this->assertSame(['bar'], $this->form->get('bar')->getData());
+        $this->assertSame(['foo'], $this->form->get('foo')->getData());
     }
 
     public function testFileUpload()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
@@ -167,6 +167,14 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect
         $this->assertSame($expectedData, $form->getData());
     }
 
+    public function testSubmitArray()
+    {
+        $form = $this->factory->create($this->getTestedType());
+        $form->submit([]);
+
+        $this->assertSame($form->getConfig()->getOption('accept_multiple_values'), $form->isSynchronized());
+    }
+
     protected function getTestedType()
     {
         return static::TESTED_TYPE;
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
@@ -34,4 +34,9 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect
     {
         parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
     }
+
+    public function testSubmitArray()
+    {
+        $this->markTestSkipped();
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -190,4 +190,9 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expect
         $this->assertSame($expectedData, $form->getNormData());
         $this->assertSame($expectedData, $form->getData());
     }
+
+    protected function supportsMultipleValues()
+    {
+        return false;
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -2053,4 +2053,12 @@ public function provideTrimCases()
             'Multiple expanded' => [true, true],
         ];
     }
+
+    public function testSubmitArray()
+    {
+        $form = $this->factory->create($this->getTestedType());
+        $form->submit([]);
+
+        $this->assertFalse($form->isSynchronized());
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -69,4 +69,12 @@ public function testInvalidChoiceValuesAreDropped()
 
         $this->assertSame([], $type->loadChoicesForValues(['foo']));
     }
+
+    public function testSubmitArray()
+    {
+        $form = $this->factory->create($this->getTestedType());
+        $form->submit([]);
+
+        $this->assertFalse($form->isSynchronized());
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/SubmitTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/SubmitTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.json b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.json
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.txt

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public function configureOptions(OptionsResolver $resolver)`
`59`	`59`	`'value' => '1',`
`60`	`60`	`'empty_data' => $emptyData,`
`61`	`61`	`'compound' => false,`
	`62`	`+ 'accept_multiple_values' => false,`
`62`	`63`	`]);`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ public function configureOptions(OptionsResolver $resolver)`
`105`	`105`	`'data_class' => $dataClass,`
`106`	`106`	`'empty_data' => $emptyData,`
`107`	`107`	`'multiple' => false,`
	`108`	`+ // invalid submitted arrays will be detected when the submitted data are processed by the type`
	`109`	`+ 'accept_multiple_values' => true,`
`108`	`110`	`'allow_file_upload' => true,`
`109`	`111`	`]);`
`110`	`112`	`}`