Accepts nested array in multipart option field value

guzzle · Oct 7, 2024 · a9a3328 · a9a3328
1 parent a70f5c9
commit a9a3328
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/src/MultipartStream.php b/src/MultipartStream.php
@@ -91,6 +91,23 @@ private function addElement(AppendStream $stream, array $element): void
             }
         }
 
+        if (is_array($element['contents'])) {
+            $prepare = function ($contents, $key, $root = null) use ($stream, &$values, &$prepare) {
+                $fieldName = $root ? sprintf('%s[%s]', $root, $key) : $key;
+
+                if (is_array($contents)) {
+                    array_walk($contents, $prepare, $fieldName);
+                    return;
+                }
+
+                $this->addElement($stream, ['name' => $fieldName, 'contents' => Utils::streamFor($contents)]);
+            };
+
+            array_walk($element['contents'], $prepare, $element['name']);
+
+            return;
+        }
+
         $element['contents'] = Utils::streamFor($element['contents']);
 
         if (empty($element['filename'])) {

diff --git a/tests/MultipartStreamTest.php b/tests/MultipartStreamTest.php
@@ -127,6 +127,35 @@ public function testSerializesNonStringFields(): void
         self::assertSame($expected, (string) $b);
     }
 
+    public function testExpandNestedArrayFields(): void
+    {
+        $b = new MultipartStream([
+            [
+                'name' => 'foo',
+                'contents' => [
+                    ['key' => 'bar'],
+                    ['key' => 'baz']
+                ]
+            ]
+        ], 'boundary');
+
+        $expected = \implode('', [
+            "--boundary\r\n",
+            "Content-Disposition: form-data; name=\"foo[0][key]\"\r\n",
+            "Content-Length: 3\r\n",
+            "\r\n",
+            "bar\r\n",
+            "--boundary\r\n",
+            "Content-Disposition: form-data; name=\"foo[1][key]\"\r\n",
+            "Content-Length: 3\r\n",
+            "\r\n",
+            "baz\r\n",
+            "--boundary--\r\n",
+        ]);
+
+        self::assertSame($expected, (string) $b);
+    }
+
     public function testSerializesFiles(): void
     {
         $f1 = Psr7\FnStream::decorate(Psr7\Utils::streamFor('foo'), [