From e7698e74349764615ad3799737dcfb13f40c6fea Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 17 Nov 2020 17:13:30 +0100 Subject: [PATCH] ignore the pattern attribute for textareas --- .../Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php | 2 +- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php | 1 + src/Symfony/Component/Form/Tests/AbstractLayoutTest.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php index 765e1592d1..44cf60db3a 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php @@ -2379,7 +2379,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest $this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']], '/textarea [@name="name"] - [@pattern="foo"] + [not(@pattern)] [@class="my&class form-control"] [.="foo&bar"] ' diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 75860d1ed4..84045151c8 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -26,7 +26,7 @@ "symfony/dependency-injection": "^3.4|^4.0|^5.0", "symfony/error-handler": "^4.4|^5.0", "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/form": "^4.3.5", + "symfony/form": "^4.4.17", "symfony/http-foundation": "^4.3|^5.0", "symfony/http-kernel": "^4.4", "symfony/mime": "^4.3|^5.0", diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php index 7db19d8aed..173b7ef53c 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TextareaType.php @@ -23,6 +23,7 @@ class TextareaType extends AbstractType public function buildView(FormView $view, FormInterface $form, array $options) { $view->vars['pattern'] = null; + unset($view->vars['attr']['pattern']); } /** diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php index e860557468..38ba3bf531 100644 --- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php @@ -2068,7 +2068,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase $this->assertWidgetMatchesXpath($form->createView(), [], '/textarea [@name="name"] - [@pattern="foo"] + [not(@pattern)] [.="foo&bar"] ' );