8000 [FrameworkBundle] Make the messenger.reset_on_message config option d… · symfony/symfony@e3eecd1 · GitHub
[go: up one dir, main page]

Skip to content

Commit e3eecd1

Browse files
committed
[FrameworkBundle] Make the messenger.reset_on_message config option default to true
1 parent 81357bf commit e3eecd1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+23
-80
lines changed

UPGRADE-6.0.md

Lines changed: 1 addition & 1 deletion

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 1 addition & 0 deletions

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1422,8 +1422,12 @@ function ($a) {
14221422
->info('Transport name to send failed messages to (after all retries have failed).')
14231423
->end()
14241424
->booleanNode('reset_on_message')
1425-
->defaultNull()
1425+
->defaultTrue()
14261426
->info('Reset container services after each message.')
1427+
->validate()
1428+
->ifTrue(static fn ($v) => true !== $v)
1429+
->thenInvalid('The "framework.messenger.reset_on_message" configuration option can be set to "true" only. To prevent services resetting after each message you can set the "--no-reset" option in "messenger:consume" command.')
1430+
->end()
14271431
->end()
14281432
->scalarNode('default_bus')->defaultNull()->end()
14291433
->arrayNode('buses')

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,17 +2067,8 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
20672067
$container->removeDefinition('console.command.messenger_failed_messages_remove');
20682068
}
20692069

2070-
if (false === $config['reset_on_message']) {
2071-
throw new LogicException('The "framework.messenger.reset_on_message" configuration option can be set to "true" only. To prevent services resetting after each message you can set the "--no-reset" option in "messenger:consume" command.');
2072-
}
2073-
20742070
if (!$container->hasDefinition('console.command.messenger_consume_messages')) {
20752071
$container->removeDefinition('messenger.listener.reset_services');
2076-
} elseif (null === $config['reset_on_message']) {
2077-
trigger_deprecation('symfony/framework-bundle', '5.4', 'Not setting the "framework.messenger.reset_on_message" configuration option is deprecated, it will default to "true" in version 6.0.');
2078-
2079-
$container->getDefinition('console.command.messenger_consume_messages')->replaceArgument(5, null);
2080-
$container->removeDefinition('messenger.listener.reset_services');
20812072
}
20822073
}
20832074

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
536536
],
537537
'default_bus' => null,
538538
'buses' => ['messenger.bus.default' => ['default_middleware' => true, 'middleware' => []]],
539-
'reset_on_message' => null,
539+
'reset_on_message' => true,
540540
],
541541
'disallow_search_engine_index' => true,
542542
'http_client' => [

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
$container->loadFromExtension('framework', [
77
'messenger' => [
8-
'reset_on_message' => true,
98
'routing' => [
109
FooMessage::class => ['sender.bar', 'sender.biz'],
1110
BarMessage::class => 'sender.foo',

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_middleware_factory_erroneous_format.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
$container->loadFromExtension('framework', [
44
'messenger' => [
5-
'reset_on_message' => true,
65
'buses' => [
76
'command_bus' => [
87
'middleware' => [

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_multiple_buses.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
$container->loadFromExtension('framework', [
44
'messenger' => [
5-
'reset_on_message' => true,
65
'default_bus' => 'messenger.bus.commands',
76
'buses' => [
87
'messenger.bus.commands' => null,

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
$container->loadFromExtension('framework', [
44
'messenger' => [
5-
'reset_on_message' => true,
65
'transports' => [
76
'transport_1' => [
87
'dsn' => 'null://',

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_multiple_failure_transports_global.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
$container->loadFromExtension('framework', [
44
'messenger' => [
55
'failure_transport' => 'failure_transport_global',
6-
'reset_on_message' => true,
76
'transports' => [
87
'transport_1' => [
98
'dsn' => 'null://',

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
$container->loadFromExtension('framework', [
44
'serializer' => true,
55
'messenger' => [
6-
'reset_on_message' => true,
76
'serializer' => [
87
'default_serializer' => 'messenger.transport.symfony_serializer',
98
],

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_invalid_transport.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
$container->loadFromExtension('framework', [
44
'serializer' => true,
55
'messenger' => [
6-
'reset_on_message' => true,
76
'serializer' => [
87
'default_serializer' => 'messenger.transport.symfony_serializer',
98
],

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing_single.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
$container->loadFromExtension('framework', [
44
'messenger' => [
5-
'reset_on_message' => true,
65
'routing' => [
76
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp'],
87
],

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transport.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
$container->loadFromExtension('framework', [
44
'serializer' => true,
55
'messenger' => [
6-
'reset_on_message' => true,
76
'serializer' => [
87
'default_serializer' => 'messenger.transport.symfony_serializer',
98
'symfony_serializer' => [

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_transports.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
'serializer' => true,
55
'messenger' => [
66
'failure_transport' => 'failed',
7-
'reset_on_message' => true,
87
'serializer' => [
98
'default_serializer' => 'messenger.transport.symfony_serializer',
109
],
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
$container->loadFromExtension('framework', [
77
'messenger' => [
8+
'reset_on_message' => true,
89
'routing' => [
910
FooMessage::class => ['sender.bar', 'sender.biz'],
1011
BarMessage::class => 'sender.foo',

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
$container->loadFromExtension('framework', [
77
'messenger' => [
8-
'< 10000 span class=pl-s>enabled' => true,
9-
'reset_on_message' => true,
8+
'enabled' => true
109
],
1110
'mailer' => [
1211
'dsn' => 'smtp://example.com',

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_mailer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
],
1010
'messenger' => [
1111
'enabled' => true,
12-
'reset_on_message' => true,
1312
],
1413
'notifier' => [
1514
'enabled' => true,

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger reset-on-message="true">
9+
<framework:messenger>
1010
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
1111
<framework:sender service="sender.bar" />
1212
<framework:sender service="sender.biz" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_buses.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger default-bus="messenger.bus.commands" reset-on-message="true">
9+
<framework:messenger default-bus="messenger.bus.commands">
1010
<framework:bus name="messenger.bus.commands" />
1111
<framework:bus name="messenger.bus.events">
1212
<framework:middleware id="with_factory">

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_failure_transports.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger reset-on-message="true">
9+
<framework:messenger>
1010
<framework:transport name="transport_1" dsn="null://" failure-transport="failure_transport_1" />
1111
<framework:transport name="transport_2" dsn="null://" />
1212
<framework:transport name="transport_3" dsn="null://" failure-transport="failure_transport_3" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_multiple_failure_transports_global.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger failure-transport="failure_transport_global" reset-on-message="true">
9+
<framework:messenger failure-transport="failure_transport_global">
1010
<framework:transport name="transport_1" dsn="null://" failure-transport="failure_transport_1" />
1111
<framework:transport name="transport_2" dsn="null://" />
1212
<framework:transport name="transport_3" dsn="null://" failure-transport="failure_transport_3" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<framework:config>
99
<framework:serializer enabled="true" />
10-
<framework:messenger reset-on-message="true">
10+
<framework:messenger>
1111
<framework:serializer default-serializer="messenger.transport.symfony_serializer" />
1212
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
1313
<framework:sender service="amqp" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_invalid_transport.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<framework:config>
99
<framework:serializer enabled="true" />
10-
<framework:messenger reset-on-message="true">
10+
<framework:messenger>
1111
<framework:serializer default-serializer="messenger.transport.symfony_serializer" />
1212
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
1313
<framework:sender service="invalid" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing_single.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger reset-on-message="true">
9+
<framework:messenger>
1010
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
1111
<framework:sender service="amqp" />
1212
</framework:routing>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transport.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<framework:config>
99
<framework:serializer enabled="true" />
10-
<framework:messenger reset-on-message="true">
10+
<framework:messenger>
1111
<framework:serializer default-serializer="messenger.transport.symfony_serializer">
1212
<framework:symfony-serializer format="csv">
1313
<framework:context>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_transports.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<framework:config>
99
<framework:serializer enabled="true" />
10-
<framework:messenger failure-transport="failed" reset-on-message="true">
10+
<framework:messenger failure-transport="failed">
1111
<framework:serializer default-serializer="messenger.transport.symfony_serializer" />
1212
<framework:transport name="default" dsn="amqp://localhost/%2f/messages" />
1313
<framework:transport name="customised" dsn="amqp://localhost/%2f/messages?exchange_name=exchange_name" serializer="messenger.transport.native_php_serializer">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger>
9+
<framework:messenger reset-on-message="true">
1010
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
1111
<framework:sender service="sender.bar" />
1212
<framework:sender service="sender.biz" />

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
77

88
<framework:config>
9-
<framework:messenger enabled="true" reset-on-message="true" />
9+
<framework:messenger enabled="true" />
1010
<framework:mailer dsn="smtp://example.com" />
1111
<framework:notifier enabled="true" notification-on-failed-messages="true">
1212
<framework:chatter-transport name="slack">null</framework:chatter-transport>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_mailer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<framework:config>
99
<framework:mailer enabled="false" />
10-
<framework:messenger enabled="true" reset-on-message="true" />
10+
<framework:messenger enabled="true" />
1111
<framework:notifier enabled="true" notification-on-failed-messages="true">
1212
<framework:chatter-transport name="slack">null</framework:chatter-transport>
1313
<framework:texter-transport name="twilio">null</framework:texter-transport>

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
framework:
22
messenger:
3-
reset_on_message: true
43
routing:
54
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage': ['sender.bar', 'sender.biz']
65
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage': 'sender.foo'

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_middleware_factory_erroneous_format.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
framework:
22
messenger:
3-
reset_on_message: true
43
buses:
54
command_bus:
65
middleware:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_multiple_buses.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
framework:
22
messenger:
3-
reset_on_message: true
43
default_bus: messenger.bus.commands
54
buses:
65
messenger.bus.commands: ~

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_multiple_failure_transports.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
framework:
22
messenger:
3-
reset_on_message: true
43
transports:
54
transport_1:
65
dsn: 'null://'

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_multiple_failure_transports_global.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
framework:
22
messenger:
3-
reset_on_message: true
43
failure_transport: failure_transport_global
54
transports:
65
transport_1:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
framework:
22
serializer: true
33
messenger:
4-
reset_on_message: true
54
serializer:
65
default_serializer: messenger.transport.symfony_serializer
76
routing:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_invalid_transport.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
framework:
22
serializer: true
33
messenger:
4-
reset_on_message: true
54
serializer:
65
default_serializer: messenger.transport.symfony_serializer
76
routing:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing_single.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
framework:
22
messenger:
3-
reset_on_message: true
43
routing:
54
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage': [amqp]
65

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transport.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
framework:
22
serializer: true
33
messenger:
4-
reset_on_message: true
54
serializer:
65
default_serializer: messenger.transport.symfony_serializer
76
symfony_serializer:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_transports.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ framework:
22
serializer: true
33
messenger:
44
failure_transport: failed
5-
reset_on_message: true
65
serializer:
76
default_serializer: messenger.transport.symfony_serializer
87
transports:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
framework:
22
messenger:
3+
reset_on_message: true
34
routing:
45
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage': ['sender.bar', 'sender.biz']
56
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage': 'sender.foo'

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
framework:
22
messenger:
33
enabled: true
4-
reset_on_message: true
54
mailer:
65
dsn: 'smtp://example.com'
76
notifier:

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_mailer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ framework:
33
enabled: false
44
messenger:
55
enabled: true
6-
reset_on_message: true
76
notifier:
87
enabled: true
98
notification_on_failed_messages: true

0 commit comments

Comments
 (0)
0