[FrameworkBundle] Fix webhook parser service removal and add notifier…

… parser service removal
symfony · fabpot · Dec 13, 2023 · Dec 12, 2023 · Dec 13, 2023 · Dec 13, 2023
commit b7a17ad5d0d0b941de6acf08ea9cbe7fe7e3fda4
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2632,7 +2632,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
            ];

            foreach ($webhookRequestParsers as $class => $service) {
-                $package = substr($service, \strlen('mailer.transport_factory.'));
+                $package = substr($service, \strlen('mailer.webhook.request_parser.'));

                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-mailer', 'gmail' === $package ? 'google' : $package), $class, ['symfony/framework-bundle', 'symfony/mailer'])) {
                    $container->removeDefinition($service);
@@ -2839,6 +2839,18 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $

        if ($webhookEnabled) {
            $loader->load('notifier_webhook.php');
+
+            $webhookRequestParsers = [
+                NotifierBridge\Twilio\Webhook\TwilioRequestParser::class => 'notifier.webhook.request_parser.twilio',
+            ];
+
+            foreach ($webhookRequestParsers as $class => $service) {
+                $package = substr($service, \strlen('notifier.webhook.request_parser.'));
+
+                if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-notifier', $package), $class, ['symfony/framework-bundle', 'symfony/notifier'])) {
+                    $container->removeDefinition($service);
+                }
+            }
        }
    }