Merge branch '6.4' into 7.3

* 6.4: [HttpKernel] Fix using MapRequestPayload on nullable arguments [DependencyInjection] Fix preloading LazyClosure [Emoji] Update list to version 17 [HttpClient] Don't reset unused clients in data collector

Author: nicolas-grekas

Controller/ArgumentResolver/RequestPayloadValueResolver.php

@@ -193,6 +193,10 @@ private function mapQueryString(Request $request, ArgumentMetadata $argument, Ma
 
  private function mapRequestPayload(Request $request, ArgumentMetadata $argument, MapRequestPayload $attribute): object|array|null
  {
+ if ('' === ($data = $request->request->all() ?: $request->getContent()) && ($argument->isNullable() || $argument->hasDefaultValue())) {
+ return null;
+ }
+
  if (null === $format = $request->getContentTypeFormat()) {
  throw new UnsupportedMediaTypeHttpException('Unsupported format.');
  }
@@ -207,12 +211,8 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,
  $type = $argument->getType();
  }
 
- if ($data = $request->request->all()) {
- return $this->serializer->denormalize($data, $type, 'csv', $attribute->serializationContext + self::CONTEXT_DENORMALIZE + ('form' === $format ? ['filter_bool' => true] : []));
- }
-
- if ('' === ($data = $request->getContent()) && ($argument->isNullable() || $argument->hasDefaultValue())) {
- return null;
+ if (\is_array($data)) {
+ return $this->serializer->denormalize($data, $type, 'csv', $attribute->serializationContext + self::CONTEXT_DENORMALIZE);
  }
 
  if ('form' === $format) {

Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php

@@ -180,6 +180,28 @@ public function testNullPayloadAndNotDefaultOrNullableArgument()
  }
  }
 
+ public function testRequestPayloadWithoutContentTypeOnNullableArgumentReturnsNull()
+ {
+ $validator = $this->createMock(ValidatorInterface::class);
+ $validator->expects($this->never())
+ ->method('validate');
+
+ $resolver = new RequestPayloadValueResolver(new Serializer(), $validator);
+
+ $argument = new ArgumentMetadata('valid', RequestPayload::class, false, false, null, true, [
+ MapRequestPayload::class => new MapRequestPayload(),
+ ]);
+ $request = Request::create('/', 'POST');
+
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $arguments = $resolver->resolve($request, $argument);
+ $event = new ControllerArgumentsEvent($kernel, fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+ $resolver->onKernelControllerArguments($event);
+
+ $this->assertSame([null], $event->getArguments());
+ }
+
  public function testQueryNullPayloadAndNotDefaultOrNullableArgument()
  {
  $validator = $this->createMock(ValidatorInterface::class);