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

Amrouche Hamza · Amrouche Hamza · commit 233ad77f59d7 · 2017-12-04T18:07:25.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) {
+            return $data;
+        }
+
         if (null !== $dateTimeFormat) {
             $object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data);
 
@@ -103,7 +107,7 @@ public function supportsDenormalization($data, $type, $format = null)
             \DateTime::class => true,
         );
 
-        return isset($supportedTypes[$type]);
+        return isset($supportedTypes[$type]) && is_string($data);
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
@@ -67,6 +67,7 @@ public function testSupportsDenormalization()
         $this->assertTrue($this->normalizer->supportsDenormalization('2016-01-01T00:00:00+00:00', \DateTime::class));
         $this->assertTrue($this->normalizer->supportsDenormalization('2016-01-01T00:00:00+00:00', \DateTimeImmutable::class));
         $this->assertFalse($this->normalizer->supportsDenormalization('foo', 'Bar'));
+        $this->assertFalse($this->normalizer->supportsDenormalization(null, \DateTimeImmutable::class));
     }
 
     public function testDenormalize()
@@ -91,6 +92,11 @@ public function testDenormalizeInvalidDataThrowsException()
         $this->normalizer->denormalize('invalid date', \DateTimeInterface::class);
     }
 
+    public function testDenormalizeWithNullAndEmptyString()
+    {
+        $this->assertSame('', $this->normalizer->denormalize('', \DateTimeInterface::class));
+    }
+
     /**
      * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
      */
