wire a clock for the BlueSky transport in the FrameworkBundle

xabbuh · Jun 17, 2024 · bcc78f2 · bcc78f2
1 parent 916718c
commit bcc78f2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2865,6 +2865,12 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
                 ->addArgument(new Reference('http_client', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
         }
 
+        if (ContainerBuilder::willBeAvailable('symfony/bluesky-notifier', NotifierBridge\BlueSky\BlueSkyTransportFactory::class, ['symfony/framework-bundle', 'symfony/notifier'])) {
+            $container->getDefinition($classToServices[NotifierBridge\Bluesky\BlueskyTransportFactory::class])
+                ->addArgument(new Reference('logger'))
+                ->addArgument(new Reference('clock', ContainerBuilder::NULL_ON_INVALID_REFERENCE));
+        }
+
         if (isset($config['admin_recipients'])) {
             $notifier = $container->getDefinition('notifier');
             foreach ($config['admin_recipients'] as $i => $recipient) {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_transports.php
@@ -26,7 +26,6 @@
             ]);
 
     $chatterFactories = [
-        'bluesky' => Bridge\Bluesky\BlueskyTransportFactory::class,
         'brevo' => Bridge\Brevo\BrevoTransportFactory::class,
         'chatwork' => Bridge\Chatwork\ChatworkTransportFactory::class,
         'discord' => Bridge\Discord\DiscordTransportFactory::class,
@@ -56,6 +55,11 @@
                 ->tag('chatter.transport_factory');
     }
 
+    $container->services()
+        ->set('notifier.transport_factory.bluesky', Bridge\Bluesky\BlueskyTransportFactory::class)
+        ->parent('notifier.transport_factory.abstract')
+        ->tag('chatter.transport_factory');
+
     $texterFactories = [
         'all-my-sms' => Bridge\AllMySms\AllMySmsTransportFactory::class,
         'bandwidth' => Bridge\Bandwidth\BandwidthTransportFactory::class,

diff --git a/src/Symfony/Component/Notifier/Bridge/Bluesky/BlueskyTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Bluesky/BlueskyTransportFactory.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
@@ -28,6 +29,7 @@ public function __construct(
         ?EventDispatcherInterface $dispatcher = null,
         ?HttpClientInterface $client = null,
         private ?LoggerInterface $logger = null,
+        private readonly ?ClockInterface $clock = null,
     ) {
         parent::__construct($dispatcher, $client);
     }
@@ -43,7 +45,7 @@ public function create(Dsn $dsn): BlueskyTransport
         $user = $this->getUser($dsn);
         $secret = $this->getPassword($dsn);
 
-        return (new BlueskyTransport($user, $secret, $this->logger ?? new NullLogger(), $this->client, $this->dispatcher))
+        return (new BlueskyTransport($user, $secret, $this->logger ?? new NullLogger(), $this->client, $this->dispatcher, $this->clock))
             ->setHost($dsn->getHost())
             ->setPort($dsn->getPort());
     }