[HttpKernel] Fix #[MapUploadedFile] handling for optional file uploads

santysisi · santysisi · commit 5f9bda8514b4 · 2025-05-19T20:36:58.000-03:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/RequestPayloadValueResolver.php
@@ -232,6 +232,6 @@ 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(), []);
+        return $request->files->get($attribute->name ?? $argument->getName());
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/UploadedFileValueResolverTest.php
@@ -72,7 +72,7 @@ public function testEmpty(RequestPayloadValueResolver $resolver, Request $reques
             false,
             false,
             null,
-            false,
+            true,
             [$attribute::class => $attribute]
         );
         $event = new ControllerArgumentsEvent(
@@ -85,7 +85,7 @@ static function () {},
         $resolver->onKernelControllerArguments($event);
         $data = $event->getArguments()[0];
 
-        $this->assertEmpty($data);
+        $this->assertNull($data);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,6 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,`
`232`	`232`
`233`	`233`	`private function mapUploadedFile(Request $request, ArgumentMetadata $argument, MapUploadedFile $attribute): UploadedFile\|array\|null`
`234`	`234`	`{`
`235`		`- return $request->files->get($attribute->name ?? $argument->getName(), []);`
	`235`	`+ return $request->files->get($attribute->name ?? $argument->getName());`
`236`	`236`	`}`
`237`	`237`	`}`