Merge branch '7.3' into 7.4

* 7.3:
  [TypeInfo] Add space after glue comma
  Remove obsolete code for solved Psalm issue in workflow
  [HttpKernel] #[MapUploadedFile] throws http exception on empty files array if argument not nullable nor has default value

Author: nicolas-grekas

.github/workflows/psalm.yml

@@ -50,10 +50,6 @@ jobs:
           git checkout composer.json
           git checkout -m ${{ github.base_ref }}
 
-          # @todo intersection types are broken in Psalm
-          # @see https://github.com/vimeo/psalm/issues/7520
-          sed -i 's/Uuid&/Uuid|/' src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php
-          sed -i 's/Interface&/Interface|/' src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MigratingSessionHandler.php
           ./vendor/bin/psalm.phar --set-baseline=.github/psalm/psalm.baseline.xml --no-progress
           git checkout -m FETCH_HEAD
 

src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php

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

src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php

@@ -79,6 +79,33 @@ static function () {},
             $request,
             HttpKernelInterface::MAIN_REQUEST
         );
+
+        $this->expectException(HttpException::class);
+
+        $resolver->onKernelControllerArguments($event);
+    }
+
+    #[DataProvider('provideContext')]
+    public function testEmptyArrayArgument(RequestPayloadValueResolver $resolver, Request $request)
+    {
+        $attribute = new MapUploadedFile();
+        $argument = new ArgumentMetadata(
+            'qux',
+            'array',
+            false,
+            false,
+            null,
+            false,
+            [$attribute::class => $attribute]
+        );
+        $event = new ControllerArgumentsEvent(
+            $this->createMock(HttpKernelInterface::class),
+            static function () {},
+            $resolver->resolve($request, $argument),
+            $request,
+            HttpKernelInterface::MAIN_REQUEST
+        );
+
         $resolver->onKernelControllerArguments($event);
         $data = $event->getArguments()[0];
 
@@ -318,6 +345,34 @@ static function () {},
         $this->assertNull($data);
     }
 
+    #[DataProvider('provideContext')]
+    public function testShouldAllowEmptyWhenNullableArray(RequestPayloadValueResolver $resolver, Request $request)
+    {
+        $attribute = new MapUploadedFile();
+        $argument = new ArgumentMetadata(
+            'qux',
+            'array',
+            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)
     {