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

Appearance settings

Commit a9faafe

Browse filesBrowse files
committed
Merge branch '7.2' into 7.3
* 7.2: [Messenger] Filter out non-consumable receivers when registering `ConsumeMessagesCommand` [Mailer] fix multiple transports default injection [Mailer][Postmark] Set CID for attachments when it exists
2 parents c284c6e + 6d66143 commit a9faafe
Copy full SHA for a9faafe

File tree

Expand file treeCollapse file tree

3 files changed

+10
-11
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+10
-11
lines changed

‎DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: DependencyInjection/FrameworkExtension.php
+8-5Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,13 +2361,17 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
23612361
$transportRateLimiterReferences = [];
23622362
foreach ($config['transports'] as $name => $transport) {
23632363
$serializerId = $transport['serializer'] ?? 'messenger.default_serializer';
2364+
$tags = [
2365+
'alias' => $name,
2366+
'is_failure_transport' => \in_array($name, $failureTransports, true),
2367+
];
2368+
if (str_starts_with($transport['dsn'], 'sync://')) {
2369+
$tags['is_consumable'] = false;
2370+
}
23642371
$transportDefinition = (new Definition(TransportInterface::class))
23652372
->setFactory([new Reference('messenger.transport_factory'), 'createTransport'])
23662373
->setArguments([$transport['dsn'], $transport['options'] + ['transport_name' => $name], new Reference($serializerId)])
2367-
->addTag('messenger.receiver', [
2368-
'alias' => $name,
2369-
'is_failure_transport' => \in_array($name, $failureTransports, true),
2370-
])
2374+
->addTag('messenger.receiver', $tags)
23712375
;
23722376
$container->setDefinition($transportId = 'messenger.transport.'.$name, $transportDefinition);
23732377
$senderAliases[$name] = $transportId;
@@ -2771,7 +2775,6 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
27712775
}
27722776
$transports = $config['dsn'] ? ['main' => $config['dsn']] : $config['transports'];
27732777
$container->getDefinition('mailer.transports')->setArgument(0, $transports);
2774-
$container->getDefinition('mailer.default_transport')->setArgument(0, current($transports));
27752778

27762779
$mailer = $container->getDefinition('mailer.mailer');
27772780
if (false === $messageBus = $config['message_bus']) {

‎Resources/config/mailer.php

Copy file name to clipboardExpand all lines: Resources/config/mailer.php
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@
5252
])
5353

5454
->set('mailer.default_transport', TransportInterface::class)
55-
->factory([service('mailer.transport_factory'), 'fromString'])
56-
->args([
57-
abstract_arg('env(MAILER_DSN)'),
58-
])
55+
->alias('mailer.default_transport', 'mailer.transports')
5956
->alias(TransportInterface::class, 'mailer.default_transport')
6057

6158
->set('mailer.messenger.message_handler', MessageHandler::class)

‎Tests/DependencyInjection/FrameworkExtensionTestCase.php

Copy file name to clipboardExpand all lines: Tests/DependencyInjection/FrameworkExtensionTestCase.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,8 +2156,7 @@ public function testMailer(string $configFile, array $expectedTransports, array
21562156
$this->assertTrue($container->hasAlias('mailer'));
21572157
$this->assertTrue($container->hasDefinition('mailer.transports'));
21582158
$this->assertSame($expectedTransports, $container->getDefinition('mailer.transports')->getArgument(0));
2159-
$this->assertTrue($container->hasDefinition('mailer.default_transport'));
2160-
$this->assertSame(current($expectedTransports), $container->getDefinition('mailer.default_transport')->getArgument(0));
2159+
$this->assertTrue($container->hasAlias('mailer.default_transport'));
21612160
$this->assertTrue($container->hasDefinition('mailer.envelope_listener'));
21622161
$l = $container->getDefinition('mailer.envelope_listener');
21632162
$this->assertSame('sender@example.org', $l->getArgument(0));

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.