From 0c806f2a12a3f611ab881072005682c443569561 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 11 Feb 2025 14:07:09 +0100
Subject: [PATCH 1/2] [BrowserKit] Fix submitting forms with empty file fields

---
 HttpBrowser.php           |  9 +++++++--
 Tests/HttpBrowserTest.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/HttpBrowser.php b/HttpBrowser.php
index 9d84bda..4eb30b5 100644
--- a/HttpBrowser.php
+++ b/HttpBrowser.php
@@ -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/Tests/HttpBrowserTest.php b/Tests/HttpBrowserTest.php
index e1f19b1..3a2547d 100644
--- a/Tests/HttpBrowserTest.php
+++ b/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');

From ce95f3e3239159e7fa3be7690c6ce95a4714637f Mon Sep 17 00:00:00 2001
From: Raffaele Carelle <raffaele.carelle@algoritma.it>
Date: Thu, 13 Feb 2025 14:50:49 +0100
Subject: [PATCH 2/2] Enable `JSON_PRESERVE_ZERO_FRACTION` in `jsonRequest`
 method

---
 AbstractBrowser.php           | 2 +-
 Tests/AbstractBrowserTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AbstractBrowser.php b/AbstractBrowser.php
index d2a1fae..37ab49d 100644
--- a/AbstractBrowser.php
+++ b/AbstractBrowser.php
@@ -170,7 +170,7 @@ public function xmlHttpRequest(string $method, string $uri, array $parameters =
      */
     public function jsonRequest(string $method, string $uri, array $parameters = [], array $server = [], bool $changeHistory = true): Crawler
     {
-        $content = json_encode($parameters);
+        $content = json_encode($parameters, \JSON_PRESERVE_ZERO_FRACTION);
 
         $this->setServerParameter('CONTENT_TYPE', 'application/json');
         $this->setServerParameter('HTTP_ACCEPT', 'application/json');
diff --git a/Tests/AbstractBrowserTest.php b/Tests/AbstractBrowserTest.php
index 2267fca..504cc95 100644
--- a/Tests/AbstractBrowserTest.php
+++ b/Tests/AbstractBrowserTest.php
@@ -67,12 +67,12 @@ public function testXmlHttpRequest()
     public function testJsonRequest()
     {
         $client = $this->getBrowser();
-        $client->jsonRequest('GET', 'http://example.com/', ['param' => 1], [], true);
+        $client->jsonRequest('GET', 'http://example.com/', ['param' => 1, 'float' => 10.0], [], true);
         $this->assertSame('application/json', $client->getRequest()->getServer()['CONTENT_TYPE']);
         $this->assertSame('application/json', $client->getRequest()->getServer()['HTTP_ACCEPT']);
         $this->assertFalse($client->getServerParameter('CONTENT_TYPE', false));
         $this->assertFalse($client->getServerParameter('HTTP_ACCEPT', false));
-        $this->assertSame('{"param":1}', $client->getRequest()->getContent());
+        $this->assertSame('{"param":1,"float":10.0}', $client->getRequest()->getContent());
     }
 
     public function testGetRequestWithIpAsHttpHost()