From 74726f389673155d344cf080554ab595bcb322c8 Mon Sep 17 00:00:00 2001
From: Amrouche Hamza <hamza@les-tilleuls.coop>
Date: Sun, 3 Dec 2017 15:02:49 +0100
Subject: [PATCH] [Serializer] DateTimeNormalizer handling of null and empty
 values (returning null or empty instead of new object)

---
 .../Normalizer/DateTimeNormalizer.php          |  4 ++++
 .../Normalizer/DateTimeNormalizerTest.php      | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php
index ff121deb807a..f78901132954 100644
--- 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 a string that can be parsed with the passed format or a valid DateTime string.');
+        }
+
         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
index 6d622bbcc0e0..73d277b19083 100644
--- 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 a string that can be parsed with the passed format or a valid DateTime string.
+     */
+    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 a string that can be parsed with the passed format or a valid DateTime string.
+     */
+    public function testDenormalizeEmptyStringThrowsException()
+    {
+        $this->normalizer->denormalize('', \DateTimeInterface::class);
+    }
+
     /**
      * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      */