Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb07df9d

Browse files
committed
feature#33562 [Mailer] rename SmtpEnvelope to Envelope (xabbuh)
This PR was merged into the 4.4 branch.Discussion----------[Mailer] rename SmtpEnvelope to Envelope| Q | A| ------------- | ---| Branch? | 4.4| Bug fix? | no| New feature? | no| Deprecations? | no| Tickets || License | MIT| Doc PR |Drop the Smtp prefix so that arbitrary transports do not have to dependon SMTP specific concepts.Commits-------5e2c6da rename SmtpEnvelope to Envelope
2 parents6e7182f +5e2c6da commitb07df9d

24 files changed

+67
-65
lines changed

‎src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespaceSymfony\Component\Mailer\Bridge\Amazon\Transport;
1313

1414
usePsr\Log\LoggerInterface;
15+
useSymfony\Component\Mailer\Envelope;
1516
useSymfony\Component\Mailer\Exception\HttpTransportException;
16-
useSymfony\Component\Mailer\SmtpEnvelope;
1717
useSymfony\Component\Mailer\Transport\AbstractApiTransport;
1818
useSymfony\Component\Mime\Email;
1919
useSymfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -48,7 +48,7 @@ public function __toString(): string
4848
returnsprintf('ses+api://%s@%s',$this->accessKey,$this->getEndpoint());
4949
}
5050

51-
protectedfunctiondoSendApi(Email$email,SmtpEnvelope$envelope):ResponseInterface
51+
protectedfunctiondoSendApi(Email$email,Envelope$envelope):ResponseInterface
5252
{
5353
$date =gmdate('D, d M Y H:i:s e');
5454
$auth =sprintf('AWS3-HTTPS AWSAccessKeyId=%s,Algorithm=HmacSHA256,Signature=%s',$this->accessKey,$this->getSignature($date));
@@ -81,7 +81,7 @@ private function getSignature(string $string): string
8181
returnbase64_encode(hash_hmac('sha256',$string,$this->secretKey,true));
8282
}
8383

84-
privatefunctiongetPayload(Email$email,SmtpEnvelope$envelope):array
84+
privatefunctiongetPayload(Email$email,Envelope$envelope):array
8585
{
8686
if ($email->getAttachments()) {
8787
return [

‎src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespaceSymfony\Component\Mailer\Bridge\Mailchimp\Transport;
1313

1414
usePsr\Log\LoggerInterface;
15+
useSymfony\Component\Mailer\Envelope;
1516
useSymfony\Component\Mailer\Exception\HttpTransportException;
16-
useSymfony\Component\Mailer\SmtpEnvelope;
1717
useSymfony\Component\Mailer\Transport\AbstractApiTransport;
1818
useSymfony\Component\Mime\Email;
1919
useSymfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -41,7 +41,7 @@ public function __toString(): string
4141
returnsprintf('mandrill+api://%s',$this->getEndpoint());
4242
}
4343

44-
protectedfunctiondoSendApi(Email$email,SmtpEnvelope$envelope):ResponseInterface
44+
protectedfunctiondoSendApi(Email$email,Envelope$envelope):ResponseInterface
4545
{
4646
$response =$this->client->request('POST','https://'.$this->getEndpoint().'/api/1.0/messages/send.json', [
4747
'json' =>$this->getPayload($email,$envelope),
@@ -64,7 +64,7 @@ private function getEndpoint(): ?string
6464
return ($this->host ?:self::HOST).($this->port ?':'.$this->port :'');
6565
}
6666

67-
privatefunctiongetPayload(Email$email,SmtpEnvelope$envelope):array
67+
privatefunctiongetPayload(Email$email,Envelope$envelope):array
6868
{
6969
$payload = [
7070
'key' =>$this->key,
@@ -105,7 +105,7 @@ private function getPayload(Email $email, SmtpEnvelope $envelope): array
105105
return$payload;
106106
}
107107

108-
protectedfunctiongetRecipients(Email$email,SmtpEnvelope$envelope):array
108+
protectedfunctiongetRecipients(Email$email,Envelope$envelope):array
109109
{
110110
$recipients = [];
111111
foreach ($envelope->getRecipients()as$recipient) {

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespaceSymfony\Component\Mailer\Bridge\Mailgun\Transport;
1313

1414
usePsr\Log\LoggerInterface;
15+
useSymfony\Component\Mailer\Envelope;
1516
useSymfony\Component\Mailer\Exception\HttpTransportException;
16-
useSymfony\Component\Mailer\SmtpEnvelope;
1717
useSymfony\Component\Mailer\Transport\AbstractApiTransport;
1818
useSymfony\Component\Mime\Email;
1919
useSymfony\Component\Mime\Part\Multipart\FormDataPart;
@@ -46,7 +46,7 @@ public function __toString(): string
4646
returnsprintf('mailgun+api://%s?domain=%s',$this->getEndpoint(),$this->domain);
4747
}
4848

49-
protectedfunctiondoSendApi(Email$email,SmtpEnvelope$envelope):ResponseInterface
49+
protectedfunctiondoSendApi(Email$email,Envelope$envelope):ResponseInterface
5050
{
5151
$body =newFormDataPart($this->getPayload($email,$envelope));
5252
$headers = [];
@@ -72,7 +72,7 @@ protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInte
7272
return$response;
7373
}
7474

75-
privatefunctiongetPayload(Email$email,SmtpEnvelope$envelope):array
75+
privatefunctiongetPayload(Email$email,Envelope$envelope):array
7676
{
7777
$headers =$email->getHeaders();
7878
$html =$email->getHtmlBody();

‎src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespaceSymfony\Component\Mailer\Bridge\Postmark\Transport;
1313

1414
usePsr\Log\LoggerInterface;
15+
useSymfony\Component\Mailer\Envelope;
1516
useSymfony\Component\Mailer\Exception\HttpTransportException;
16-
useSymfony\Component\Mailer\SmtpEnvelope;
1717
useSymfony\Component\Mailer\Transport\AbstractApiTransport;
1818
useSymfony\Component\Mime\Email;
1919
useSymfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -41,7 +41,7 @@ public function __toString(): string
4141
returnsprintf('postmark+api://%s',$this->getEndpoint());
4242
}
4343

44-
protectedfunctiondoSendApi(Email$email,SmtpEnvelope$envelope):ResponseInterface
44+
protectedfunctiondoSendApi(Email$email,Envelope$envelope):ResponseInterface
4545
{
4646
$response =$this->client->request('POST','https://'.$this->getEndpoint().'/email', [
4747
'headers' => [
@@ -60,7 +60,7 @@ protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInte
6060
return$response;
6161
}
6262

63-
privatefunctiongetPayload(Email$email,SmtpEnvelope$envelope):array
63+
privatefunctiongetPayload(Email$email,Envelope$envelope):array
6464
{
6565
$payload = [
6666
'From' =>$envelope->getSender()->toString(),

‎src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespaceSymfony\Component\Mailer\Bridge\Sendgrid\Transport;
1313

1414
usePsr\Log\LoggerInterface;
15+
useSymfony\Component\Mailer\Envelope;
1516
useSymfony\Component\Mailer\Exception\HttpTransportException;
16-
useSymfony\Component\Mailer\SmtpEnvelope;
1717
useSymfony\Component\Mailer\Transport\AbstractApiTransport;
1818
useSymfony\Component\Mime\Address;
1919
useSymfony\Component\Mime\Email;
@@ -42,7 +42,7 @@ public function __toString(): string
4242
returnsprintf('sendgrid+api://%s',$this->getEndpoint());
4343
}
4444

45-
protectedfunctiondoSendApi(Email$email,SmtpEnvelope$envelope):ResponseInterface
45+
protectedfunctiondoSendApi(Email$email,Envelope$envelope):ResponseInterface
4646
{
4747
$response =$this->client->request('POST','https://'.$this->getEndpoint().'/v3/mail/send', [
4848
'json' =>$this->getPayload($email,$envelope),
@@ -58,7 +58,7 @@ protected function doSendApi(Email $email, SmtpEnvelope $envelope): ResponseInte
5858
return$response;
5959
}
6060

61-
privatefunctiongetPayload(Email$email,SmtpEnvelope$envelope):array
61+
privatefunctiongetPayload(Email$email,Envelope$envelope):array
6262
{
6363
$addressStringifier =function (Address$address) {return ['email' =>$address->toString()]; };
6464

‎src/Symfony/Component/Mailer/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ CHANGELOG
44
4.4.0
55
-----
66

7+
*[BC BREAK] renamed`SmtpEnvelope` to`Envelope`, renamed`DelayedSmtpEnvelope` to
8+
`DelayedEnvelope`
79
*[BC BREAK] changed the syntax for failover and roundrobin DSNs
810

911
Before:

‎src/Symfony/Component/Mailer/DelayedSmtpEnvelope.php‎renamed to ‎src/Symfony/Component/Mailer/DelayedEnvelope.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
* @internal
2323
*/
24-
finalclassDelayedSmtpEnvelopeextendsSmtpEnvelope
24+
finalclassDelayedEnvelopeextendsEnvelope
2525
{
2626
private$senderSet =false;
2727
private$recipientsSet =false;

‎src/Symfony/Component/Mailer/SmtpEnvelope.php‎renamed to ‎src/Symfony/Component/Mailer/Envelope.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @author Fabien Potencier <fabien@symfony.com>
2121
*/
22-
classSmtpEnvelope
22+
classEnvelope
2323
{
2424
private$sender;
2525
private$recipients = [];
@@ -39,7 +39,7 @@ public static function create(RawMessage $message): self
3939
thrownewLogicException('Cannot send a RawMessage instance without an explicit Envelope.');
4040
}
4141

42-
returnnewDelayedSmtpEnvelope($message);
42+
returnnewDelayedEnvelope($message);
4343
}
4444

4545
publicfunctionsetSender(Address$sender):void

‎src/Symfony/Component/Mailer/Event/MessageEvent.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespaceSymfony\Component\Mailer\Event;
1313

1414
useSymfony\Component\EventDispatcher\Event;
15-
useSymfony\Component\Mailer\SmtpEnvelope;
15+
useSymfony\Component\Mailer\Envelope;
1616
useSymfony\Component\Mime\RawMessage;
1717

1818
/**
@@ -27,7 +27,7 @@ final class MessageEvent extends Event
2727
private$transport;
2828
private$queued;
2929

30-
publicfunction__construct(RawMessage$message,SmtpEnvelope$envelope,string$transport,bool$queued =false)
30+
publicfunction__construct(RawMessage$message,Envelope$envelope,string$transport,bool$queued =false)
3131
{
3232
$this->message =$message;
3333
$this->envelope =$envelope;

‎src/Symfony/Component/Mailer/Mailer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(TransportInterface $transport, MessageBusInterface $
3434
$this->dispatcher =$dispatcher;
3535
}
3636

37-
publicfunctionsend(RawMessage$message,SmtpEnvelope$envelope =null):void
37+
publicfunctionsend(RawMessage$message,Envelope$envelope =null):void
3838
{
3939
if (null ===$this->bus) {
4040
$this->transport->send($message,$envelope);
@@ -44,7 +44,7 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): void
4444

4545
if (null !==$this->dispatcher) {
4646
$message =clone$message;
47-
$envelope =null !==$envelope ?clone$envelope :SmtpEnvelope::create($message);
47+
$envelope =null !==$envelope ?clone$envelope :Envelope::create($message);
4848
$event =newMessageEvent($message,$envelope, (string)$this->transport,true);
4949
$this->dispatcher->dispatch($event);
5050
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp