Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5a9e076

Browse filesBrowse files
committed
Fix DI logic when mailer is available but webhook is not
1 parent 115bd60 commit 5a9e076
Copy full SHA for 5a9e076

File tree

Expand file treeCollapse file tree

1 file changed

+10
-8
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+10
-8
lines changed

‎DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: DependencyInjection/FrameworkExtension.php
+10-8Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2527,16 +2527,18 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
25272527
}
25282528
}
25292529

2530-
$webhookRequestParsers = [
2531-
MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
2532-
PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
2533-
];
2530+
if ($webhookEnabled) {
2531+
$webhookRequestParsers = [
2532+
MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
2533+
PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
2534+
];
25342535

2535-
foreach ($webhookRequestParsers as $class => $service) {
2536-
$package = substr($service, \strlen('mailer.transport_factory.'));
2536+
foreach ($webhookRequestParsers as $class => $service) {
2537+
$package = substr($service, \strlen('mailer.transport_factory.'));
25372538

2538-
if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
2539-
$container->removeDefinition($service);
2539+
if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
2540+
$container->removeDefinition($service);
2541+
}
25402542
}
25412543
}
25422544

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.