Merge branch '4.4' into 5.4

* 4.4: [BrowserKit] Merge fields and files recursively if they are multidimensional array [Serializer] Fix XmlEncoder encoding attribute false
symfony · Jul 27, 2022 · 443f8c3 · 443f8c3
2 parents 447b7ef + 2f4e11f
commit 443f8c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Encoder/XmlEncoder.php b/Encoder/XmlEncoder.php
@@ -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);

diff --git a/Tests/Encoder/XmlEncoderTest.php b/Tests/Encoder/XmlEncoderTest.php
@@ -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'));
     }