bug symfony#25287 [Serializer] DateTimeNormalizer handling of null and empty values (returning it instead of new object) (Simperfit)

fabpot · fabpot · commit 65b48b5b9337 · 2018-01-17T09:02:20.000+01:00
This PR was merged into the 3.3 branch. Discussion ---------- [Serializer] DateTimeNormalizer handling of null and empty values (returning it instead of new object) | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | no | Fixed tickets | symfony#23964 | License | MIT | Doc PR | I'm openning the disucussion on this as I think that should be returning null and not a new object. WDYT ? Working at home ;) ![img_2914](https://user-images.githubusercontent.com/3451634/33526107-ec2a6ce8-d83b-11e7-8949-f8d360ebb4b9.JPG) Commits ------- 74726f3 [Serializer] DateTimeNormalizer handling of null and empty values (returning null or empty instead of new object)
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 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
@@ -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
      */

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 a string that can be parsed with the passed format or a valid DateTime string.');`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`if (null !== $dateTimeFormat) {`
`71`	`75`	`$object = \DateTime::class === $class ? \DateTime::createFromFormat($dateTimeFormat, $data) : \DateTimeImmutable::createFromFormat($dateTimeFormat, $data);`
`72`	`76`