Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit d82aff113c55 · 2020-05-04T17:34:58.000+02:00
* 4.4:
  Fix exception messages containing exception messages
diff --git a/Normalizer/AbstractObjectNormalizer.php b/Normalizer/AbstractObjectNormalizer.php
@@ -332,7 +332,7 @@ public function denormalize($data, string $type, string $format = null, array $c
             try {
                 $this->setAttributeValue($object, $attribute, $value, $format, $context);
             } catch (InvalidArgumentException $e) {
-                throw new NotNormalizableValueException(sprintf('Failed to denormalize attribute "%s" value for class "%s": '.$e->getMessage(), $attribute, $type), $e->getCode(), $e);
+                throw new NotNormalizableValueException(sprintf('Failed to denormalize attribute "%s" value for class "%s": ', $attribute, $type).$e->getMessage(), $e->getCode(), $e);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public function denormalize($data, string $type, string $format = null, array $c`
`332`	`332`	`try {`
`333`	`333`	`$this->setAttributeValue($object, $attribute, $value, $format, $context);`
`334`	`334`	`} catch (InvalidArgumentException $e) {`
`335`		`- throw new NotNormalizableValueException(sprintf('Failed to denormalize attribute "%s" value for class "%s": '.$e->getMessage(), $attribute, $type), $e->getCode(), $e);`
	`335`	`+ throw new NotNormalizableValueException(sprintf('Failed to denormalize attribute "%s" value for class "%s": ', $attribute, $type).$e->getMessage(), $e->getCode(), $e);`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`