Fix count error when no 'cc', 'bcc' or 'to' fields are set

Author: moux2003

src/Services/SendGridTransport.php

@@ -3,14 +3,14 @@
 namespace ExpertCoder\Swiftmailer\SendGridBundle\Services;
 
 use finfo;
+use Psr\Log\LoggerInterface;
 use SendGrid;
+use Swift_Events_EventDispatcher;
 use Swift_Events_EventListener;
+use Swift_Events_SendEvent;
 use Swift_Mime_Attachment;
 use Swift_Mime_SimpleMessage;
 use Swift_Transport;
-use Swift_Events_EventDispatcher;
-use Swift_Events_SendEvent;
-use Psr\Log\LoggerInterface;
 
 class SendGridTransport implements Swift_Transport
 {
@@ -70,11 +70,22 @@ class SendGridTransport implements Swift_Transport
 
     /**
      * Some header keys are reserved. You may not include any of the following reserved keys
-     * (From SendGrid docs)
+     *
+     * @see https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html#-Headers-Errors
      */
     const RESERVED_KEYWORDS = [
-        'X-SG-ID', 'X-SG-EID', 'RECEIVED', 'DKIM-SIGNATURE', 'CONTENT-TYPE', 'CONTENT-TRANSFER-ENCODING',
-        'TO', 'FROM', 'SUBJECT', 'REPLY-TO', 'CC', 'BCC'
+        'X-SG-ID',
+        'X-SG-EID',
+        'RECEIVED',
+        'DKIM-SIGNATURE',
+        'CONTENT-TYPE',
+        'CONTENT-TRANSFER-ENCODING',
+        'TO',
+        'FROM',
+        'SUBJECT',
+        'REPLY-TO',
+        'CC',
+        'BCC',
     ];
 
     public function __construct(Swift_Events_EventDispatcher $eventDispatcher, $sendGridApiKey, $sendGridCategories)
@@ -260,7 +271,7 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
         }
 
         if ($evt) {
-            if ($sent == count($toArr) + count($ccArr) + count($bccArr)) {
+            if ($sent == count($toArr ?? []) + count($ccArr ?? []) + count($bccArr ?? [])) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
             } elseif ($sent > 0) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);

tests/BundleInitializationTest.php

@@ -2,10 +2,11 @@
 
 namespace ExpertCoder\Swiftmailer\SendGridBundle\Tests;
 
-use Nyholm\BundleTest\BaseBundleTestCase;
-use Nyholm\BundleTest\CompilerPass\PublicServicePass;
 use ExpertCoder\Swiftmailer\SendGridBundle\ExpertCoderSwiftmailerSendGridBundle;
 use ExpertCoder\Swiftmailer\SendGridBundle\Services\SendGridTransport;
+use Nyholm\BundleTest\BaseBundleTestCase;
+use Nyholm\BundleTest\CompilerPass\PublicServicePass;
+use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
 
 class BundleInitializationTest extends BaseBundleTestCase
 {
@@ -22,6 +23,7 @@ protected function setUp()
         $this->addCompilerPass(new PublicServicePass('|swiftmailer.mailer.transport.expertcoder_swift_mailer.*|'));
         // Create a new Kernel
         $kernel = $this->createKernel();
+        $kernel->addBundle(SwiftmailerBundle::class);
 
         // Add some configuration
         $kernel->addConfigFile(__DIR__.'/config_test.yml');
@@ -60,6 +62,6 @@ public function testSimpleMail()
         $mailer = new \Swift_Mailer($transport);
         $result = $mailer->send($message);
 
-        $this->assertEquals(0, $mailer->send($message)); // This should gives us 0 for no email sent
+        $this->assertSame(0, $mailer->send($message)); // This should gives us 0 for no email sent
     }
 }