[BrowserKit] Merge fields and files recursively if they are multidimensional array

januszmk · fabpot · commit 66c3415e3b59 · 2022-07-25T14:56:10.000+02:00
diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php
@@ -82,7 +82,7 @@ private function getBodyAndExtraHeaders(Request $request, array $headers): array
         $fields = $request->getParameters();
 
         if ($uploadedFiles = $this->getUploadedFiles($request->getFiles())) {
-            $part = new FormDataPart(array_merge($fields, $uploadedFiles));
+            $part = new FormDataPart(array_replace_recursive($fields, $uploadedFiles));
 
             return [$part->bodyToIterable(), $part->getPreparedHeaders()->toArray()];
         }
diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
@@ -86,7 +86,11 @@ public function testMultiPartRequestWithSingleFile()
             ->with('POST', 'http://example.com/', $this->callback(function ($options) {
                 $this->assertStringContainsString('Content-Type: multipart/form-data', implode('', $options['headers']));
                 $this->assertInstanceOf(\Generator::class, $options['body']);
-                $this->assertStringContainsString('my_file', implode('', iterator_to_array($options['body'])));
+                $values = implode('', iterator_to_array($options['body'], false));
+                $this->assertStringContainsString('name="foo[file]"', $values);
+                $this->assertStringContainsString('my_file', $values);
+                $this->assertStringContainsString('name="foo[bar]"', $values);
+                $this->assertStringContainsString('foo2', $values);
 
                 return true;
             }))
@@ -95,7 +99,7 @@ public function testMultiPartRequestWithSingleFile()
         $browser = new HttpBrowser($client);
         $path = tempnam(sys_get_temp_dir(), 'http');
         file_put_contents($path, 'my_file');
-        $browser->request('POST', 'http://example.com/', [], ['file' => ['tmp_name' => $path, 'name' => 'foo']]);
+        $browser->request('POST', 'http://example.com/', ['foo' => ['bar' => 'foo2']], ['foo' => ['file' => ['tmp_name' => $path, 'name' => 'foo']]]);
     }
 
     public function testMultiPartRequestWithNormalFlatArray()

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private function getBodyAndExtraHeaders(Request $request, array $headers): array`
`82`	`82`	`$fields = $request->getParameters();`
`83`	`83`
`84`	`84`	`if ($uploadedFiles = $this->getUploadedFiles($request->getFiles())) {`
`85`		`- $part = new FormDataPart(array_merge($fields, $uploadedFiles));`
	`85`	`+ $part = new FormDataPart(array_replace_recursive($fields, $uploadedFiles));`
`86`	`86`
`87`	`87`	`return [$part->bodyToIterable(), $part->getPreparedHeaders()->toArray()];`
`88`	`88`	`}`