Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 14cb0cbefccc · 2025-02-11T17:46:20.000+01:00
* 6.4:
  [WebProfilerBundle] Fix tests
  [Cache] Tests for Redis Replication with cache
  [BrowserKit] Fix submitting forms with empty file fields
  [WebProfilerBundle] Fix interception for non conventional redirects
  [DependencyInjection] Do not preload functions
  [DependencyInjection] Fix cloned lazy services not sharing their dependencies when dumped with PhpDumper
  [HttpClient] Fix activity tracking leading to negative timeout errors
  [Security] Return null instead of empty username to fix deprecation notice
  [DependencyInjection] Fix env default processor with scalar node
diff --git a/HttpBrowser.php b/HttpBrowser.php
@@ -145,10 +145,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
@@ -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
`@@ -145,10 +145,15 @@ private function getUploadedFiles(array $files): array`
`145`	`145`	`}`
`146`	`146`	`if (!isset($file['tmp_name'])) {`
`147`	`147`	`$uploadedFiles[$name] = $this->getUploadedFiles($file);`
	`148`	`+ continue;`
`148`	`149`	`}`
`149`		`- if (isset($file['tmp_name'])) {`
`150`		`- $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);`
	`150`	`+`
	`151`	`+ if ('' === $file['tmp_name']) {`
	`152`	`+ $uploadedFiles[$name] = new DataPart('', '');`
	`153`	`+ continue;`
`151`	`154`	`}`
	`155`	`+`
	`156`	`+ $uploadedFiles[$name] = DataPart::fromPath($file['tmp_name'], $file['name']);`
`152`	`157`	`}`
`153`	`158`
`154`	`159`	`return $uploadedFiles;`