From e20148ab75224a98e289d021b67b720e0b7d08e2 Mon Sep 17 00:00:00 2001 From: Peter Gribanov Date: Wed, 2 Jun 2021 14:34:18 +0300 Subject: [PATCH] string is the preferred value type for TextType --- .../Component/Form/Extension/Core/Type/TextType.php | 3 ++- .../Form/Tests/Extension/Core/Type/ColorTypeTest.php | 2 +- .../Tests/Extension/Core/Type/PasswordTypeTest.php | 2 +- .../Form/Tests/Extension/Core/Type/TextTypeTest.php | 10 +++++----- .../Form/Tests/Extension/Core/Type/UrlTypeTest.php | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TextType.php b/src/Symfony/Component/Form/Extension/Core/Type/TextType.php index 9b3c59db85bb4..450bf63a7b269 100644 --- 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, + 'empty_data' => '', ]); } @@ -62,6 +63,6 @@ public function transform($data) */ public function reverseTransform($data) { - return null === $data ? '' : $data; + return $data ?? ''; } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php index cfe7f0c527ce3..1a03d154ed66c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ColorTypeTest.php @@ -82,7 +82,7 @@ public function validationShouldFailProvider() ]; } - public function testSubmitNull($expected = null, $norm = null, $view = null) + public function testSubmitNull($expected = '', $norm = '', $view = '') { parent::testSubmitNull($expected, $norm, ''); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php index 29756f17b9abc..3249ce77e0058 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php @@ -47,7 +47,7 @@ public function testNotTrimmed() $this->assertSame(' pAs5w0rd ', $form->getData()); } - public function testSubmitNull($expected = null, $norm = null, $view = null) + public function testSubmitNull($expected = '', $norm = '', $view = '') { parent::testSubmitNull($expected, $norm, ''); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php index 3f8fbe7725ffc..dd90075448784 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TextTypeTest.php @@ -15,7 +15,7 @@ class TextTypeTest extends BaseTypeTest { public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\TextType'; - public function testSubmitNull($expected = null, $norm = null, $view = null) + public function testSubmitNull($expected = '', $norm = '', $view = '') { parent::testSubmitNull($expected, $norm, ''); } @@ -23,19 +23,19 @@ public function testSubmitNull($expected = null, $norm = null, $view = null) public function testSubmitNullReturnsNullWithEmptyDataAsString() { $form = $this->factory->create(static::TESTED_TYPE, 'name', [ - 'empty_data' => '', + 'empty_data' => null, ]); $form->submit(null); - $this->assertSame('', $form->getData()); - $this->assertSame('', $form->getNormData()); + $this->assertNull($form->getData()); + $this->assertNull($form->getNormData()); $this->assertSame('', $form->getViewData()); } public function provideZeros() { return [ - [0, '0'], + [0, 0], ['0', '0'], ['00000', '00000'], ]; diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php index b9387d01a45e6..7846b328b1aec 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php @@ -47,7 +47,7 @@ public function testSubmitAddsNoDefaultProtocolIfEmpty() $form->submit(''); - $this->assertNull($form->getData()); + $this->assertSame('', $form->getData()); $this->assertSame('', $form->getViewData()); } @@ -59,7 +59,7 @@ public function testSubmitAddsNoDefaultProtocolIfNull() $form->submit(null); - $this->assertNull($form->getData()); + $this->assertSame('', $form->getData()); $this->assertSame('', $form->getViewData()); } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy