-
Notifications
You must be signed in to change notification settings - Fork 11.7k
[9.x] Add SesTransport decorator #40685
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| <?php | ||
|
|
||
| namespace Illuminate\Mail\Transport; | ||
|
|
||
| use InvalidArgumentException; | ||
| use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport; | ||
| use Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport; | ||
| use Symfony\Component\Mailer\Envelope; | ||
| use Symfony\Component\Mailer\SentMessage; | ||
| use Symfony\Component\Mailer\Transport\TransportInterface; | ||
| use Symfony\Component\Mime\Email; | ||
| use Symfony\Component\Mime\RawMessage; | ||
|
|
||
| class SesTransport implements TransportInterface | ||
| { | ||
| /** | ||
| * The Amazon SES Symfony transport. | ||
| * | ||
| * @var \Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport|\Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport | ||
| */ | ||
| protected $transport; | ||
|
|
||
| /** | ||
| * The Amazon SES transmission options. | ||
| * | ||
| * @var array | ||
| */ | ||
| protected $options; | ||
|
|
||
| /** | ||
| * Create a new SES transport instance. | ||
| * | ||
| * @param \Symfony\Component\Mailer\Bridge\Amazon\Transport\SesApiAsyncAwsTransport|\Symfony\Component\Mailer\Bridge\Amazon\Transport\SesHttpAsyncAwsTransport $transport | ||
| * @param array $options | ||
| * @return void | ||
| */ | ||
| public function __construct(TransportInterface $transport, array $options = []) | ||
| { | ||
| if (! $transport instanceof SesApiAsyncAwsTransport || ! $transport instanceof SesHttpAsyncAwsTransport) { | ||
| throw new InvalidArgumentException( | ||
| 'The SesTransport only accepts a SesHttpAsyncAwsTransport or a SesApiAsyncAwsTransport.' | ||
| ); | ||
| } | ||
|
|
||
| $this->transport = $transport; | ||
| $this->options = $options; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function send(RawMessage $message, ?Envelope $envelope = null): ?SentMessage | ||
| { | ||
| if ($message instanceof Email) { | ||
| if (isset($this->options['ConfigurationSetName'])) { | ||
| $message->getHeaders()->addTextHeader( | ||
| 'X-SES-CONFIGURATION-SET', $this->options['ConfigurationSetName'] | ||
| ); | ||
| } | ||
|
|
||
| if (isset($this->options['FromEmailAddressIdentityArn'])) { | ||
| $message->getHeaders()->addTextHeader( | ||
| 'X-SES-SOURCE-ARN', $this->options['FromEmailAddressIdentityArn'] | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| return $this->transport->send($message, $envelope); | ||
| } | ||
|
|
||
| /** | ||
| * Get the string representation of the transport. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function __toString(): string | ||
| { | ||
| return $this->transport->__toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Get the transmission options being used by the transport. | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getOptions() | ||
| { | ||
| return $this->options; | ||
| } | ||
|
|
||
| /** | ||
| * Set the transmission options being used by the transport. | ||
| * | ||
| * @param array $options | ||
| * @return array | ||
| */ | ||
| public function setOptions(array $options) | ||
| { | ||
| return $this->options = $options; | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since Laravel 9 requires PHP 8, couldn't the type-hint here be
SesApiAsyncAwsTransport|SesHttpAsyncAwsTransportinstead and remove the exception below?