WIP

Author: leeovery

src/SendInBlueTransport.php

@@ -2,7 +2,6 @@
 
 namespace Leeovery\LaravelSendInBlue;
 
-use Swift_MimePart;
 use Swift_Mime_SimpleMessage;
 use SendinBlue\Client\Api\SMTPApi;
 use Illuminate\Mail\Transport\Transport;
@@ -37,6 +36,7 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
 
         $recipients = $this->getRecipients($message);
 
+        $message->setCc([]);
         $message->setBcc([]);
 
         $response = $this->client->sendTransacEmail(
@@ -52,8 +52,34 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
         return $this->numberOfRecipients($message);
     }
 
+    /**
+     * Get all the addresses this message should be sent to.
+     *
+     * @param  Swift_Mime_SimpleMessage  $message
+     * @return array
+     */
+    protected function getRecipients(Swift_Mime_SimpleMessage $message)
+    {
+        $recipients = [];
+
+        foreach ((array) $message->getTo() as $email => $name) {
+            $recipients['to'][] = compact('email', 'name');
+        }
+
+        foreach ((array) $message->getCc() as $email => $name) {
+            $recipients['cc'][] = compact('email', 'name');
+        }
+
+        foreach ((array) $message->getBcc() as $email => $name) {
+            $recipients['bcc'][] = compact('email', 'name');
+        }
+
+        return $recipients;
+    }
+
     /**
      * @param  Swift_Mime_SimpleMessage  $message
+     * @param  array                     $recipients
      * @return SendSmtpEmail
      */
     private function buildPayload(Swift_Mime_SimpleMessage $message, $recipients): SendSmtpEmail
@@ -69,37 +95,17 @@ private function buildPayload(Swift_Mime_SimpleMessage $message, $recipients): S
                 'name'  => current($from),
                 'email' => key($from),
             ],
-            'to'          => $recipients,
+            'to'          => $recipients['to'],
+            'cc'          => $recipients['cc'] ?? [],
+            'bcc'         => $recipients['bcc'] ?? [],
             'htmlContent' => $message->getBody(),
             //'textContent' => '',
             'subject'     => $message->getSubject(),
         ]);
     }
 
-    /**
-     * Get all the addresses this message should be sent to.
-     *
-     * Note that SparkPost still respects CC, BCC headers in raw message itself.
-     *
-     * @param  Swift_Mime_SimpleMessage  $message
-     * @return array
-     */
-    protected function getRecipients(Swift_Mime_SimpleMessage $message)
+    public function sibClient(): SMTPApi
     {
-        $recipients = [];
-
-        foreach ((array) $message->getTo() as $email => $name) {
-            $recipients[] = compact('name', 'email');
-        }
-
-        foreach ((array) $message->getCc() as $email => $name) {
-            $recipients[] = compact('name', 'email');
-        }
-
-        foreach ((array) $message->getBcc() as $email => $name) {
-            $recipients[] = compact('name', 'email');
-        }
-
-        return $recipients;
+        return $this->client;
     }
 }

tests/ExampleTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Leeovery\LaravelSendInBlue\Tests;
+
+use Swift_Message;
+use Orchestra\Testbench\TestCase;
+use SendinBlue\Client\Api\SMTPApi;
+use SendinBlue\Client\Model\SendSmtpEmail;
+use SendinBlue\Client\Model\CreateSmtpEmail;
+use Leeovery\LaravelSendInBlue\SendInBlueTransport;
+
+class MailSendInBlueTransportTest extends TestCase
+{
+    public function testSend()
+    {
+        $message = new Swift_Message('Foo subject', 'Bar body');
+        $message->setSender('[email protected]');
+        $message->setTo('[email protected]');
+        $message->setCc('[email protected]');
+
+        $client = $this->getMockBuilder(SMTPApi::class)
+                       ->setMethods(['sendTransacEmail'])
+                       ->disableOriginalConstructor()
+                       ->getMock();
+
+        $transport = new SendInBlueTransport($client);
+
+        $input = new SendSmtpEmail([
+            'sender'      => [
+                'name'  => null,
+                'email' => '[email protected]',
+            ],
+            'replyTo'     => [
+                'name'  => null,
+                'email' => '[email protected]',
+            ],
+            'to'          => [
+                ['name' => null, 'email' => '[email protected]'],
+            ],
+            'cc'          => [
+                ['name' => null, 'email' => '[email protected]'],
+            ],
+            'bcc'         => [],
+            'htmlContent' => $message->getBody(),
+            'subject'     => 'Foo subject',
+        ]);
+
+        $client->expects($this->once())
+               ->method('sendTransacEmail')
+               ->with($input)
+               ->willReturn(new CreateSmtpEmail(['messageId' => '123']));
+
+        $transport->send($message);
+    }
+}