Remove legacy workarounds for Messenger integration

doctrine · Nov 16, 2018 · 612cea7 · 612cea7
1 parent f65455e
commit 612cea7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 115 deletions.
diff --git a/DependencyInjection/Compiler/MessengerPass.php b/DependencyInjection/Compiler/MessengerPass.php
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -11,7 +11,7 @@
 use LogicException;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
 use Symfony\Bridge\Doctrine\Form\Type\DoctrineType;
-use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddlewareFactory;
+use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware;
 use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
@@ -393,13 +393,10 @@ protected function ormLoad(array $config, ContainerBuilder $container)
                 ->addTag(ServiceRepositoryCompilerPass::REPOSITORY_SERVICE_TAG);
         }
 
-        // If the Messenger component is installed and the doctrine transaction middleware factory is available, wire it:
-        if (interface_exists(MessageBusInterface::class) && class_exists(DoctrineTransactionMiddlewareFactory::class)) {
+        // If the Messenger component is installed and the doctrine transaction middleware is available, wire it:
+        if (interface_exists(MessageBusInterface::class) && class_exists(DoctrineTransactionMiddleware::class)) {
             $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
             $loader->load('messenger.xml');
-
-            $container->getDefinition('messenger.middleware.doctrine_transaction_middleware')
-                ->replaceArgument(0, $config['default_entity_manager']);
         }
 
         /*

diff --git a/DoctrineBundle.php b/DoctrineBundle.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Bundle\DoctrineBundle;
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\EntityListenerPass;
-use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\MessengerPass;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\EntityManager;
@@ -40,7 +39,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new DoctrineValidationPass('orm'));
         $container->addCompilerPass(new EntityListenerPass());
         $container->addCompilerPass(new ServiceRepositoryCompilerPass());
-        $container->addCompilerPass(new MessengerPass());
     }
 
     /**

diff --git a/Resources/config/messenger.xml b/Resources/config/messenger.xml
@@ -4,17 +4,12 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="doctrine.orm.messenger.middleware_factory.transaction" class="Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddlewareFactory" public="false">
-            <argument type="service" id="doctrine" />
-        </service>
-
         <!--
         The following service isn't prefixed by the "doctrine.orm" namespace in order for end-users to just use
-        the "doctrine_transaction_middleware" shortcut in message buses middleware config
+        the "doctrine_transaction" shortcut in message buses middleware config
         -->
-        <service id="messenger.middleware.doctrine_transaction_middleware" class="Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware" abstract="true" public="false">
-            <factory service="doctrine.orm.messenger.middleware_factory.transaction" method="createMiddleware" />
-            <argument /> <!-- default entity manager -->
+        <service id="messenger.middleware.doctrine_transaction" class="Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware" abstract="true" public="false">
+            <argument type="service" id="doctrine" />
         </service>
     </services>
 </container>
diff --git a/Tests/DependencyInjection/Compiler/MessengerPassTest.php b/Tests/DependencyInjection/Compiler/MessengerPassTest.php
diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -697,9 +697,8 @@ public function testMessengerIntegration()
             ->build();
         $extension->load([$config], $container);
 
-        $this->assertNotNull($container->getDefinition('doctrine.orm.messenger.middleware_factory.transaction'));
-        $this->assertNotNull($middlewarePrototype = $container->getDefinition('messenger.middleware.doctrine_transaction_middleware'));
-        $this->assertSame('default', $middlewarePrototype->getArgument(0));
+        $this->assertNotNull($middlewarePrototype = $container->getDefinition('messenger.middleware.doctrine_transaction'));
+        $this->assertCount(1, $middlewarePrototype->getArguments());
     }
 
     public function testCacheConfiguration()