8000 pr comments · symfony/symfony@303514e · GitHub
[go: up one dir, main page]

Skip to content

Commit 303514e

Browse files
committed
pr comments
1 parent 4c073b5 commit 303514e

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,7 +1940,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
19401940
->setArguments([$transport['dsn'], $transport['options'] + ['transport_name' => $name], new Reference($serializerId)])
19411941
->addTag('messenger.receiver', [
19421942
'alias' => $name,
1943-
'failure_transport' => \in_array($name, $failureTransports),
1943+
'is_failure_transport' => \in_array($name, $failureTransports),
19441944
]
19451945
)
19461946
;
@@ -1973,24 +1973,17 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
19731973
$senderReferences[$serviceId] = new Reference($serviceId);
19741974
}
19751975

1976-
$failureTransportReferencesByTransportName = array_map(function($failureTransportName) use ($senderReferences) {
1977-
return $senderReferences[$failureTransportName];
1978-
}, $failureTransportsByName);
1979-
1980-
1981-
if ($config['failure_transport']) {
1982-
if (!isset($senderReferences[$config['failure_transport']])) {
1983-
throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $config['failure_transport']));
1984-
}
1985-
}
1986-
19871976
foreach ($config['transports'] as $name => $transport) {
19881977
if ($transport['failure_transport']) {
19891978
if (!isset($senderReferences[$transport['failure_transport']])) {
19901979
throw new LogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.', $transport['failure_transport']));
19911980
}
19921981
}
19931982
}
1983+
1984+
$failureTransportReferencesByTransportName = array_map(function($failureTransportName) use ($senderReferences) {
1985+
return $senderReferences[$failureTransportName];
1986+
}, $failureTransportsByName);
19941987

19951988
$messageToSendersMapping = [];
19961989
foreach ($config['routing'] as $message => $messageConfiguration) {

src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private function registerReceivers(ContainerBuilder $container, array $busIds)
276276
foreach ($tags as $tag) {
277277
if (isset($tag['alias'])) {
278278
$receiverMapping[$tag['alias']] = $receiverMapping[$id];
279-
if (isset($tag['failure_transport']) && null !== $tag['failure_transport']) {
279+
if ($tag['failure_transport'] ?? false) {
280280
$failureTransportsMap[$tag['alias']] = $receiverMapping[$id];
281281
}
282282
}

0 commit comments

Comments
 (0)
0