Skip to content

Commit 2e5d835

Browse files
Merge branch '4.2'
* 4.2: typo [Messenger] Mention HandleTrait in UPGRADE-4.2.md file add a test case [Form] Handle all case variants of "nan" when parsing a number
2 parents 521e694 + e098c91 commit 2e5d835

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function reverseTransform($value)
146146
return;
147147
}
148148

149-
if ('NaN' === $value) {
149+
if (\in_array($value, array('NaN', 'NAN', 'nan'), true)) {
150150
throw new TransformationFailedException('"NaN" is not a valid number');
151151
}
152152

Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -514,24 +514,24 @@ public function testReverseTransformExpectsValidNumber()
514514

515515
/**
516516
* @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
517+
* @dataProvider nanRepresentationProvider
517518
*
518519
* @see https://github.com/symfony/symfony/issues/3161
519520
*/
520-
public function testReverseTransformDisallowsNaN()
521+
public function testReverseTransformDisallowsNaN($nan)
521522
{
522523
$transformer = new NumberToLocalizedStringTransformer();
523524

524-
$transformer->reverseTransform('NaN');
525+
$transformer->reverseTransform($nan);
525526
}
526527

527-
/**
528-
* @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
529-
*/
530-
public function testReverseTransformDisallowsNaN2()
528+
public function nanRepresentationProvider()
531529
{
532-
$transformer = new NumberToLocalizedStringTransformer();
533-
534-
$transformer->reverseTransform('nan');
530+
return array(
531+
array('nan'),
532+
array('NaN'), // see https://github.com/symfony/symfony/issues/3161
533+
array('NAN'),
534+
);
535535
}
536536

537537
/**

0 commit comments

Comments
 (0)