From 47956627ba189c51d1ddb905497c84a6aac47db8 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sat, 21 Jul 2018 17:21:44 +0700 Subject: [PATCH] handle for whatever reason upload file input named "name" --- spec/Handler/Writer/MailSpec.php | 11 +++++++++++ src/Handler/Writer/Mail.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/spec/Handler/Writer/MailSpec.php b/spec/Handler/Writer/MailSpec.php index 53cab826..4639b783 100644 --- a/spec/Handler/Writer/MailSpec.php +++ b/spec/Handler/Writer/MailSpec.php @@ -59,6 +59,17 @@ 'type' => 'text/html' ], ], + "file-collection2" => [ + "name" => [ + [ + 'name' => 'foo.html', + 'tmp_name' => __DIR__ . '/../../Fixture/data/foo.html', + 'error' => 0, + 'size' => 1, + 'type' => 'text/html' + ] + ], + ], ], 'cookie_data' => [], ] diff --git a/src/Handler/Writer/Mail.php b/src/Handler/Writer/Mail.php index d4507acc..02d0665a 100644 --- a/src/Handler/Writer/Mail.php +++ b/src/Handler/Writer/Mail.php @@ -93,7 +93,7 @@ private function singleBodyAddPart(MimeMessage $body, array $data) : MimeMessage private function bodyAddPart(MimeMessage $body, array $data) : MimeMessage { foreach ($data as $upload) { - if (\key($upload) === 'name') { + if (\key($upload) === 'name' && ! is_array($upload['name'])) { $body = $this->singleBodyAddPart($body, $upload); continue; }