Skip to content

Commit 28baff7

Browse files
Merge branch '5.4' into 6.0
* 5.4: Fix merge [Serializer] fix reading unset properties [Serializer] fix support for lazy properties remove FlattenExceptionNormalizer definition if serializer not available
2 parents 7ac6fc4 + 51490f5 commit 28baff7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

DependencyInjection/FrameworkExtension.php

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

18631863
$loader->load('messenger.php');
18641864

1865+
if (!interface_exists(DenormalizerInterface::class)) {
1866+
$container->removeDefinition('serializer.normalizer.flatten_exception');
1867+
}
1868+
18651869
if (ContainerBuilder::willBeAvailable('symfony/amqp-messenger', AmqpTransportFactory::class, ['symfony/framework-bundle', 'symfony/messenger'])) {
18661870
$container->getDefinition('messenger.transport.amqp.factory')->addTag('messenger.transport_factory');
18671871
}

Resources/config/notifier_transports.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
->parent('notifier.transport_factory.abstract')
9797
->tag('texter.transport_factory')
9898

99-
->set('notifier.transport_factory.allmysms', AllMySmsTransportFactory::class)
99+
->set('notifier.transport_factory.all-my-sms', AllMySmsTransportFactory::class)
100100
->parent('notifier.transport_factory.abstract')
101101
->tag('texter.transport_factory')
102102

@@ -168,7 +168,7 @@
168168
->parent('notifier.transport_factory.abstract')
169169
->tag('chatter.transport_factory')
170170

171-
->set('notifier.transport_factory.gatewayapi', GatewayApiTransportFactory::class)
171+
->set('notifier.transport_factory.gateway-api', GatewayApiTransportFactory::class)
172172
->parent('notifier.transport_factory.abstract')
173173
->tag('texter.transport_factory')
174174

0 commit comments

Comments
 (0)