Skip to content

Commit 01d935a

Browse files
Merge branch '7.4' into 8.0
* 7.4: [ObjectMapper] do not require mapping a target's required promoted property when not on source (#2) run tests with PHPUnit 12.3 [GitHub] Update .github/PULL_REQUEST_TEMPLATE.md to remove SF 7.2 as it's not supported anymore [CI] fixed the Intl data tests actions Tests fails due to unknown option -v which is shorthand of the --verbose as per the phpunit its removed without any replacement sebastianbergmann/phpunit#5647 (comment) [Mailer] Fix expected exception message to include quotes around "http(s)://" [WebProfilerBundle] Fix toolbar not rendering after replacing it [Validator] (60455) Validate translations for Arabic (ar) (60474) Remove translation state attribute for Twig template validator in Ukrainian translation [VarDumper] Fix dumping objects from the DOM extension [Mailer] Add MicrosoftGraph API Transport [Yaml] Fix code style [Tests] Adapt testAddHtmlContentWithErrors to be HTML5 compliant Add friendly name in the `to` field [ObjectMapper] read source metadata before transform [HtmlSanitizer] Fix force_attributes not replacing existing attribute in initial data
2 parents 50ddda5 + 3c1761d commit 01d935a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Transport/ResendApiTransportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function testSendForIdnDomains()
151151

152152
$body = json_decode($options['body'], true);
153153
// to
154-
$this->assertSame('[email protected]', $body['to'][0]);
154+
$this->assertSame('Kältetechnik Xyz <[email protected]>', $body['to'][0]);
155155
// sender
156156
$this->assertStringContainsString('[email protected]', $body['from']);
157157
$this->assertStringContainsString('Kältetechnik Xyz', $body['from']);

Transport/ResendApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private function formatAddresses(array $addresses): array
8282
{
8383
$formattedAddresses = [];
8484
foreach ($addresses as $address) {
85-
$formattedAddresses[] = $address->getEncodedAddress();
85+
$formattedAddresses[] = $this->formatAddress($address);
8686
}
8787

8888
if (\count($formattedAddresses) > 50) {

0 commit comments

Comments
 (0)