fix #51235 - fix the order of merging of serializationContext and self::CONTEXT_DENORMALIZE

pedrocasado · pedrocasado · commit 90a38ae3bcd8 · 2023-08-28T14:26:51.000-03:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -161,7 +161,7 @@ private function mapQueryString(Request $request, string $type, MapQueryString $
             return null;
         }
 
-        return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->serializationContext);
+        return $this->serializer->denormalize($data, $type, null,  $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
     }
 
     private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object
@@ -175,7 +175,7 @@ private function mapRequestPayload(Request $request, string $type, MapRequestPay
         }
 
         if ($data = $request->request->all()) {
-            return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->serializationContext);
+            return $this->serializer->denormalize($data, $type, null, $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
         }
 
         if ('' === $data = $request->getContent()) {

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private function mapQueryString(Request $request, string $type, MapQueryString $`
`161`	`161`	`return null;`
`162`	`162`	`}`
`163`	`163`
`164`		`- return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->serializationContext);`
	`164`	`+ return $this->serializer->denormalize($data, $type, null, $attribute->serializationContext + self::CONTEXT_DENORMALIZE);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`private function mapRequestPayload(Request $request, string $type, MapRequestPayload $attribute): ?object`
`@@ -175,7 +175,7 @@ private function mapRequestPayload(Request $request, string $type, MapRequestPay`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`if ($data = $request->request->all()) {`
`178`		`- return $this->serializer->denormalize($data, $type, null, self::CONTEXT_DENORMALIZE + $attribute->serializationContext);`
	`178`	`+ return $this->serializer->denormalize($data, $type, null, $attribute->serializationContext + self::CONTEXT_DENORMALIZE);`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`if ('' === $data = $request->getContent()) {`