[Serializer] DateTimeNormalizer handling of null and empty values (returning null or empty instead of new object)

Amrouche Hamza · Amrouche Hamza · commit 6bfb5a2670d2 · 2017-12-09T09:29:47.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
@@ -67,6 +67,10 @@ public function denormalize($data, $class, $format = null, array $context = arra
     {
         $dateTimeFormat = isset($context[self::FORMAT_KEY]) ? $context[self::FORMAT_KEY] : null;
 
+        if ('' === $data || null === $data) {
+            throw new UnexpectedValueException('The data is either an empty string or null, you should pass an object implementing \DateTimeInterface.');
+        }
+
         if (null !== $dateTimeFormat) {
             $object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data);
 
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
@@ -91,6 +91,24 @@ public function testDenormalizeInvalidDataThrowsException()
         $this->normalizer->denormalize('invalid date', \DateTimeInterface::class);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+     * @expectedExceptionMessage The data is either an empty string or null, you should pass an object implementing \DateTimeInterface.
+     */
+    public function testDenormalizeNullThrowsException()
+    {
+        $this->normalizer->denormalize(null, \DateTimeInterface::class);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+     * @expectedExceptionMessage The data is either an empty string or null, you should pass an object implementing \DateTimeInterface.
+     */
+    public function testDenormalizeEmptyStringThrowsException()
+    {
+        $this->normalizer->denormalize('', \DateTimeInterface::class);
+    }
+
     /**
      * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      */

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`67`	`67`	`{`
`68`	`68`	`$dateTimeFormat = isset($context[self::FORMAT_KEY]) ? $context[self::FORMAT_KEY] : null;`
`69`	`69`
	`70`	`+ if ('' === $data \|\| null === $data) {`
	`71`	`+ throw new UnexpectedValueException('The data is either an empty string or null, you should pass an object implementing \DateTimeInterface.');`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`if (null !== $dateTimeFormat) {`
`71`	`75`	`$object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data);`
`72`	`76`