diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Serializer] Do not allow to denormalize string with spaces only to valid a DateTime object

This commit is contained in:
Oleg Zhulnev 2021-06-01 14:01:19 +03:00 committed by Nicolas Grekas
parent c71e9ba222
commit 21c0829a25
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
View File

@ -97,7 +97,7 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface,
$dateTimeFormat = $context[self::FORMAT_KEY] ?? null;
$timezone = $this->getTimezone($context);
if ('' === $data || null === $data) {
if (null === $data || (\is_string($data) && '' === trim($data))) {
throw new NotNormalizableValueException('The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.');
}

15
src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
View File

@ -201,6 +201,7 @@ class DateTimeNormalizerTest extends TestCase
$this->assertEquals(new \DateTimeImmutable('2016/01/01', new \DateTimeZone('UTC')), $this->normalizer->denormalize('2016-01-01T00:00:00+00:00', \DateTimeInterface::class));
$this->assertEquals(new \DateTimeImmutable('2016/01/01', new \DateTimeZone('UTC')), $this->normalizer->denormalize('2016-01-01T00:00:00+00:00', \DateTimeImmutable::class));
$this->assertEquals(new \DateTime('2016/01/01', new \DateTimeZone('UTC')), $this->normalizer->denormalize('2016-01-01T00:00:00+00:00', \DateTime::class));
$this->assertEquals(new \DateTime('2016/01/01', new \DateTimeZone('UTC')), $this->normalizer->denormalize(' 2016-01-01T00:00:00+00:00 ', \DateTime::class));
}
public function testDenormalizeUsingTimezonePassedInConstructor()
@ -290,6 +291,20 @@ class DateTimeNormalizerTest extends TestCase
$this->normalizer->denormalize('', \DateTimeInterface::class);
}
public function testDenormalizeStringWithSpacesOnlyThrowsAnException()
{
$this->expectException(UnexpectedValueException::class);
$this->expectExceptionMessage('The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.');
$this->normalizer->denormalize(' ', \DateTimeInterface::class);
}
public function testDenormalizeDateTimeStringWithSpacesUsingFormatPassedInContextThrowsAnException()
{
$this->expectException(UnexpectedValueException::class);
$this->expectExceptionMessage("Parsing datetime string \" 2016.01.01 \" using format \"Y.m.d|\" resulted in 2 errors: \nat position 0: Unexpected data found.\nat position 12: Trailing data");
$this->normalizer->denormalize(' 2016.01.01 ', \DateTime::class, null, [DateTimeNormalizer::FORMAT_KEY => 'Y.m.d|']);
}
public function testDenormalizeFormatMismatchThrowsException()
{
$this->expectException(UnexpectedValueException::class);