[BrowserKit] Fix submitting forms with empty file fields

nicolas-grekas · nicolas-grekas · commit 08e391c44b7a · 2025-02-11T14:07:09.000+01:00
diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php
@@ -85,7 +85,7 @@ private function getBodyAndExtraHeaders(Request $request, array $headers): array
         if ($uploadedFiles = $this->getUploadedFiles($request->getFiles())) {
             $part = new FormDataPart(array_replace_recursive($fields, $uploadedFiles));
 
-            return [$part->bodyToIterable(), $part->getPreparedHeaders()->toArray()];
+            return [$part->bodyToIterable(...), $part->getPreparedHeaders()->toArray()];
         }
 
         if (!$fields) {
@@ -143,10 +143,15 @@ private function getUploadedFiles(array $files): array
             }
             if (!isset($file['tmp_name'])) {
                 $uploadedFiles[$name] = $this->getUploadedFiles($file);
+                continue;
             }
-            if (isset($file['tmp_name'])) {
-                $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);
+
+            if ('' === $file['tmp_name']) {
+                $uploadedFiles[$name] = new DataPart('', '');
+                continue;
             }
+
+            $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);
         }
 
         return $uploadedFiles;
diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
@@ -14,6 +14,8 @@
 use Symfony\Component\BrowserKit\CookieJar;
 use Symfony\Component\BrowserKit\History;
 use Symfony\Component\BrowserKit\HttpBrowser;
+use Symfony\Component\HttpClient\MockHttpClient;
+use Symfony\Component\HttpClient\Response\MockResponse;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
@@ -208,6 +210,37 @@ public static function forwardSlashesRequestPathProvider()
         ];
     }
 
+    public function testEmptyUpload()
+    {
+        $client = new MockHttpClient(function ($method, $url, $options) {
+            $this->assertSame('POST', $method);
+            $this->assertSame('http://localhost/', $url);
+            $this->assertStringStartsWith('Content-Type: multipart/form-data; boundary=', $options['normalized_headers']['content-type'][0]);
+
+            $body = '';
+            while ('' !== $data = $options['body'](1024)) {
+                $body .= $data;
+            }
+
+            $expected = <<<EOTXT
+                --%s\r
+                Content-Type: application/octet-stream\r
+                Content-Transfer-Encoding: 8bit\r
+                Content-Disposition: form-data; name="file"; filename=""\r
+                \r
+                \r
+                --%s--\r
+
+                EOTXT;
+            $this->assertStringMatchesFormat($expected, $body);
+
+            return new MockResponse();
+        });
+
+        $browser = new HttpBrowser($client);
+        $browser->request('POST', '/', [], ['file' => ['tmp_name' => '', 'name' => 'file']]);
+    }
+
     private function uploadFile(string $data): string
     {
         $path = tempnam(sys_get_temp_dir(), 'http');

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private function getBodyAndExtraHeaders(Request $request, array $headers): array`
`85`	`85`	`if ($uploadedFiles = $this->getUploadedFiles($request->getFiles())) {`
`86`	`86`	`$part = new FormDataPart(array_replace_recursive($fields, $uploadedFiles));`
`87`	`87`
`88`		`- return [$part->bodyToIterable(), $part->getPreparedHeaders()->toArray()];`
	`88`	`+ return [$part->bodyToIterable(...), $part->getPreparedHeaders()->toArray()];`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (!$fields) {`
`@@ -143,10 +143,15 @@ private function getUploadedFiles(array $files): array`
`143`	`143`	`}`
`144`	`144`	`if (!isset($file['tmp_name'])) {`
`145`	`145`	`$uploadedFiles[$name] = $this->getUploadedFiles($file);`
	`146`	`+ continue;`
`146`	`147`	`}`
`147`		`- if (isset($file['tmp_name'])) {`
`148`		`- $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);`
	`148`	`+`
	`149`	`+ if ('' === $file['tmp_name']) {`
	`150`	`+ $uploadedFiles[$name] = new DataPart('', '');`
	`151`	`+ continue;`
`149`	`152`	`}`
	`153`	`+`
	`154`	`+ $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);`
`150`	`155`	`}`
`151`	`156`
`152`	`157`	`return $uploadedFiles;`