bug symfony#45531 [Serializer] Fix passing null to str_contains() (Erwin Dirks)

nicolas-grekas · nicolas-grekas · commit 9a22b37d07e9 · 2022-02-24T09:37:02.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Serializer] Fix passing null to str_contains() | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - In PHP 8.1 `null` isn't allowed so the check `str_contains` will fail because `$format` can be `null` Commits ------- da7d8c0 [Serializer] Fix passing null to str_contains()
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -472,7 +472,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
             // PHP's json_decode automatically converts Numbers without a decimal part to integers.
             // To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when
             // a float is expected.
-            if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && str_contains($format, JsonEncoder::FORMAT)) {
+            if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {
                 return (float) $data;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,`
`472`	`472`	`// PHP's json_decode automatically converts Numbers without a decimal part to integers.`
`473`	`473`	`// To circumvent this behavior, integers are converted to floats when denormalizing JSON based formats and when`
`474`	`474`	`// a float is expected.`
`475`		`- if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && str_contains($format, JsonEncoder::FORMAT)) {`
	`475`	`+ if (Type::BUILTIN_TYPE_FLOAT === $builtinType && \is_int($data) && null !== $format && str_contains($format, JsonEncoder::FORMAT)) {`
`476`	`476`	`return (float) < 42A4 span class=pl-s1>$data;`
`477`	`477`	`}`
`478`	`478`