8000 register only existing transport factories · symfony/symfony@650c9f3 · GitHub
[go: up one dir, main page]
Skip to content

Commit 650c9f3

Browse files
xabbuhxabbuh
committed
register only existing transport factories
1 parent 2bd76fa commit 650c9f3

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@
8787
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
8888
use Symfony\Component\Messenger\MessageBus;
8989
use Symfony\Component\Messenger\MessageBusInterface;
90+
use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory;
91+
use Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory;
9092
use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
9193
use Symfony\Component\Messenger\Transport\TransportInterface;
9294
use Symfony\Component\Mime\MimeTypeGuesserInterface;
@@ -314,6 +316,16 @@ public function load(array $configs, ContainerBuilder $container)
314316
$container->removeDefinition('console.command.messenger_failed_messages_show');
315317
$container->removeDefinition('console.command.messenger_failed_messages_remove');
316318
$container->removeDefinition('cache.messenger.restart_workers_signal');
319+
320+
if ($container->hasDefinition('messenger.transport.amqp.factory') && class_exists(AmqpTransportFactory::class)) {
321+
$container->getDefinition('messenger.transport.amqp.factory')
322+
->addTag('messenger.transport_factory');
323+
}
324+
325+
if ($container->hasDefinition('messenger.transport.redis.factory') && class_exists(RedisTransportFactory::class)) {
326+
$container->getDefinition('messenger.transport.redis.factory')
327+
->addTag('messenger.transport_factory');
328+
}
317329
}
318330

319331
if ($this->httpClientConfigEnabled = $this->isConfigEnabled($container, $config['http_client'])) {
@@ -1707,6 +1719,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
17071719

17081720
$loader->load('messenger.xml');
17091721

1722+
if (class_exists(AmqpTransportFactory::class)) {
1723+
$container->getDefinition('messenger.transport.amqp.factory')->addTag('messenger.transport_factory');
1724+
}
1725+
1726+
if (class_exists(RedisTransportFactory::class)) {
1727+
$container->getDefinition('messenger.transport.redis.factory')->addTag('messenger.transport_factory');
1728+
}
1729+
17101730
if (null === $config['default_bus'] && 1 === \count($config['buses'])) {
17111731
$config['default_bus'] = key($config['buses']);
17121732
}

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,9 @@
6767
<argument type="tagged_iterator" tag="messenger.transport_factory" />
6868
</service>
6969

70-
<service id="messenger.transport.amqp.factory" class="Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory">
71-
<tag name="messenger.transport_factory" />
72-
</service>
70+
<service id="messenger.transport.amqp.factory" class="Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory"/>
7371

74-
<service id="messenger.transport.redis.factory" class="Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory">
75-
<tag name="messenger.transport_factory" />
76-
</service>
72+
<service id="messenger.transport.redis.factory" class="Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory"/>
7773

7874
<service id="messenger.transport.sync.factory" class="Symfony\Component\Messenger\Transport\Sync\SyncTransportFactory">
7975
<tag name="messenger.transport_factory" />

0 commit comments

Comments
 (0)
0