Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion config/messenger.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware;
use Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaListener;
use Symfony\Component\Messenger\Bridge\Doctrine\EventListener\PostgreSqlNotifyOnIdleListener;
use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransportFactory;

return static function (ContainerConfigurator $container): void {
Expand Down Expand Up @@ -51,12 +52,19 @@
->tag('messenger.transport_factory')
->args([
service('doctrine'),
service('messenger.transport.doctrine.pg_notify_on_idle_listener')->ignoreOnInvalid(),
])

->set('doctrine.orm.messenger.doctrine_schema_listener', MessengerTransportDoctrineSchemaListener::class)
->args([
tagged_iterator('messenger.receiver'),
])
->tag('doctrine.event_listener', ['event' => 'postGenerateSchema'])
->tag('doctrine.event_listener', ['event' => 'onSchemaCreateTable']);
->tag('doctrine.event_listener', ['event' => 'onSchemaCreateTable'])

->set('messenger.transport.doctrine.pg_notify_on_idle_listener', PostgreSqlNotifyOnIdleListener::class)
Comment thread
nicolas-grekas marked this conversation as resolved.
->args([
service('logger'),
])
->tag('kernel.event_subscriber');
};
5 changes: 5 additions & 0 deletions src/DependencyInjection/DoctrineExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Messenger\Bridge\Doctrine\EventListener\PostgreSqlNotifyOnIdleListener;
use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransportFactory;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
Expand Down Expand Up @@ -1434,6 +1435,10 @@ private function loadMessengerServices(ContainerBuilder $container): void
$loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
$loader->load('messenger.php');

if (! class_exists(PostgreSqlNotifyOnIdleListener::class)) {
$container->removeDefinition('messenger.transport.doctrine.pg_notify_on_idle_listener');
}

/**
* The Doctrine transport component (symfony/doctrine-messenger) is optional.
* Remove service definition, if it is not available
Expand Down
3 changes: 2 additions & 1 deletion tests/DependencyInjection/DoctrineExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,9 @@ public function testMessengerIntegrationWithDoctrineTransport(): void

$messengerTransportDoctrineFactory = $container->getDefinition('messenger.transport.doctrine.factory');

$this->assertCount(1, $messengerTransportDoctrineFactory->getArguments());
$this->assertCount(2, $messengerTransportDoctrineFactory->getArguments());
$this->assertSame('doctrine', (string) $messengerTransportDoctrineFactory->getArgument(0));
$this->assertSame('messenger.transport.doctrine.pg_notify_on_idle_listener', (string) $messengerTransportDoctrineFactory->getArgument(1));

$this->assertSame(DoctrineTransportFactory::class, $messengerTransportDoctrineFactory->getClass());

Expand Down