Skip to content

Commit acbde36

Browse files
Merge branch '5.3' into 5.4
* 5.3: [Serializer] fix support for lazy properties remove FlattenExceptionNormalizer definition if serializer not available
2 parents 29b1449 + 4999e37 commit acbde36

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,6 +1936,10 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
19361936

19371937
$loader->load('messenger.php');
19381938

1939+
if (!interface_exists(DenormalizerInterface::class)) {
1940+
$container->removeDefinition('serializer.normalizer.flatten_exception');
1941+
}
1942+
19391943
if (ContainerBuilder::willBeAvailable('symfony/amqp-messenger', AmqpTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'], true)) {
19401944
$container->getDefinition('messenger.transport.amqp.factory')->addTag('messenger.transport_factory');
19411945
}

Resources/config/notifier_transports.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959

6060
return static function (ContainerConfigurator $container) {
6161
$container->services()
62+
->alias('notifier.transport_factory.allmysms', 'notifier.transport_factory.all-my-sms')
63+
->deprecate('symfony/framework-bundle', '5.4', 'The "%alias_id% service is deprecated, use "notifier.transport_factory.all-my-sms" instead.')
6264
->alias('notifier.transport_factory.fakechat', 'notifier.transport_factory.fake-chat')
6365
->deprecate('symfony/framework-bundle', '5.4', 'The "%alias_id% service is deprecated, use "notifier.transport_factory.fake-chat" instead.')
6466
->alias('notifier.transport_factory.fakesms', 'notifier.transport_factory.fake-sms')
@@ -118,7 +120,7 @@
118120
->parent('notifier.transport_factory.abstract')
119121
->tag('texter.transport_factory')
120122

121-
->set('notifier.transport_factory.allmysms', AllMySmsTransportFactory::class)
123+
->set('notifier.transport_factory.all-my-sms', AllMySmsTransportFactory::class)
122124
->parent('notifier.transport_factory.abstract')
123125
->tag('texter.transport_factory')
124126

0 commit comments

Comments
 (0)