Merge branch '3.4' into 4.0

chalasr · chalasr · commit 18abe8e27818 · 2018-01-19T12:28:59.000+01:00
* 3.4:
  [Serializer] fix undefined class
  [FrameworkBundle] fix DI extension tests
diff --git a/Normalizer/DateTimeNormalizer.php b/Normalizer/DateTimeNormalizer.php
@@ -80,7 +80,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
         $timezone = $this->getTimezone($context);
 
         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.');
+            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.');
         }
 
         if (null !== $dateTimeFormat) {

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`80`	`80`	`$timezone = $this->getTimezone($context);`
`81`	`81`
`82`	`82`	`if ('' === $data \|\| null === $data) {`
`83`		`- 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.');`
	`83`	`+ 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.');`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if (null !== $dateTimeFormat) {`