From 64259b2fd42e01a880f06bad013cd3cde10eb5fb Mon Sep 17 00:00:00 2001 From: Maciej Walczak Date: Wed, 6 Apr 2016 15:36:53 +0200 Subject: [PATCH] Reverted string expectation in ChoiceToValueTransformer --- .../Core/DataTransformer/ChoiceToValueTransformer.php | 4 ++-- .../Core/DataTransformer/ChoiceToValueTransformerTest.php | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php index c7a6655b4e65a..ffffddedc3bef 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php @@ -39,8 +39,8 @@ public function transform($choice) public function reverseTransform($value) { - if (null !== $value && !is_string($value)) { - throw new TransformationFailedException('Expected a string or null.'); + if (null !== $value && !is_scalar($value)) { + throw new TransformationFailedException('Expected a scalar.'); } $choices = $this->choiceList->getChoicesForValues(array((string) $value)); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php index 5362ab9fc76cd..8ff9826868f30 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php @@ -78,10 +78,8 @@ public function testReverseTransform($in, $out, $inWithNull, $outWithNull) public function reverseTransformExpectsStringOrNullProvider() { return array( - array(0), - array(true), - array(false), array(array()), + array(new \stdClass()), ); } 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