Skip to content

Commit 6dec145

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: (21 commits) [FrameworkBundle] Add missing `not-compromised-password` entry in XSD [AssetMapper] Fix CssCompiler matches url in comments Add support for doctrine/persistence 4 fix(sweego): Fix channel parameter value to fixed value for Mailer and Notifier Transports Ensure TransportExceptionInterface populates stream debug data Fix typo in validators.sk.xlf [Mime] Fix body validity check in `Email` when using `Message::setBody()` Review Arabic translations for the validator Fixed mistakes in proper hebrew writing in the previous translation and confirmed the rest to be correct and in the same style. Review translation [Cache] Don't clear system caches on cache:clear [FrameworkBundle] Fix patching refs to the tmp warmup dir in files generated by optional cache warmers [Config] Add missing json_encode flag when creating .meta.json files Mark Czech Validator translation as reviewed [PropertyInfo] Fix `TypeTest` duplicated assert [Validator] Fix `Url` constraint attribute assertion convert legacy types to TypeInfo types if getType() is not implemented [HtmlSanitizer] Avoid accessing non existent array key when checking for hosts validity [Messenger ] Extract retry delay from nested `RecoverableExceptionInterface` Update validators.ar.xlf ...
2 parents aa3860f + 16dcc4b commit 6dec145

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Tests/Transport/SweegoApiTransportTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ public function testSend()
110110
$this->assertSame('https://api.sweego.io:8984/send', $url);
111111
$this->assertStringContainsString('Accept: */*', $options['headers'][2] ?? $options['request_headers'][1]);
112112

113+
$payload = json_decode($options['body'], true);
114+
$this->assertSame('email', $payload['channel']);
115+
113116
return new JsonMockResponse(['transaction_id' => 'foobar'], [
114117
'http_code' => 200,
115118
]);

Transport/SweegoApiTransport.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ private function getPayload(Email $email, Envelope $envelope): array
9090
'from' => $this->formatAddress($envelope->getSender()),
9191
'subject' => $email->getSubject(),
9292
'campaign-type' => 'transac',
93+
'channel' => 'email',
9394
];
9495

9596
if ($email->getTextBody()) {

0 commit comments

Comments
 (0)