Make sure that a transport name is always set

jschaedl · jschaedl · commit 7ecc8f9f36a3 · 2020-10-02T10:36:23.000+02:00
diff --git a/src/Symfony/Component/Notifier/Message/ChatMessage.php b/src/Symfony/Component/Notifier/Message/ChatMessage.php
@@ -77,7 +77,7 @@ public function getOptions(): ?MessageOptionsInterface
     /**
      * @return $this
      */
-    public function transport(?string $transport): self
+    public function transport(?string $transport): MessageInterface
     {
         $this->transport = $transport;
 
diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php
@@ -102,7 +102,7 @@ public function getOptions(): ?MessageOptionsInterface
     /**
      * @return $this
      */
-    public function transport(string $transport): self
+    public function transport(string $transport): MessageInterface
     {
         if (!$this->message instanceof Email) {
             throw new LogicException('Cannot set a Transport on a RawMessage instance.');
diff --git a/src/Symfony/Component/Notifier/Message/MessageInterface.php b/src/Symfony/Component/Notifier/Message/MessageInterface.php
@@ -25,4 +25,6 @@ public function getSubject(): string;
     public function getOptions(): ?MessageOptionsInterface;
 
     public function getTransport(): ?string;
+
+    public function transport(string $transport): MessageInterface;
 }
diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -83,7 +83,7 @@ public function getSubject(): string
     /**
      * @return $this
      */
-    public function transport(string $transport): self
+    public function transport(string $transport): MessageInterface
     {
         $this->transport = $transport;
 
diff --git a/src/Symfony/Component/Notifier/Transport/NullTransport.php b/src/Symfony/Component/Notifier/Transport/NullTransport.php
@@ -34,6 +34,10 @@ public function __construct(EventDispatcherInterface $dispatcher = null)
 
     public function send(MessageInterface $message): SentMessage
     {
+        if (null === $message->getTransport()) {
+            $message->transport((string) $this);
+        }
+
         if (null !== $this->dispatcher) {
             $this->dispatcher->dispatch(new MessageEvent($message));
         }
diff --git a/src/Symfony/Component/Notifier/Transport/Transports.php b/src/Symfony/Component/Notifier/Transport/Transports.php
@@ -55,8 +55,9 @@ public function supports(MessageInterface $message): bool
     public function send(MessageInterface $message): SentMessage
     {
         if (!$transport = $message->getTransport()) {
-            foreach ($this->transports as $transport) {
+            foreach ($this->transports as $transportName => $transport) {
                 if ($transport->supports($message)) {
+                    $message->transport($transportName);
                     return $transport->send($message);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function getOptions(): ?MessageOptionsInterface`
`77`	`77`	`/**`
`78`	`78`	`* @return $this`
`79`	`79`	`*/`
`80`		`- public function transport(?string $transport): self`
	`80`	`+ public function transport(?string $transport): MessageInterface`
`81`	`81`	`{`
`82`	`82`	`$this->transport = $transport;`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function getOptions(): ?MessageOptionsInterface`
`102`	`102`	`/**`
`103`	`103`	`* @return $this`
`104`	`104`	`*/`
`105`		`- public function transport(string $transport): self`
	`105`	`+ public function transport(string $transport): MessageInterface`
`106`	`106`	`{`
`107`	`107`	`if (!$this->message instanceof Email) {`
`108`	`108`	`throw new LogicException('Cannot set a Transport on a RawMessage instance.');`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,6 @@ public function getSubject(): string;`
`25`	`25`	`public function getOptions(): ?MessageOptionsInterface;`
`26`	`26`
`27`	`27`	`public function getTransport(): ?string;`
	`28`	`+`
	`29`	`+ public function transport(string $transport): MessageInterface;`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function getSubject(): string`
`83`	`83`	`/**`
`84`	`84`	`* @return $this`
`85`	`85`	`*/`
`86`		`- public function transport(string $transport): self`
	`86`	`+ public function transport(string $transport): MessageInterface`
`87`	`87`	`{`
`88`	`88`	`$this->transport = $transport;`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ public function __construct(EventDispatcherInterface $dispatcher = null)`
`34`	`34`
`35`	`35`	`public function send(MessageInterface $message): SentMessage`
`36`	`36`	`{`
	`37`	`+ if (null === $message->getTransport()) {`
	`38`	`+ $message->transport((string) $this);`
	`39`	`+ }`
	`40`	`+`
`37`	`41`	`if (null !== $this->dispatcher) {`
`38`	`42`	`$this->dispatcher->dispatch(new MessageEvent($message));`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,9 @@ public function supports(MessageInterface $message): bool`
`55`	`55`	`public function send(MessageInterface $message): SentMessage`
`56`	`56`	`{`
`57`	`57`	`if (!$transport = $message->getTransport()) {`
`58`		`- foreach ($this->transports as $transport) {`
	`58`	`+ foreach ($this->transports as $transportName => $transport) {`
`59`	`59`	`if ($transport->supports($message)) {`
	`60`	`+ $message->transport($transportName);`
`60`	`61`	`return $transport->send($message);`
`61`	`62`	`}`
`62`	`63`	`}`