[Notifier] [Bridges] Provide EventDispatcher and HttpClient to the transports

rdavaillaud · rdavaillaud · commit 03dc4c29b250 · 2023-12-12T08:52:41.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2594,21 +2594,27 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
 
         if (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true) && ContainerBuilder::willBeAvailable('symfony/mercure-bundle', MercureBundle::class, $parentPackages, true) && \in_array(MercureBundle::class, $container->getParameter('kernel.bundles'), true)) {
             $container->getDefinition($classToServices[MercureTransportFactory::class])
-                ->replaceArgument('$registry', new Reference(HubRegistry::class));
+                ->replaceArgument('$registry', new Reference(HubRegistry::class))
+                ->replaceArgument('$client', new Reference('http_client'))
+                ->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
         } elseif (ContainerBuilder::willBeAvailable('symfony/mercure-notifier', MercureTransportFactory::class, $parentPackages, true)) {
             $container->removeDefinition($classToServices[MercureTransportFactory::class]);
         }
 
         if (ContainerBuilder::willBeAvailable('symfony/fake-chat-notifier', FakeChatTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'], true)) {
             $container->getDefinition($classToServices[FakeChatTransportFactory::class])
                 ->replaceArgument('$mailer', new Reference('mailer'))
-                ->replaceArgument('$logger', new Reference('logger'));
+                ->replaceArgument('$logger', new Reference('logger'))
+                ->replaceArgument('$client', new Reference('http_client'))
+                ->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
         }
 
         if (ContainerBuilder::willBeAvailable('symfony/fake-sms-notifier', FakeSmsTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier', 'symfony/mailer'], true)) {
             $container->getDefinition($classToServices[FakeSmsTransportFactory::class])
                 ->replaceArgument('$mailer', new Reference('mailer'))
-                ->replaceArgument('$logger', new Reference('logger'));
+                ->replaceArgument('$logger', new Reference('logger'))
+                ->replaceArgument('$client', new Reference('http_client'))
+                ->replaceArgument('$dispatcher', new Reference('event_dispatcher'));
         }
 
         if (isset($config['admin_recipients'])) {
diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php
@@ -17,6 +17,8 @@
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
 use Symfony\Component\Notifier\Transport\TransportInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * @author Oskar Stark <oskarstark@googlemail.com>
@@ -27,9 +29,9 @@ final class FakeChatTransportFactory extends AbstractTransportFactory
     protected $mailer;
     protected $logger;
 
-    public function __construct(MailerInterface $mailer, LoggerInterface $logger)
+    public function __construct(MailerInterface $mailer, LoggerInterface $logger, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null)
     {
-        parent::__construct();
+        parent::__construct($dispatcher, $client);
 
         $this->mailer = $mailer;
         $this->logger = $logger;
@@ -47,11 +49,11 @@ public function create(Dsn $dsn): TransportInterface
             $to = $dsn->getRequiredOption('to');
             $from = $dsn->getRequiredOption('from');
 
-            return (new FakeChatEmailTransport($this->mailer, $to, $from))->setHost($mailerTransport);
+            return (new FakeChatEmailTransport($this->mailer, $to, $from, $this->client, $this->dispatcher))->setHost($mailerTransport);
         }
 
         if ('fakechat+logger' === $scheme) {
-            return new FakeChatLoggerTransport($this->logger);
+            return new FakeChatLoggerTransport($this->logger, $this->client, $this->dispatcher);
         }
 
         throw new UnsupportedSchemeException($dsn, 'fakechat', $this->getSupportedSchemes());
diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php
@@ -17,6 +17,8 @@
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
 use Symfony\Component\Notifier\Transport\TransportInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * @author James Hemery <james@yieldstudio.fr>
@@ -28,9 +30,9 @@ final class FakeSmsTransportFactory extends AbstractTransportFactory
     protected $mailer;
     protected $logger;
 
-    public function __construct(MailerInterface $mailer, LoggerInterface $logger)
+    public function __construct(MailerInterface $mailer, LoggerInterface $logger, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null)
     {
-        parent::__construct();
+        parent::__construct($dispatcher, $client);
 
         $this->mailer = $mailer;
         $this->logger = $logger;
@@ -48,11 +50,11 @@ public function create(Dsn $dsn): TransportInterface
             $to = $dsn->getRequiredOption('to');
             $from = $dsn->getRequiredOption('from');
 
-            return (new FakeSmsEmailTransport($this->mailer, $to, $from))->setHost($mailerTransport);
+            return (new FakeSmsEmailTransport($this->mailer, $to, $from, $this->client, $this->dispatcher))->setHost($mailerTransport);
         }
 
         if ('fakesms+logger' === $scheme) {
-            return new FakeSmsLoggerTransport($this->logger);
+            return new FakeSmsLoggerTransport($this->logger, $this->client, $this->dispatcher);
         }
 
         throw new UnsupportedSchemeException($dsn, 'fakesms', $this->getSupportedSchemes());
diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php
@@ -18,6 +18,8 @@
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
 use Symfony\Component\Notifier\Transport\TransportInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
@@ -26,9 +28,9 @@ final class MercureTransportFactory extends AbstractTransportFactory
 {
     private $registry;
 
-    public function __construct(HubRegistry $registry)
+    public function __construct(HubRegistry $registry, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null)
     {
-        parent::__construct();
+        parent::__construct($dispatcher, $client);
 
         $this->registry = $registry;
     }
@@ -51,7 +53,7 @@ public function create(Dsn $dsn): TransportInterface
             throw new IncompleteDsnException(sprintf('Hub "%s" not found. Did you mean one of: "%s"?', $hubId, implode('", "', array_keys($this->registry->all()))));
         }
 
-        return new MercureTransport($hub, $hubId, $topic);
+        return new MercureTransport($hub, $hubId, $topic, $this->client, $this->dispatcher);
     }
 
     protected function getSupportedSchemes(): array

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`use Symfony\Component\Notifier\Transport\AbstractTransportFactory;`
`19`	`19`	`use Symfony\Component\Notifier\Transport\Dsn;`
`20`	`20`	`use Symfony\Component\Notifier\Transport\TransportInterface;`
	`21`	`+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;`
	`22`	`+use Symfony\Contracts\HttpClient\HttpClientInterface;`
`21`	`23`
`22`	`24`	`/**`
`23`	`25`	`* @author Mathias Arlaud <mathias.arlaud@gmail.com>`
`@@ -26,9 +28,9 @@ final class MercureTransportFactory extends AbstractTransportFactory`
`26`	`28`	`{`
`27`	`29`	`private $registry;`
`28`	`30`
`29`		`- public function __construct(HubRegistry $registry)`
	`31`	`+ public function __construct(HubRegistry $registry, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null)`
`30`	`32`	`{`
`31`		`- parent::__construct();`
	`33`	`+ parent::__construct($dispatcher, $client);`
`32`	`34`
`33`	`35`	`$this->registry = $registry;`
`34`	`36`	`}`
`@@ -51,7 +53,7 @@ public function create(Dsn $dsn): TransportInterface`
`51`	`53`	`throw new IncompleteDsnException(sprintf('Hub "%s" not found. Did you mean one of: "%s"?', $hubId, implode('", "', array_keys($this->registry->all()))));`
`52`	`54`	`}`
`53`	`55`
`54`		`- return new MercureTransport($hub, $hubId, $topic);`
	`56`	`+ return new MercureTransport($hub, $hubId, $topic, $this->client, $this->dispatcher);`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`protected function getSupportedSchemes(): array`