symfony · theravel · Feb 18, 2021 · Feb 24, 2021 · Feb 24, 2021
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1801,17 +1801,18 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
        }

        $defaultMiddleware = [
-            'before' => [
-                ['id' => 'add_bus_name_stamp_middleware'],
-                ['id' => 'reject_redelivered_message_middleware'],
-                ['id' => 'dispatch_after_current_bus'],
-                ['id' => 'failed_message_processing_middleware'],
-            ],
+            'before' => [],
            'after' => [
                ['id' => 'send_message'],
                ['id' => 'handle_message'],
            ],
        ];
+        $defaultMiddleware['before'][] = ['id' => 'add_bus_name_stamp_middleware'];
+        if (!$config['failure_transport']) {
+            $defaultMiddleware['before'][] = ['id' => 'reject_redelivered_message_middleware'];
+        }
+        $defaultMiddleware['before'][] = ['id' => 'dispatch_after_current_bus'];
+        $defaultMiddleware['before'][] = ['id' => 'failed_message_processing_middleware'];
        foreach ($config['buses'] as $busId => $bus) {
            $middleware = $bus['middleware'];


diff --git a/...rkBundle/Tests/DependencyInjection/Fixtures/php/messenger_redelivery_failure_disabled.php b/...rkBundle/Tests/DependencyInjection/Fixtures/php/messenger_redelivery_failure_disabled.php
@@ -0,0 +1,10 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'serializer' => true,
+    'messenger' => [
+        'transports' => [
+            'example' => 'redis://127.0.0.1:6379/messages',
+        ],
+    ],
+]);
diff --git a/...orkBundle/Tests/DependencyInjection/Fixtures/php/messenger_redelivery_failure_enabled.php b/...orkBundle/Tests/DependencyInjection/Fixtures/php/messenger_redelivery_failure_enabled.php
@@ -0,0 +1,12 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'serializer' => true,
+    'messenger' => [
+        'failure_transport' => 'failed',
+        'transports' => [
+            'example' => 'redis://127.0.0.1:6379/messages',
+            'failed' => 'in-memory:///',
+        ],
+    ],
+]);
diff --git a/...rkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_redelivery_failure_disabled.xml b/...rkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_redelivery_failure_disabled.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:messenger>
+            <framework:transport name="example" dsn="redis://127.0.0.1:6379/messages" />
+        </framework:messenger>
+    </framework:config>
+</container>
diff --git a/...orkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_redelivery_failure_enabled.xml b/...orkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_redelivery_failure_enabled.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:messenger failure-transport="failed">
+            <framework:transport name="example" dsn="redis://127.0.0.1:6379/messages" />
+            <framework:transport name="failed" dsn="in-memory:///" />
+        </framework:messenger>
+    </framework:config>
+</container>
diff --git a/...rkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_redelivery_failure_disabled.yml b/...rkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_redelivery_failure_disabled.yml
@@ -0,0 +1,4 @@
+framework:
+    messenger:
+        transports:
+            example: 'redis://127.0.0.1:6379/messages'
diff --git a/...orkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_redelivery_failure_enabled.yml b/...orkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_redelivery_failure_enabled.yml
@@ -0,0 +1,6 @@
+framework:
+    messenger:
+        transports:
+            example: 'redis://127.0.0.1:6379/messages'
+            failed: 'in-memory:///'
+        failure_transport: failed
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -760,6 +760,18 @@ public function testMessengerTransports()
        $this->assertEquals(new Reference('messenger.transport.failed'), $container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')->getArgument(0));
    }

+    public function testMessengerRedeliveryFailureTransportDisabled()
+    {
+        $container = $this->createContainerFromFile('messenger_redelivery_failure_disabled');
+        $this->assertContains(['id' => 'reject_redelivered_message_middleware'], $container->getParameter('messenger.bus.default.middleware'));
+    }
+
+    public function testMessengerRedeliveryFailureTransportEnabled()
+    {
+        $container = $this->createContainerFromFile('messenger_redelivery_failure_enabled');
+        $this->assertNotContains(['id' => 'reject_redelivered_message_middleware'], $container->getParameter('messenger.bus.default.middleware'));
+    }
+
    public function testMessengerRouting()
    {
        $container = $this->createContainerFromFile('messenger_routing');