symfony
diff --git a/‎src/Symfony/Component/BrowserKit/HttpBrowser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/HttpBrowser.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/BrowserKit/HttpBrowser.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/HttpBrowser.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
+6-2Lines changed: 6 additions & 2 deletions b/‎src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+8Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+8Lines changed: 8 additions & 0 deletions
@@ -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()];
         }
 
@@ -94,7 +94,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;
             }))
@@ -103,7 +107,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()
 
@@ -372,6 +372,9 @@ private function buildXml(\DOMNode $parentNode, $data, string $format, array $co
                     if (!\is_scalar($data)) {
                         $data = $this->serializer->normalize($data, $format, $context);
                     }
+                    if (\is_bool($data)) {
+                        $data = (int) $data;
+                    }
                     $parentNode->setAttribute($attributeName, $data);
                 } elseif ('#' === $key) {
                     $append = $this->selectNodeType($parentNode, $data, $format, $context);
 
@@ -96,6 +96,13 @@ public function testAttributes()
             'föo_bär' => 'a',
             'Bar' => [1, 2, 3],
             'a' => 'b',
+            'scalars' => [
+                '@bool-true' => true,
+                '@bool-false' => false,
+                '@int' => 3,
+                '@float' => 3.4,
+                '@sring' => 'a',
+            ],
         ];
         $expected = '<?xml version="1.0"?>'."\n".
             '<response>'.
@@ -106,6 +113,7 @@ public function testAttributes()
             '<Bar>2</Bar>'.
             '<Bar>3</Bar>'.
             '<a>b</a>'.
+            '<scalars bool-true="1" bool-false="0" int="3" float="3.4" sring="a"/>'.
             '</response>'."\n";
         $this->assertEquals($expected, $this->encoder->encode($obj, 'xml'));
     }
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`	`}`