feature #42219 [Mailer] Add support of ping_threshold to SesTransportFactory (Tyraelqp)

fabpot · fabpot · commit ff545130e0e1 · 2021-07-26T10:07:05.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Mailer] Add support of ping_threshold to SesTransportFactory | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | Yes | Deprecations? | no | Tickets | Fix #39044 | License | MIT | Doc PR | symfony/symfony-docs#15557 Added support of ping_threshold option to `SesTransportFactory` for `ses+smtp` and `ses+smtps` schemes. Needed because SES closes SMTP connection after 10 seconds of inactivity and `TransportException` will be thrown on next send: `Expected response code "250" but got code "451", with message "451 4.4.2 Timeout waiting for data from client.".` Commits ------- 2e50135 [Mailer] Add support of ping_threshold to SesTransportFactory
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesTransportFactoryTest.php
@@ -116,6 +116,11 @@ public function createProvider(): iterable
             new Dsn('ses+smtps', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1']),
             new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger),
         ];
+
+        yield [
+            new Dsn('ses+smtps', 'default', self::USER, self::PASSWORD, null, ['region' => 'eu-west-1', 'ping_threshold' => '10']),
+            (new SesSmtpTransport(self::USER, self::PASSWORD, 'eu-west-1', $dispatcher, $logger))->setPingThreshold(10),
+        ];
     }
 
     public function unsupportedSchemeProvider(): iterable
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesTransportFactory.php
@@ -30,7 +30,13 @@ public function create(Dsn $dsn): TransportInterface
         $region = $dsn->getOption('region');
 
         if ('ses+smtp' === $scheme || 'ses+smtps' === $scheme) {
-            return new SesSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $region, $this->dispatcher, $this->logger);
+            $transport = new SesSmtpTransport($this->getUser($dsn), $this->getPassword($dsn), $region, $this->dispatcher, $this->logger);
+
+            if (null !== $pingThreshold = $dsn->getOption('ping_threshold')) {
+                $transport->setPingThreshold((int) $pingThreshold);
+            }
+
+            return $transport;
         }
 
         switch ($scheme) {
