Merge branch '7.2' into 7.3

* 7.2:
  -
  [Console] Table counts wrong column width when using colspan and `setColumnMaxWidth()`
  [Console] Table counts wrong number of padding symbols in `renderCell()` method when cell contain unicode variant selector
  [Cache] Fix using a `ChainAdapter` as an adapter for a pool
  [Serializer] Fix collect_denormalization_errors flag in defaultContext
  [TypeInfo] Fix handling `ConstFetchNode`
  [VarDumper] Avoid deprecated call in PgSqlCaster
  Fix command option mode (InputOption::VALUE_REQUIRED)
  use an EOL-agnostic approach to parse class uses
  [Uid] Improve entropy of the increment for UUIDv7
  [HttpKernel] Fix `#[MapUploadedFile]` handling for optional file uploads

Author: nicolas-grekas

Controller/ArgumentResolver/RequestPayloadValueResolver.php

@@ -232,6 +232,10 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,
 
     private function mapUploadedFile(Request $request, ArgumentMetadata $argument, MapUploadedFile $attribute): UploadedFile|array|null
     {
-        return $request->files->get($attribute->name ?? $argument->getName(), []);
+        if (!($files = $request->files->get($attribute->name ?? $argument->getName(), [])) && ($argument->isNullable() || $argument->hasDefaultValue())) {
+            return null;
+        }
+
+        return $files;
     }
 }

Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php

@@ -307,6 +307,66 @@ static function () {},
         $resolver->onKernelControllerArguments($event);
     }
 
+    /**
+     * @dataProvider provideContext
+     */
+    public function testShouldAllowEmptyWhenNullable(RequestPayloadValueResolver $resolver, Request $request)
+    {
+        $attribute = new MapUploadedFile();
+        $argument = new ArgumentMetadata(
+            'qux',
+            UploadedFile::class,
+            false,
+            false,
+            null,
+            true,
+            [$attribute::class => $attribute]
+        );
+        /** @var HttpKernelInterface&MockObject $httpKernel */
+        $httpKernel = $this->createMock(HttpKernelInterface::class);
+        $event = new ControllerArgumentsEvent(
+            $httpKernel,
+            static function () {},
+            $resolver->resolve($request, $argument),
+            $request,
+            HttpKernelInterface::MAIN_REQUEST
+        );
+        $resolver->onKernelControllerArguments($event);
+        $data = $event->getArguments()[0];
+
+        $this->assertNull($data);
+    }
+
+    /**
+     * @dataProvider provideContext
+     */
+    public function testShouldAllowEmptyWhenHasDefaultValue(RequestPayloadValueResolver $resolver, Request $request)
+    {
+        $attribute = new MapUploadedFile();
+        $argument = new ArgumentMetadata(
+            'qux',
+            UploadedFile::class,
+            false,
+            true,
+            'default-value',
+            false,
+            [$attribute::class => $attribute]
+        );
+        /** @var HttpKernelInterface&MockObject $httpKernel */
+        $httpKernel = $this->createMock(HttpKernelInterface::class);
+        $event = new ControllerArgumentsEvent(
+            $httpKernel,
+            static function () {},
+            $resolver->resolve($request, $argument),
+            $request,
+            HttpKernelInterface::MAIN_REQUEST
+        );
+        $resolver->onKernelControllerArguments($event);
+        $data = $event->getArguments()[0];
+
+        $this->assertSame('default-value', $data);
+    }
+
     public static function provideContext(): iterable
     {
         $resolver = new RequestPayloadValueResolver(