[Form][SubmitType] Add "validate" option

fancyweb · fancyweb · commit d5ecb4946fb4 · 2019-09-23T09:57:05.000+02:00
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * The type guesser guesses the HTML accept attribute when a mime type is configured in the File or Image constraint.
  * Overriding the methods `FormIntegrationTestCase::setUp()`, `TypeTestCase::setUp()` and `TypeTestCase::tearDown()` without the `void` return-type is deprecated.
  * marked all dispatched event classes as `@final`
+ * Added the `validate` option to `SubmitType` to toggle the browser built-in form validation.
 
 4.3.0
 -----
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php b/src/Symfony/Component/Form/Extension/Core/Type/SubmitType.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\SubmitButtonTypeInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * A submit button.
@@ -26,6 +27,19 @@ class SubmitType extends AbstractType implements SubmitButtonTypeInterface
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['clicked'] = $form->isClicked();
+
+        if (!$options['validate']) {
+            $view->vars['attr']['formnovalidate'] = true;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefault('validate', true);
+        $resolver->setAllowedTypes('validate', 'bool');
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\SkippedTestError;
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormView;
@@ -2730,4 +2731,38 @@ public function testButtonWithTranslationParameters()
 '
         );
     }
+
+    /**
+     * @dataProvider submitFormNoValidateProvider
+     */
+    public function testSubmitFormNoValidate(bool $attributeIsExpected, bool $validate)
+    {
+        $this->requiresFeatureSet(404);
+
+        $form = $this->factory->create(SubmitType::class, null, [
+            'validate' => $validate,
+        ]);
+
+        $html = $this->renderWidget($form->createView());
+
+        $xpath = '/button
+    [@type="submit"]
+    ';
+
+        if ($attributeIsExpected) {
+            $xpath .= '[@formnovalidate="formnovalidate"]';
+        } else {
+            $xpath .= '[not(@formnovalidate="formnovalidate")]';
+        }
+
+        $this->assertMatchesXpath($html, $xpath);
+    }
+
+    public function submitFormNoValidateProvider()
+    {
+        return [
+            [true, false],
+            [false, true],
+        ];
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/SubmitTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/SubmitTypeTest.php
@@ -62,4 +62,11 @@ public function testSubmitCanBeAddedToForm()
 
         $this->assertSame($form, $form->add('send', static::TESTED_TYPE));
     }
+
+    public function testFormNoValidate()
+    {
+        $this->assertTrue($this->factory->create(static::TESTED_TYPE, null, [
+            'validate' => false,
+        ])->createView()->vars['attr']['formnovalidate']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,4 +62,11 @@ public function testSubmitCanBeAddedToForm()`
`62`	`62`
`63`	`63`	`$this->assertSame($form, $form->add('send', static::TESTED_TYPE));`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ public function testFormNoValidate()`
	`67`	`+ {`
	`68`	`+ $this->assertTrue($this->factory->create(static::TESTED_TYPE, null, [`
	`69`	`+ 'validate' => false,`
	`70`	`+ ])->createView()->vars['attr']['formnovalidate']);`
	`71`	`+ }`
`65`	`72`	`}`