From e8cff838de354aa4e91f95d601966ed298f64362 Mon Sep 17 00:00:00 2001
From: Andrey Lukin <lukin.andrej@gmail.com>
Date: Thu, 8 Aug 2019 19:07:23 +0300
Subject: [PATCH] [Mime][FormDataPart] Add support of multidimensional fields

---
 .../Mime/Part/Multipart/FormDataPart.php      | 14 +++++--
 .../Tests/Part/Multipart/FormDataPartTest.php | 39 +++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php b/src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php
index 75d69a88a08f..36bab4325a76 100644
--- a/src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php
+++ b/src/Symfony/Component/Mime/Part/Multipart/FormDataPart.php
@@ -58,11 +58,17 @@ public function getParts(): array
     private function prepareFields(array $fields): array
     {
         $values = [];
-        array_walk_recursive($fields, function ($item, $key) use (&$values) {
-            if (!\is_array($item)) {
-                $values[] = $this->preparePart($key, $item);
+        $prepare = function ($item, $key, $root = null) use (&$values, &$prepare) {
+            if (\is_array($item)) {
+                array_walk($item, $prepare, $root ?: $key);
+
+                return;
             }
-        });
+
+            $values[] = $this->preparePart($root ?: $key, $item);
+        };
+
+        array_walk($fields, $prepare);
 
         return $values;
     }
diff --git a/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php b/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php
index 127fce000a53..bf3581434859 100644
--- a/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php
+++ b/src/Symfony/Component/Mime/Tests/Part/Multipart/FormDataPartTest.php
@@ -18,6 +18,45 @@
 
 class FormDataPartTest extends TestCase
 {
+    public function testConstructorWithMultidimensionalParams()
+    {
+        $r = new \ReflectionProperty(TextPart::class, 'encoding');
+        $r->setAccessible(true);
+
+        $b = new TextPart('content');
+        $c = DataPart::fromPath($file = __DIR__.'/../../Fixtures/mimetypes/test.gif');
+        $f = new FormDataPart([
+            'foo' => [
+                $content =
+                    'very very long content that will not be cut even if the length i way more than 76 characters, ok?',
+                $content,
+            ],
+            'bar' => [
+                clone $b,
+                clone $b,
+            ],
+            'baz' => [
+                clone $c,
+                clone $c,
+            ],
+        ]);
+
+        $t = new TextPart($content, 'utf-8', 'plain', '8bit');
+        $t->setDisposition('form-data');
+        $t->setName('foo');
+        $t->getHeaders()->setMaxLineLength(PHP_INT_MAX);
+        $b->setDisposition('form-data');
+        $b->setName('bar');
+        $b->getHeaders()->setMaxLineLength(PHP_INT_MAX);
+        $r->setValue($b, '8bit');
+        $c->setDisposition('form-data');
+        $c->setName('baz');
+        $c->getHeaders()->setMaxLineLength(PHP_INT_MAX);
+        $r->setValue($c, '8bit');
+
+        $this->assertEquals([$t, $t, $b, $b, $c, $c], $f->getParts());
+    }
+
     public function testConstructor()
     {
         $r = new \ReflectionProperty(TextPart::class, 'encoding');