Fix minimum requirement and add Test

Author: moux2003

composer.json

@@ -17,6 +17,7 @@
  "require": {
  "php": ">=7.0.0",
  "sendgrid/sendgrid": "^7.0",
+ "sendgrid/php-http-client": "~3.9.4",
  "symfony/swiftmailer-bundle": "~3.2",
  "symfony/framework-bundle": "~2.7|~3.3|~4.0",
  "symfony/yaml": "~2.7|~3.3|~4.0"

src/Services/SendGridTransport.php

@@ -51,10 +51,18 @@ class SendGridTransport implements Swift_Transport
  */
  private $logger;
 
+ /**
+ * Http client options.
+ *
+ * @var array
+ */
+ private $httpClientOptions;
+
  public function __construct($sendGridApiKey, $sendGridCategories)
  {
  $this->sendGridApiKey = $sendGridApiKey;
  $this->sendGridCategories = $sendGridCategories;
+ $this->httpClientOptions = [];
  }
 
  public function isStarted()
@@ -161,7 +169,7 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
 
  $mail->addPersonalization($personalization);
 
- $sendGrid = new SendGrid($this->sendGridApiKey);
+ $sendGrid = new SendGrid($this->sendGridApiKey, $this->httpClientOptions);
 
  $response = $sendGrid->client->mail()->send()->post($mail);
 
@@ -193,4 +201,16 @@ public function registerPlugin(Swift_Events_EventListener $plugin)
  {
  // unused
  }
+
+ /**
+ * @param array $httpClientOptions
+ *
+ * @return self
+ */
+ public function setHttpClientOptions(array $httpClientOptions)
+ {
+ $this->httpClientOptions = $httpClientOptions;
+
+ return $this;
+ }
 }

tests/BundleInitializationTest.php

@@ -20,10 +20,6 @@ protected function setUp()
 
  // Make services public that have an idea that matches a regex
  $this->addCompilerPass(new PublicServicePass('|swiftmailer.mailer.transport.expertcoder_swift_mailer.*|'));
- }
-
- public function testInitBundle()
- {
  // Create a new Kernel
  $kernel = $this->createKernel();
 
@@ -32,7 +28,10 @@ public function testInitBundle()
 
  // Boot the kernel.
  $this->bootKernel();
+ }
 
+ public function testInitBundle()
+ {
  // Get the container
  $container = $this->getContainer();
 
@@ -45,4 +44,22 @@ public function testInitBundle()
  $this->assertTrue($container->hasParameter('expertcoder_swiftmailer_sendgrid.api_key'));
  $this->assertTrue($container->hasParameter('expertcoder_swiftmailer_sendgrid.categories'));
  }
+
+ // This help us ensure the API is well used
+ public function testSimpleMail()
+ {
+ $message = (new \Swift_Message('[Test] SwiftSendGrid'))
+ ->setFrom('noreply@swiftsendgrid.bundle')
+ ->setTo('nobody@send.grid')
+ ->setBody('Test body.', 'text/plain')
+ ;
+ $transport = $this->getContainer()->get('swiftmailer.mailer.transport.expertcoder_swift_mailer.send_grid');
+ $transport->setHttpClientOptions([
+ 'curl' => [CURLOPT_TIMEOUT => 1],
+ ]);
+ $mailer = new \Swift_Mailer($transport);
+ $result = $mailer->send($message);
+
+ $this->assertEquals(0, $mailer->send($message)); // This should gives us 0 for no email sent
+ }
 }