From 92c28de41b12f5d4b32a3a7025921dbbe50e7c33 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 6 Aug 2020 06:53:52 +0200
Subject: [PATCH] [Notifier] Fix SentMessage implementation

---
 src/Symfony/Component/Notifier/CHANGELOG.md               | 2 +-
 src/Symfony/Component/Notifier/Chatter.php                | 8 ++++++--
 src/Symfony/Component/Notifier/Texter.php                 | 8 ++++++--
 .../Component/Notifier/Transport/TransportInterface.php   | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md
index 1878aa5f9783..c395ebf50632 100644
--- a/src/Symfony/Component/Notifier/CHANGELOG.md
+++ b/src/Symfony/Component/Notifier/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 5.2.0
 -----
 
- * [BC BREAK] The `TransportInterface::send()` and `AbstractTransport::doSend()` methods changed to return a `SentMessage` instance instead of `void`.
+ * [BC BREAK] The `TransportInterface::send()` and `AbstractTransport::doSend()` methods changed to return a `?SentMessage` instance instead of `void`.
 
 5.1.0
 -----
diff --git a/src/Symfony/Component/Notifier/Chatter.php b/src/Symfony/Component/Notifier/Chatter.php
index 74cd8844e227..1c36a3ab77b8 100644
--- a/src/Symfony/Component/Notifier/Chatter.php
+++ b/src/Symfony/Component/Notifier/Chatter.php
@@ -48,10 +48,12 @@ public function supports(MessageInterface $message): bool
         return $this->transport->supports($message);
     }
 
-    public function send(MessageInterface $message): SentMessage
+    public function send(MessageInterface $message): ?SentMessage
     {
         if (null === $this->bus) {
-            return $this->transport->send($message);
+            $this->transport->send($message);
+
+            return null;
         }
 
         if (null !== $this->dispatcher) {
@@ -59,5 +61,7 @@ public function send(MessageInterface $message): SentMessage
         }
 
         $this->bus->dispatch($message);
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Texter.php b/src/Symfony/Component/Notifier/Texter.php
index 29dbb8f8ea0b..3f4344e826de 100644
--- a/src/Symfony/Component/Notifier/Texter.php
+++ b/src/Symfony/Component/Notifier/Texter.php
@@ -48,10 +48,12 @@ public function supports(MessageInterface $message): bool
         return $this->transport->supports($message);
     }
 
-    public function send(MessageInterface $message): SentMessage
+    public function send(MessageInterface $message): ?SentMessage
     {
         if (null === $this->bus) {
-            return $this->transport->send($message);
+            $this->transport->send($message);
+
+            return null;
         }
 
         if (null !== $this->dispatcher) {
@@ -59,5 +61,7 @@ public function send(MessageInterface $message): SentMessage
         }
 
         $this->bus->dispatch($message);
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Transport/TransportInterface.php b/src/Symfony/Component/Notifier/Transport/TransportInterface.php
index 38feefde2622..71cf62169746 100644
--- a/src/Symfony/Component/Notifier/Transport/TransportInterface.php
+++ b/src/Symfony/Component/Notifier/Transport/TransportInterface.php
@@ -25,7 +25,7 @@ interface TransportInterface
     /**
      * @throws TransportExceptionInterface
      */
-    public function send(MessageInterface $message): SentMessage;
+    public function send(MessageInterface $message): ?SentMessage;
 
     public function supports(MessageInterface $message): bool;