symfony
diff --git a/‎src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
+5-1Lines changed: 5 additions & 1 deletion b/‎src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Notifier/Message/ChatMessage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/ChatMessage.php
+7-8Lines changed: 7 additions & 8 deletions b/‎src/Symfony/Component/Notifier/Message/ChatMessage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/ChatMessage.php
+7-8Lines changed: 7 additions & 8 deletions
diff --git a/‎src/Symfony/Component/Notifier/Message/SmsMessage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/SmsMessage.php
+2-3Lines changed: 2 additions & 3 deletions b/‎src/Symfony/Component/Notifier/Message/SmsMessage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Message/SmsMessage.php
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Notifier/Receiver/SmsReceiverInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Receiver/SmsReceiverInterface.php
-2Lines changed: 0 additions & 2 deletions b/‎src/Symfony/Component/Notifier/Receiver/SmsReceiverInterface.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Notifier/Receiver/SmsReceiverInterface.php
-2Lines changed: 0 additions & 2 deletions
@@ -62,7 +62,11 @@ protected function doSend(MessageInterface $message): void
             throw new LogicException(sprintf('The "%s" transport only support instances of "%s" for options.', __CLASS__, SlackOptions::class));
         }
 
-        $options = ($opts = $message->getOptions()) ? $opts->toArray() : [];
+        if (!($opts = $message->getOptions()) && $notification = $message->getNotification()) {
+            $opts = SlackOptions::fromNotification($notification);
+        }
+
+        $options = $opts ? $opts->toArray() : [];
         $options['token'] = $this->accessToken;
         if (!isset($options['channel'])) {
             $options['channel'] = $message->getRecipientId() ?: $this->chatChannel;
 
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Notifier\Message;
 
-use Symfony\Component\Notifier\Bridge\Slack\SlackOptions;
 use Symfony\Component\Notifier\Notification\Notification;
 use Symfony\Component\Notifier\Receiver\Receiver;
 
@@ -23,6 +22,7 @@ final class ChatMessage implements MessageInterface
     private $transport;
     private $subject;
     private $options;
+    private $notification;
 
     public function __construct(string $subject, MessageOptionsInterface $options = null)
     {
@@ -33,13 +33,7 @@ public function __construct(string $subject, MessageOptionsInterface $options =
     public static function fromNotification(Notification $notification, Receiver $receiver, string $transport = null): self
     {
         $message = new self($notification->getSubject());
-
-        // FIXME: here, we need to call a method on the $transport to get the right options
-        // SlackOptions::fromNotification($notification)
-        // or if we have all the information in the message
-        if ('slack' === $transport) {
-            return $message->options(SlackOptions::fromNotification($notification));
-        }
+        $message->notification = $notification;
 
         return $message;
     }
@@ -93,4 +87,9 @@ public function getTransport(): ?string
     {
         return $this->transport;
     }
+
+    public function getNotification(): ?Notification
+    {
+        return $this->notification;
+    }
 }
@@ -13,6 +13,7 @@
 
 use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Notification\Notification;
+use Symfony\Component\Notifier\Notification\SmsNotificationInterface;
 use Symfony\Component\Notifier\Receiver\Receiver;
 use Symfony\Component\Notifier\Receiver\SmsReceiverInterface;
 
@@ -34,11 +35,9 @@ public function __construct(string $phone, string $subject)
     public static function fromNotification(Notification $notification, Receiver $receiver, string $transport = null): self
     {
         if (!$receiver instanceof SmsReceiverInterface) {
-            // FIXME: message is wrong now
-            throw new LogicException(sprintf('To send a SMS notification, "%s" should be overriden in "%s" or the receiver should implement SmsReceiverInterface.', __METHOD__, static::class));
+            throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the receiver should implement "%s".', get_class($notification), SmsNotificationInterface::class, SmsReceiverInterface::class));
         }
 
-        // FIXME: prepend the emoji?
         return new self($receiver->getPhone(), $notification->getSubject());
     }
 
 
@@ -16,8 +16,6 @@
  */
 interface SmsReceiverInterface
 {
-    // FIXME: do we need a ChatReceiverInterface as well? which would depend on the transport 100% of the time
-
     /**
      * @return $this
      */
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Notifier\Exception\LogicException;`
`15`	`15`	`use Symfony\Component\Notifier\Notification\Notification;`
	`16`	`+use Symfony\Component\Notifier\Notification\SmsNotificationInterface;`
`16`	`17`	`use Symfony\Component\Notifier\Receiver\Receiver;`
`17`	`18`	`use Symfony\Component\Notifier\Receiver\SmsReceiverInterface;`
`18`	`19`
`@@ -34,11 +35,9 @@ public function __construct(string $phone, string $subject)`
`34`	`35`	`public static function fromNotification(Notification $notification, Receiver $receiver, string $transport = null): self`
`35`	`36`	`{`
`36`	`37`	`if (!$receiver instanceof SmsReceiverInterface) {`
`37`		`- // FIXME: message is wrong now`
`38`		`- throw new LogicException(sprintf('To send a SMS notification, "%s" should be overriden in "%s" or the receiver should implement SmsReceiverInterface.', __METHOD__, static::class));`
	`38`	`+ throw new LogicException(sprintf('To send a SMS message, "%s" should implement "%s" or the receiver should implement "%s".', get_class($notification), SmsNotificationInterface::class, SmsReceiverInterface::class));`
`39`	`39`	`}`
`40`	`40`
`41`		`- // FIXME: prepend the emoji?`
`42`	`41`	`return new self($receiver->getPhone(), $notification->getSubject());`
`43`	`42`	`}`
`44`	`43`