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

Commit54eafb2

Browse files
committed
Added fixes and tests for other transports
1 parent70ee950 commit54eafb2

File tree

7 files changed

+65
-5
lines changed

7 files changed

+65
-5
lines changed

‎src/Symfony/Component/Mailer/Bridge/Mailchimp/Tests/Transport/MandrillApiTransportTest.php‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313

1414
usePHPUnit\Framework\TestCase;
1515
useSymfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillApiTransport;
16+
useSymfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridApiTransport;
17+
useSymfony\Component\Mailer\Envelope;
18+
useSymfony\Component\Mime\Address;
19+
useSymfony\Component\Mime\Email;
1620

1721
class MandrillApiTransportTestextends TestCase
1822
{
@@ -41,4 +45,22 @@ public function getTransportData()
4145
],
4246
];
4347
}
48+
49+
50+
publicfunctiontestCustomHeader()
51+
{
52+
$email =newEmail();
53+
$email->getHeaders()->addTextHeader('foo','bar');
54+
$envelope =newEnvelope(newAddress('alice@system.com'), [newAddress('bob@system.com')]);
55+
56+
$transport =newMandrillApiTransport('ACCESS_KEY');
57+
$method =new \ReflectionMethod(MandrillApiTransport::class,'getPayload');
58+
$method->setAccessible(true);
59+
$payload =$method->invoke($transport,$email,$envelope);
60+
61+
$this->assertArrayHasKey('message',$payload);
62+
$this->assertArrayHasKey('headers',$payload['message']);
63+
$this->assertCount(1,$payload['message']['headers']);
64+
$this->assertEquals('foo: bar',$payload['message']['headers'][0]);
65+
}
4466
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private function getPayload(Email $email, Envelope $envelope): array
107107
continue;
108108
}
109109

110-
$payload['message']['headers'][] =$name.':'.$header->toString();
110+
$payload['message']['headers'][] =$name.':'.$header->getBodyAsString();
111111
}
112112

113113
return$payload;

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ public function testCustomHeader()
5656
$email->getHeaders()->addTextHeader('X-Mailgun-Variables',$json);
5757
$envelope =newEnvelope(newAddress('alice@system.com'), [newAddress('bob@system.com')]);
5858

59-
$mailgun =newMailgunApiTransport('ACCESS_KEY','DOMAIN');
59+
$transport =newMailgunApiTransport('ACCESS_KEY','DOMAIN');
6060
$method =new \ReflectionMethod(MailgunApiTransport::class,'getPayload');
6161
$method->setAccessible(true);
62-
$payload =$method->invoke($mailgun,$email,$envelope);
62+
$payload =$method->invoke($transport,$email,$envelope);
6363

6464
$this->assertArrayHasKey('h:x-mailgun-variables',$payload);
6565
$this->assertEquals($json,$payload['h:x-mailgun-variables']);

‎src/Symfony/Component/Mailer/Bridge/Postmark/Tests/Transport/PostmarkApiTransportTest.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
usePHPUnit\Framework\TestCase;
1515
useSymfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkApiTransport;
16+
useSymfony\Component\Mailer\Envelope;
17+
useSymfony\Component\Mime\Address;
18+
useSymfony\Component\Mime\Email;
1619

1720
class PostmarkApiTransportTestextends TestCase
1821
{
@@ -41,4 +44,21 @@ public function getTransportData()
4144
],
4245
];
4346
}
47+
48+
publicfunctiontestCustomHeader()
49+
{
50+
$email =newEmail();
51+
$email->getHeaders()->addTextHeader('foo','bar');
52+
$envelope =newEnvelope(newAddress('alice@system.com'), [newAddress('bob@system.com')]);
53+
54+
$transport =newPostmarkApiTransport('ACCESS_KEY');
55+
$method =new \ReflectionMethod(PostmarkApiTransport::class,'getPayload');
56+
$method->setAccessible(true);
57+
$payload =$method->invoke($transport,$email,$envelope);
58+
59+
$this->assertArrayHasKey('Headers',$payload);
60+
$this->assertCount(1,$payload['Headers']);
61+
62+
$this->assertEquals(['Name'=>'foo','Value'=>'bar'],$payload['Headers'][0]);
63+
}
4464
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private function getPayload(Email $email, Envelope $envelope): array
8484

8585
$payload['Headers'][] = [
8686
'Name' =>$name,
87-
'Value' =>$header->toString(),
87+
'Value' =>$header->getBodyAsString(),
8888
];
8989
}
9090

‎src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/Transport/SendgridApiTransportTest.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
usePHPUnit\Framework\TestCase;
1515
useSymfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridApiTransport;
16+
useSymfony\Component\Mailer\Envelope;
17+
useSymfony\Component\Mime\Address;
1618
useSymfony\Component\Mime\Email;
1719
useSymfony\Contracts\HttpClient\HttpClientInterface;
1820
useSymfony\Contracts\HttpClient\ResponseInterface;
@@ -90,4 +92,20 @@ public function testSend()
9092
$mailer =newSendgridApiTransport('foo',$httpClient);
9193
$mailer->send($email);
9294
}
95+
96+
publicfunctiontestCustomHeader()
97+
{
98+
$email =newEmail();
99+
$email->getHeaders()->addTextHeader('foo','bar');
100+
$envelope =newEnvelope(newAddress('alice@system.com'), [newAddress('bob@system.com')]);
101+
102+
$transport =newSendgridApiTransport('ACCESS_KEY');
103+
$method =new \ReflectionMethod(SendgridApiTransport::class,'getPayload');
104+
$method->setAccessible(true);
105+
$payload =$method->invoke($transport,$email,$envelope);
106+
107+
$this->assertArrayHasKey('headers',$payload);
108+
$this->assertArrayHasKey('foo',$payload['headers']);
109+
$this->assertEquals('bar',$payload['headers']['foo']);
110+
}
93111
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private function getPayload(Email $email, Envelope $envelope): array
9696
continue;
9797
}
9898

99-
$payload['headers'][$name] =$header->toString();
99+
$payload['headers'][$name] =$header->getBodyAsString();
100100
}
101101

102102
return$payload;

0 commit comments

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