bug #37748 [Notifier] Fix SentMessage implementation (fabpot)

fabpot · fabpot · commit b9684977700b · 2020-08-06T07:19:29.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [Notifier] Fix SentMessage implementation | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a  | License | MIT | Doc PR | n/a #36611 broke the Notifier when used with Messenger. /cc @jeremyFreeAgent Commits ------- 92c28de [Notifier] Fix SentMessage implementation
diff --git 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
@@ -48,16 +48,20 @@ 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) {
             $this->dispatcher->dispatch(new MessageEvent($message, true));
         }
 
         $this->bus->dispatch($message);
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Texter.php b/src/Symfony/Component/Notifier/Texter.php
@@ -48,16 +48,20 @@ 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) {
             $this->dispatcher->dispatch(new MessageEvent($message, true));
         }
 
         $this->bus->dispatch($message);
+
+        return null;
     }
 }
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,20 @@ public function supports(MessageInterface $message): bool`
`48`	`48`	`return $this->transport->supports($message);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public function send(MessageInterface $message): SentMessage`
	`51`	`+ public function send(MessageInterface $message): ?SentMessage`
`52`	`52`	`{`
`53`	`53`	`if (null === $this->bus) {`
`54`		`- return $this->transport->send($message);`
	`54`	`+ $this->transport->send($message);`
	`55`	`+`
	`56`	`+ return null;`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`if (null !== $this->dispatcher) {`
`58`	`60`	`$this->dispatcher->dispatch(new MessageEvent($message, true));`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`$this->bus->dispatch($message);`
	`64`	`+`
	`65`	`+ return null;`
`62`	`66`	`}`
`63`	`67`	`}`