Merge pull request #1715 from oleg-andreyev/remove-schema-listener

doctrine · Oct 24, 2023 · 989b9d2 · 989b9d2
2 parents a24a4ab + 4663a6a
commit 989b9d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -1148,6 +1148,8 @@ private function loadMessengerServices(ContainerBuilder $container): void
         }
 
         $container->removeDefinition('messenger.transport.doctrine.factory');
+        $container->removeDefinition('doctrine.orm.messenger.doctrine_schema_subscriber');
+        $container->removeDefinition('doctrine.orm.messenger.doctrine_schema_listener');
     }
 
     private function createArrayAdapterCachePool(ContainerBuilder $container, string $objectManagerName, string $cacheName): string

diff --git a/Resources/config/messenger.xml b/Resources/config/messenger.xml
@@ -38,19 +38,19 @@
             <argument type="service" id="logger" />
         </service>
 
+        <service id="doctrine.orm.messenger.event_subscriber.doctrine_clear_entity_manager" class="Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber" public="false">
+            <tag name="kernel.event_subscriber" />
+            <argument type="service" id="doctrine" />
+        </service>
+
         <!--
-        The following service is removed conditionally in DoctrineExtension, if symfony/doctrine-messenger is not installed.
+        The services below will be removed conditionally in DoctrineExtension, if symfony/doctrine-messenger is not installed.
         -->
         <service id="messenger.transport.doctrine.factory" class="Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransportFactory" public="false">
             <argument type="service" id="doctrine" />
             <tag name="messenger.transport_factory" />
         </service>
 
-        <service id="doctrine.orm.messenger.event_subscriber.doctrine_clear_entity_manager" class="Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber" public="false">
-            <tag name="kernel.event_subscriber" />
-            <argument type="service" id="doctrine" />
-        </service>
-
         <service id="doctrine.orm.messenger.doctrine_schema_subscriber" class="Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaSubscriber">
             <argument type="tagged" tag="messenger.receiver" />
             <tag name="doctrine.event_subscriber" />

diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -1069,6 +1069,8 @@ public function testMessengerIntegrationWithoutDoctrineTransport(): void
         $extension->load([$config], $container);
 
         $this->assertFalse($container->hasDefinition('messenger.transport.doctrine.factory'));
+        $this->assertFalse($container->hasDefinition('doctrine.orm.messenger.doctrine_schema_subscriber'));
+        $this->assertFalse($container->hasDefinition('doctrine.orm.messenger.doctrine_schema_listener'));
         $this->assertNotContains('messenger.transport_factory', $container->findTags());
     }