Create an abstract HTTP transport and extend it in all HTTP transports
This commit is contained in:
parent
08d9d43a0b
commit
3c8d63ca82
@ -13,10 +13,9 @@ namespace Symfony\Component\Mailer\Bridge\Amazon\Http;
|
|||||||
|
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
use Symfony\Component\HttpClient\HttpClient;
|
|
||||||
use Symfony\Component\Mailer\Exception\TransportException;
|
use Symfony\Component\Mailer\Exception\TransportException;
|
||||||
use Symfony\Component\Mailer\SentMessage;
|
use Symfony\Component\Mailer\SentMessage;
|
||||||
use Symfony\Component\Mailer\Transport\AbstractTransport;
|
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
|
||||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -24,11 +23,10 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
|
|||||||
*
|
*
|
||||||
* @experimental in 4.3
|
* @experimental in 4.3
|
||||||
*/
|
*/
|
||||||
class SesTransport extends AbstractTransport
|
class SesTransport extends AbstractHttpTransport
|
||||||
{
|
{
|
||||||
private const ENDPOINT = 'https://email.%region%.amazonaws.com';
|
private const ENDPOINT = 'https://email.%region%.amazonaws.com';
|
||||||
|
|
||||||
private $client;
|
|
||||||
private $accessKey;
|
private $accessKey;
|
||||||
private $secretKey;
|
private $secretKey;
|
||||||
private $region;
|
private $region;
|
||||||
@ -38,12 +36,11 @@ class SesTransport extends AbstractTransport
|
|||||||
*/
|
*/
|
||||||
public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
||||||
{
|
{
|
||||||
$this->client = $client ?? HttpClient::create();
|
|
||||||
$this->accessKey = $accessKey;
|
$this->accessKey = $accessKey;
|
||||||
$this->secretKey = $secretKey;
|
$this->secretKey = $secretKey;
|
||||||
$this->region = $region ?: 'eu-west-1';
|
$this->region = $region ?: 'eu-west-1';
|
||||||
|
|
||||||
parent::__construct($dispatcher, $logger);
|
parent::__construct($client, $dispatcher, $logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function doSend(SentMessage $message): void
|
protected function doSend(SentMessage $message): void
|
||||||
|
@ -13,10 +13,9 @@ namespace Symfony\Component\Mailer\Bridge\Mailchimp\Http;
|
|||||||
|
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
use Symfony\Component\HttpClient\HttpClient;
|
|
||||||
use Symfony\Component\Mailer\Exception\TransportException;
|
use Symfony\Component\Mailer\Exception\TransportException;
|
||||||
use Symfony\Component\Mailer\SentMessage;
|
use Symfony\Component\Mailer\SentMessage;
|
||||||
use Symfony\Component\Mailer\Transport\AbstractTransport;
|
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
|
||||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -24,18 +23,16 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
|
|||||||
*
|
*
|
||||||
* @experimental in 4.3
|
* @experimental in 4.3
|
||||||
*/
|
*/
|
||||||
class MandrillTransport extends AbstractTransport
|
class MandrillTransport extends AbstractHttpTransport
|
||||||
{
|
{
|
||||||
private const ENDPOINT = 'https://mandrillapp.com/api/1.0/messages/send-raw.json';
|
private const ENDPOINT = 'https://mandrillapp.com/api/1.0/messages/send-raw.json';
|
||||||
private $client;
|
|
||||||
private $key;
|
private $key;
|
||||||
|
|
||||||
public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
public function __construct(string $key, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
||||||
{
|
{
|
||||||
$this->key = $key;
|
$this->key = $key;
|
||||||
$this->client = $client ?? HttpClient::create();
|
|
||||||
|
|
||||||
parent::__construct($dispatcher, $logger);
|
parent::__construct($client, $dispatcher, $logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function doSend(SentMessage $message): void
|
protected function doSend(SentMessage $message): void
|
||||||
|
@ -13,10 +13,9 @@ namespace Symfony\Component\Mailer\Bridge\Mailgun\Http;
|
|||||||
|
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
use Symfony\Component\HttpClient\HttpClient;
|
|
||||||
use Symfony\Component\Mailer\Exception\TransportException;
|
use Symfony\Component\Mailer\Exception\TransportException;
|
||||||
use Symfony\Component\Mailer\SentMessage;
|
use Symfony\Component\Mailer\SentMessage;
|
||||||
use Symfony\Component\Mailer\Transport\AbstractTransport;
|
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
|
||||||
use Symfony\Component\Mime\Part\DataPart;
|
use Symfony\Component\Mime\Part\DataPart;
|
||||||
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
|
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
|
||||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
@ -26,20 +25,18 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
|
|||||||
*
|
*
|
||||||
* @experimental in 4.3
|
* @experimental in 4.3
|
||||||
*/
|
*/
|
||||||
class MailgunTransport extends AbstractTransport
|
class MailgunTransport extends AbstractHttpTransport
|
||||||
{
|
{
|
||||||
private const ENDPOINT = 'https://api.mailgun.net/v3/%domain%/messages.mime';
|
private const ENDPOINT = 'https://api.mailgun.net/v3/%domain%/messages.mime';
|
||||||
private $key;
|
private $key;
|
||||||
private $domain;
|
private $domain;
|
||||||
private $client;
|
|
||||||
|
|
||||||
public function __construct(string $key, string $domain, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
public function __construct(string $key, string $domain, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
||||||
{
|
{
|
||||||
$this->key = $key;
|
$this->key = $key;
|
||||||
$this->domain = $domain;
|
$this->domain = $domain;
|
||||||
$this->client = $client ?? HttpClient::create();
|
|
||||||
|
|
||||||
parent::__construct($dispatcher, $logger);
|
parent::__construct($client, $dispatcher, $logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function doSend(SentMessage $message): void
|
protected function doSend(SentMessage $message): void
|
||||||
|
@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Mailer\Transport\Http;
|
||||||
|
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
|
||||||
|
use Symfony\Component\HttpClient\HttpClient;
|
||||||
|
use Symfony\Component\Mailer\Transport\AbstractTransport;
|
||||||
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Victor Bocharsky <victor@symfonycasts.com>
|
||||||
|
*
|
||||||
|
* @experimental in 4.3
|
||||||
|
*/
|
||||||
|
abstract class AbstractHttpTransport extends AbstractTransport
|
||||||
|
{
|
||||||
|
protected $client;
|
||||||
|
|
||||||
|
public function __construct(HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
|
||||||
|
{
|
||||||
|
$this->client = $client;
|
||||||
|
if (null === $client) {
|
||||||
|
if (!class_exists(HttpClient::class)) {
|
||||||
|
throw new \LogicException(sprintf('You cannot use "%s" as the HttpClient component is not installed. Try running "composer require symfony/http-client".', __CLASS__));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->client = HttpClient::create();
|
||||||
|
}
|
||||||
|
|
||||||
|
parent::__construct($dispatcher, $logger);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user