Merge pull request #50 from samsonasik/support-recursive-collection-upload

support recursive collection upload included into mail attachment

Author: samsonasik

spec/Handler/Writer/MailSpec.php

@@ -74,6 +74,47 @@
 
             expect($this->transport)->toReceive('send');
 
+        });
+
+        it('bring deeper multiple collection upload, then transport->send()', function () {
+
+            $writer = new Mail(
+                $this->mailMessage,
+                $this->transport,
+                [
+                    'request_method' => 'POST',
+                    'query_data'     => [],
+                    'body_data'      => ['text' => 'test'],
+                    'raw_data'       => [],
+                    'files_data'     => [
+                        "file-collection" => [
+                            'file-collection-deeper' => [
+                                'file-collection-deeper-deep' => [
+                                    [
+                                        'name'     => 'foo.html',
+                                        'tmp_name' => __DIR__ . '/../../Fixture/data/foo.html',
+                                        'error'    => 0,
+                                        'size'     => 1,
+                                        'type'     => 'text/html'
+                                    ],
+                                ],
+                            ],
+                         ],
+                     ],
+                     'cookie_data' => [],
+                ]
+            );
+
+            $r = new ReflectionProperty($this->writer, 'eventsToMail');
+            $r->setAccessible(true);
+            $r->setValue($writer, ["timestamp" => "2017-02-25T02:08:46+07:00"]);
+
+            allow($this->transport)->toReceive('send');
+
+            $writer->shutdown();
+
+            expect($this->transport)->toReceive('send');
+
         });
 
          it('transport->send() trigger error', function () {

src/Handler/Writer/Mail.php

@@ -57,14 +57,12 @@ public function shutdown() : void
             foreach ($this->requestData['files_data'] as $key => $row) {
                 if (\key($row) === 'name') {
                     // single upload
-                    $body = $this->bodyAddPart($body, $row);
+                    $body = $this->singleBodyAddPart($body, $row);
                     continue;
                 }
 
                 // collection upload
-                foreach ($row as $multiple => $upload) {
-                    $body = $this->bodyAddPart($body, $upload);
-                }
+                $body = $this->collectionBodyAddPart($body, $row);
             }
 
             $this->mail->setBody($body);
@@ -91,7 +89,7 @@ public function shutdown() : void
         }
     }
 
-    private function bodyAddPart(MimeMessage $body, array $data) : MimeMessage
+    private function singleBodyAddPart(MimeMessage $body, array $data) : MimeMessage
     {
         $mimePart              = new MimePart(\fopen($data['tmp_name'], 'r'));
         $mimePart->type        = $data['type'];
@@ -101,4 +99,18 @@ private function bodyAddPart(MimeMessage $body, array $data) : MimeMessage
 
         return $body->addPart($mimePart);
     }
+
+    private function collectionBodyAddPart(MimeMessage $body, array $data) : MimeMessage
+    {
+        foreach ($data as $multiple => $upload) {
+            if (\key($upload) === 'name') {
+                $body = $this->singleBodyAddPart($body, $upload);
+                continue;
+            }
+
+            $body = $this->collectionBodyAddPart($body, $upload);
+        }
+
+        return $body;
+    }
 }