Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/MultipartStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,24 @@ private function addElement(AppendStream $stream, array $element): void
}
}

if (is_array($element['contents'])) {
$prepare = function ($contents, $key, $root = null) use ($stream, &$prepare): void {
$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'])) {
Expand Down
29 changes: 29 additions & 0 deletions tests/MultipartStreamTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'), [
Expand Down
SYSTEM_READY >> ...MS