bug #49696 Fix DI logic when mailer is available but webhook is not (fabpot)

fabpot · fabpot · commit 9aa6e0820b0e · 2023-03-16T08:07:34.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- Fix DI logic when mailer is available but webhook is not | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 80cb3f5 Fix DI logic when mailer is available but webhook is not
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2527,16 +2527,18 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             }
         }
 
-        $webhookRequestParsers = [
-            MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
-            PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
-        ];
+        if ($webhookEnabled) {
+            $webhookRequestParsers = [
+                MailgunRequestParser::class => 'mailer.webhook.request_parser.mailgun',
+                PostmarkRequestParser::class => 'mailer.webhook.request_parser.postmark',
+            ];
 
-        foreach ($webhookRequestParsers as $class => $service) {
-            $package = substr($service, \strlen('mailer.transport_factory.'));
+            foreach ($webhookRequestParsers as $class => $service) {
+                $package = substr($service, \strlen('mailer.transport_factory.'));
 
-            if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
-                $container->removeDefinition($service);
+                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
+                    $container->removeDefinition($service);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2527,16 +2527,18 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co`
`2527`	`2527`	`}`
`2528`	`2528`	`}`
`2529`	`2529`
`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`	`+ ];`
`2534`	`2535`
`2535`		`- foreach ($webhookRequestParsers as $class => $service) {`
`2536`		`- 8000 $package = substr($service, \strlen('mailer.transport_factory.'));`
	`2536`	`+ foreach ($webhookRequestParsers as $class => $service) {`
	`2537`	`+ $package = substr($service, \strlen('mailer.transport_factory.'));`
`2537`	`2538`
`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`	`+ }`
`2540`	`2542`	`}`
`2541`	`2543`	`}`
`2542`	`2544`