Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[FrameworkBundle] Make the messenger.reset_on_message config option default to true #43203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2021
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
2 changes: 1 addition & 1 deletion UPGRADE-6.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ FrameworkBundle
* Remove the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead
* Remove `get()`, `has()`, `getDoctrine()`, and `dispatchMessage()` in `AbstractController`, use method/constructor injection instead
* Deprecate the `cache.adapter.doctrine` service: The Doctrine Cache library is deprecated. Either switch to Symfony Cache or use the PSR-6 adapters provided by Doctrine Cache.
* Make the `framework.messenger.reset_on_message` configuration option default to `true`

HttpFoundation
--------------
Expand Down Expand Up @@ -169,7 +170,6 @@ Messenger
* Removed the `prefetch_count` parameter in the AMQP bridge.
* Removed the use of TLS option for Redis Bridge, use `rediss://127.0.0.1` instead of `redis://127.0.0.1?tls=1`
* The `delete_after_ack` config option of the Redis transport now defaults to `true`
* The `reset_on_message` config option now defaults to `true`

Mime
----
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ CHANGELOG
* Remove support for passing a `RouteCollectionBuilder` to `MicroKernelTrait::configureRoutes()`, type-hint `RoutingConfigurator` instead
* Remove the `cache.adapter.doctrine` service
* Remove the `framework.translator.enabled_locales` config option, use `framework.enabled_locales` instead
* Make the `framework.messenger.reset_on_message` configuration option default to `true`

5.4
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1422,8 +1422,12 @@ function ($a) {
->info('Transport name to send failed messages to (after all retries have failed).')
->end()
->booleanNode('reset_on_message')
->defaultNull()
->defaultTrue()
->info('Reset container services after each message.')
->validate()
->ifTrue(static fn ($v) => true !== $v)
->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.')
->end()
->end()
->scalarNode('default_bus')->defaultNull()->end()
->arrayNode('buses')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2067,17 +2067,8 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
$container->removeDefinition('console.command.messenger_failed_messages_remove');
}

if (false === $config['reset_on_message']) {
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.');
}

if (!$container->hasDefinition('console.command.messenger_consume_messages')) {
$container->removeDefinition('messenger.listener.reset_services');
} elseif (null === $config['reset_on_message']) {
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.');

$container->getDefinition('console.command.messenger_consume_messages')->replaceArgument(5, null);
$container->removeDefinition('messenger.listener.reset_services');
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
],
'default_bus' => null,
'buses' => ['messenger.bus.default' => ['default_middleware' => true, 'middleware' => []]],
'reset_on_message' => null,
'reset_on_message' => true,
],
'disallow_search_engine_index' => true,
'http_client' => [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

$container->loadFromExtension('framework', [
'messenger' => [
'reset_on_message' => true,
'routing' => [
FooMessage::class => ['sender.bar', 'sender.biz'],
BarMessage::class => 'sender.foo',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

$container->loadFromExtension('framework', [
'messenger' => [
'reset_on_message' => true,
'buses' => [
'command_bus' => [
'middleware' => [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

$container->loadFromExtension('framework', [
'messenger' => [
'reset_on_message' => true,
'default_bus' => 'messenger.bus.commands',
'buses' => [
'messenger.bus.commands' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

$container->loadFromExtension('framework', [
'messenger' => [
'reset_on_message' => true,
'transports' => [
'transport_1' => [
'dsn' => 'null://',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
$container->loadFromExtension('framework', [
'messenger' => [
'failure_transport' => 'failure_transport_global',
'reset_on_message' => true,
'transports' => [
'transport_1' => [
'dsn' => 'null://',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
$container->loadFromExtension('framework', [
'serializer' => true,
'messenger' => [
'reset_on_message' => true,
'serializer' => [
'default_serializer' => 'messenger.transport.symfony_serializer',
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
$container->loadFromExtension('framework', [
'serializer' => true,
'messenger' => [
'reset_on_message' => true,
'serializer' => [
'default_serializer' => 'messenger.transport.symfony_serializer',
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

$container->loadFromExtension('framework', [
'messenger' => [
'reset_on_message' => true,
'routing' => [
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp'],
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
$container->loadFromExtension('framework', [
'serializer' => true,
'messenger' => [
'reset_on_message' => true,
'serializer' => [
'default_serializer' => 'messenger.transport.symfony_serializer',
'symfony_serializer' => [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
'serializer' => true,
'messenger' => [
'failure_transport' => 'failed',
'reset_on_message' => true,
'serializer' => [
'default_serializer' => 'messenger.transport.symfony_serializer',
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

$container->loadFromExtension('framework', [
'messenger' => [
'reset_on_message' => true,
'routing' => [
FooMessage::class => ['sender.bar', 'sender.biz'],
BarMessage::class => 'sender.foo',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

$container->loadFromExtension('framework', [
'messenger' => [
'enabled' => true,
'reset_on_message' => true,
'enabled' => true
],
'mailer' => [
'dsn' => 'smtp://example.com',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
],
'messenger' => [
'enabled' => true,
'reset_on_message' => true,
],
'notifier' => [
'enabled' => true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger reset-on-message="true">
<framework:messenger>
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
<framework:sender service="sender.bar" />
<framework:sender service="sender.biz" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger default-bus="messenger.bus.commands" reset-on-message="true">
<framework:messenger default-bus="messenger.bus.commands">
<framework:bus name="messenger.bus.commands" />
<framework:bus name="messenger.bus.events">
<framework:middleware id="with_factory">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger reset-on-message="true">
<framework:messenger>
<framework:transport name="transport_1" dsn="null://" failure-transport="failure_transport_1" />
<framework:transport name="transport_2" dsn="null://" />
<framework:transport name="transport_3" dsn="null://" failure-transport="failure_transport_3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger failure-transport="failure_transport_global" reset-on-message="true">
<framework:messenger failure-transport="failure_transport_global">
<framework:transport name="transport_1" dsn="null://" failure-transport="failure_transport_1" />
<framework:transport name="transport_2" dsn="null://" />
<framework:transport name="transport_3" dsn="null://" failure-transport="failure_transport_3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<framework:config>
<framework:serializer enabled="true" />
<framework:messenger reset-on-message="true">
<framework:messenger>
<framework:serializer default-serializer="messenger.transport.symfony_serializer" />
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
<framework:sender service="amqp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<framework:config>
<framework:serializer enabled="true" />
<framework:messenger reset-on-message="true">
<framework:messenger>
<framework:serializer default-serializer="messenger.transport.symfony_serializer" />
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
<framework:sender service="invalid" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger reset-on-message="true">
<framework:messenger>
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage">
<framework:sender service="amqp" />
</framework:routing>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<framework:config>
<framework:serializer enabled="true" />
<framework:messenger reset-on-message="true">
<framework:messenger>
<framework:serializer default-serializer="messenger.transport.symfony_serializer">
<framework:symfony-serializer format="csv">
<framework:context>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<framework:config>
<framework:serializer enabled="true" />
<framework:messenger failure-transport="failed" reset-on-message="true">
<framework:messenger failure-transport="failed">
<framework:serializer default-serializer="messenger.transport.symfony_serializer" />
<framework:transport name="default" dsn="amqp://localhost/%2f/messages" />
<framework:transport name="customised" dsn="amqp://localhost/%2f/messages?exchange_name=exchange_name" serializer="messenger.transport.native_php_serializer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger>
<framework:messenger reset-on-message="true">
<framework:routing message-class="Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage">
<framework:sender service="sender.bar" />
<framework:sender service="sender.biz" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger enabled="true" reset-on-message="true" />
<framework:messenger enabled="true" />
<framework:mailer dsn="smtp://example.com" />
<framework:notifier enabled="true" notification-on-failed-messages="true">
<framework:chatter-transport name="slack">null</framework:chatter-transport>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<framework:config>
<framework:mailer enabled="false" />
<framework:messenger enabled="true" reset-on-message="true" />
<framework:messenger enabled="true" />
<framework:notifier enabled="true" notification-on-failed-messages="true">
<framework:chatter-transport name="slack">null</framework:chatter-transport>
<framework:texter-transport name="twilio">null</framework:texter-transport>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
framework:
messenger:
reset_on_message: true
routing:
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage': ['sender.bar', 'sender.biz']
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage': 'sender.foo'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
framework:
messenger:
reset_on_message: true
buses:
command_bus:
middleware:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
framework:
messenger:
reset_on_message: true
default_bus: messenger.bus.commands
buses:
messenger.bus.commands: ~
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
framework:
messenger:
reset_on_message: true
transports:
transport_1:
dsn: 'null://'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
framework:
messenger:
reset_on_message: true
failure_transport: failure_transport_global
transports:
transport_1:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
framework:
serializer: true
messenger:
reset_on_message: true
serializer:
default_serializer: messenger.transport.symfony_serializer
routing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
framework:
serializer: true
messenger:
reset_on_message: true
serializer:
default_serializer: messenger.transport.symfony_serializer
routing:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
framework:
messenger:
reset_on_message: true
routing:
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage': [amqp]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
framework:
serializer: true
messenger:
reset_on_message: true
serializer:
default_serializer: messenger.transport.symfony_serializer
symfony_serializer:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ framework:
serializer: true
messenger:
failure_transport: failed
reset_on_message: true
serializer:
default_serializer: messenger.transport.symfony_serializer
transports:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
framework:
messenger:
reset_on_message: true
routing:
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage': ['sender.bar', 'sender.biz']
'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage': 'sender.foo'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
framework:
messenger:
enabled: true
reset_on_message: true
mailer:
dsn: 'smtp://example.com'
notifier:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ framework:
enabled: false
messenger:
enabled: true
reset_on_message: true
notifier:
enabled: true
notification_on_failed_messages: true
Expand Down
Loading