bug #47505 [Mime] Form field values with integer keys not resolved correctly (claudiu-cristea)

nicolas-grekas · nicolas-grekas · commit 5ba304688765 · 2023-04-18T14:25:41.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Mime] Form field values with integer keys not resolved correctly | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #47504 | License | MIT | Doc PR | This should be legit: ``` new FormDataPart([ 'qux' => [ [ 'foo' => 'v1', 'baz' => 'v2', ], [ 'foo' => 'v3', 'baz' => 'v4', ], ], ]); ``` Fixes #47504 Commits ------- 923de03 [Mime] Form field values with integer keys not resolved correctly
diff --git a/src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php b/src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php
@@ -58,7 +58,7 @@ private function prepareFields(array $fields): array
         $values = [];
 
         $prepare = function ($item, $key, $root = null) use (&$values, &$prepare) {
-            if (\is_int($key) && \is_array($item)) {
+            if (null === $root && \is_int($key) && \is_array($item)) {
                 if (1 !== \count($item)) {
                     throw new InvalidArgumentException(sprintf('Form field values with integer keys can only have one array element, the key being the field name and the value being the field value, %d provided.', \count($item)));
                 }
diff --git a/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php
@@ -79,7 +79,7 @@ public function testNestedArrayParts()
                 ],
             ],
             ['quux2' => clone $p1],
-            ['quux2' => clone $p1],
+            ['quux2' => [clone $p1]],
             'quuz2' => [
                 ['corge' => clone $p1],
                 ['corge' => clone $p1],
@@ -93,6 +93,17 @@ public function testNestedArrayParts()
             ['2[1]' => clone $p1],
             ['0[0]' => clone $p1],
             ['0[1]' => clone $p1],
+
+            'qux' => [
+                [
+                    'foo' => clone $p1,
+                    'bar' => clone $p1,
+                ],
+                [
+                    'foo' => clone $p1,
+                    'bar' => clone $p1,
+                ],
+            ],
         ]);
 
         $this->assertEquals('multipart', $f->getMediaType());
@@ -127,20 +138,20 @@ public function testNestedArrayParts()
         $p9->setName('0');
 
         $parts[] = $p10 = clone $p1;
-        $p10->setName('bar2[baz]');
+        $p10->setName('bar2[0][baz]');
 
         $parts[] = $p11 = clone $p1;
         $p11->setName('bar2[baz][qux]');
 
         $parts[] = $p12 = clone $p1;
         $p12->setName('quux2');
         $parts[] = $p13 = clone $p1;
-        $p13->setName('quux2');
+        $p13->setName('quux2[0]');
 
         $parts[] = $p14 = clone $p1;
-        $p14->setName('quuz2[corge]');
+        $p14->setName('quuz2[0][corge]');
         $parts[] = $p15 = clone $p1;
-        $p15->setName('quuz2[corge]');
+        $p15->setName('quuz2[1][corge]');
 
         $parts[] = $p16 = clone $p1;
         $p16->setName('2');
@@ -162,6 +173,15 @@ public function testNestedArrayParts()
         $parts[] = $p19 = clone $p1;
         $p19->setName('0[1]');
 
+        $parts[] = $p20 = clone $p1;
+        $p20->setName('qux[0][foo]');
+        $parts[] = $p21 = clone $p1;
+        $p21->setName('qux[0][bar]');
+        $parts[] = $p22 = clone $p1;
+        $p22->setName('qux[1][foo]');
+        $parts[] = $p23 = clone $p1;
+        $p23->setName('qux[1][bar]');
+
         $this->assertEquals($parts, $f->getParts());
     }
 
@@ -177,7 +197,6 @@ public function testExceptionOnFormFieldsWithIntegerKeysAndMultipleValues()
 
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Form field values with integer keys can only have one array element, the key being the field name and the value being the field value, 2 provided.');
-
         $f->getParts();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private function prepareFields(array $fields): array`
`58`	`58`	`$values = [];`
`59`	`59`
`60`	`60`	`$prepare = function ($item, $key, $root = null) use (&$values, &$prepare) {`
`61`		`- if (\is_int($key) && \is_array($item)) {`
	`61`	`+ if (null === $root && \is_int($key) && \is_array($item)) {`
`62`	`62`	`if (1 !== \count($item)) {`
`63`	`63`	`throw new InvalidArgumentException(sprintf('Form field values with integer keys can only have one array element, the key being the field name and the value being the field value, %d provided.', \count($item)));`
`64`	`64`	`}`