symfony · fabpot · Jul 26, 2022 · Jul 25, 2022
@@ -61,11 +61,13 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        $from = $message->getFrom() ?: $this->from;
+
         $endpoint = sprintf('https://%s/sms/send/', $this->getEndpoint());
         $response = $this->client->request('POST', $endpoint, [
             'auth_basic' => $this->login.':'.$this->apiKey,
             'json' => [
-                'from' => $this->from,
+                'from' => $from,
                 'to' => $message->getPhone(),
                 'text' => $message->getSubject(),
             ],

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.3
 ---
 

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Notifier\Bridge\AmazonSns;
 
 use AsyncAws\Sns\SnsClient;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
 use Symfony\Component\Notifier\Message\ChatMessage;
@@ -53,6 +54,10 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, sprintf('"%s" or "%s"', SmsMessage::class, ChatMessage::class), $message);
         }
 
+        if ($message instanceof SmsMessage && '' !== $message->getFrom()) {
+            throw new InvalidArgumentException(sprintf('The "%s" transport does not support "from" in "%s".', __CLASS__, SmsMessage::class));
+        }
+
         if ($message instanceof ChatMessage && $message->getOptions() instanceof AmazonSnsOptions) {
             $options = $message->getOptions()->toArray();
         }

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+* Throw exception when `SmsMessage->from` defined
+
 5.4
 ---
 

@@ -15,6 +15,7 @@
 use AsyncAws\Sns\SnsClient;
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsOptions;
 use Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\MessageOptionsInterface;
@@ -46,6 +47,16 @@ public function unsupportedMessagesProvider(): iterable
         yield [new ChatMessage('hello', $this->createMock(MessageOptionsInterface::class))];
     }
 
+    public function testSmsMessageWithFrom()
+    {
+        $transport = $this->createTransport();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "Symfony\Component\Notifier\Bridge\AmazonSns\AmazonSnsTransport" transport does not support "from" in "Symfony\Component\Notifier\Message\SmsMessage".');
+
+        $transport->send(new SmsMessage('0600000000', 'test', 'foo'));
+    }
+
     public function testSmsMessageOptions()
     {
         $response = $this->createMock(PublishResponse::class);

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.3
 ---
 

@@ -61,6 +61,8 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $endpoint = sprintf('https://%s/rest/message', $this->getEndpoint());
 
+        $from = $message->getFrom() ?: $this->from;
+
         $response = $this->client->request('POST', $endpoint, [
             'headers' => [
                 'Accept' => 'application/json',
@@ -69,7 +71,7 @@ protected function doSend(MessageInterface $message): SentMessage
                 'X-Version' => 1,
             ],
             'json' => [
-                'from' => $this->from ?? '',
+                'from' => $from ?? '',
                 'to' => [$message->getPhone()],
                 'text' => $message->getSubject(),
             ],

@@ -5,3 +5,4 @@ CHANGELOG
 ---
 
  * Add the bridge
+ * Throw exception when `SmsMessage->from` defined
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Bridge\ContactEveryone;
 
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
 use Symfony\Component\Notifier\Message\MessageInterface;
@@ -67,6 +68,10 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        if ('' !== $message->getFrom()) {
+            throw new InvalidArgumentException(sprintf('The "%s" transport does not support "from" in "%s".', __CLASS__, SmsMessage::class));
+        }
+
         $endpoint = sprintf('https://%s/api/light/diffusions/sms', self::HOST);
         $response = $this->client->request('POST', $endpoint, [
             'query' => [

@@ -13,6 +13,7 @@
 
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
@@ -60,4 +61,14 @@ public function testSendSuccessfully()
 
         $this->assertSame($messageId, $sentMessage->getMessageId());
     }
+
+    public function testSmsMessageWithFrom()
+    {
+        $transport = $this->createTransport();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "Symfony\Component\Notifier\Bridge\ContactEveryone\ContactEveryoneTransport" transport does not support "from" in "Symfony\Component\Notifier\Message\SmsMessage".');
+
+        $transport->send(new SmsMessage('0600000000', 'test', 'foo'));
+    }
 }
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.4
 ---
 

@@ -63,7 +63,9 @@ protected function doSend(MessageInterface $message): SentMessage
             'body' => $message->getSubject(),
         ];
 
-        if (null !== $this->from) {
+        if ('' !== $message->getFrom()) {
+            $messageData['from'] = $message->getFrom();
+        } elseif (null !== $this->from) {
             $messageData['from'] = $this->from;
         }
 

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.4
 ---
 

@@ -64,8 +64,10 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        $from = $message->getFrom() ?: $this->from;
+
         $email = (new Email())
-            ->from($this->from)
+            ->from($from)
             ->to($this->to)
             ->subject(sprintf('New SMS on phone number: %s', $message->getPhone()))
             ->html($message->getSubject())

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 6.1
 ---
 

@@ -57,10 +57,12 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        $from = $message->getFrom() ?: $this->from;
+
         $endpoint = sprintf('https://%s/a1/sms', self::HOST);
         $response = $this->client->request('POST', $endpoint, [
             'body' => [
-                'from' => $this->from,
+                'from' => $from,
                 'to' => $message->getPhone(),
                 'message' => $message->getSubject(),
             ],

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.3
 ---
 

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Bridge\FreeMobile;
 
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException;
 use Symfony\Component\Notifier\Message\MessageInterface;
@@ -57,6 +58,11 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        /** @var SmsMessage $message */
+        if ('' !== $message->getFrom()) {
+            throw new InvalidArgumentException(sprintf('The "%s" transport does not support "from" in "%s".', __CLASS__, SmsMessage::class));
+        }
+
         $endpoint = sprintf('https://%s', $this->getEndpoint());
 
         $response = $this->client->request('POST', $endpoint, [

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Notifier\Bridge\FreeMobile\Tests;
 
 use Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransport;
+use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
@@ -42,4 +43,14 @@ public function unsupportedMessagesProvider(): iterable
         yield [new ChatMessage('Hello!')];
         yield [$this->createMock(MessageInterface::class)];
     }
+
+    public function testSmsMessageWithFrom()
+    {
+        $transport = $this->createTransport();
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "Symfony\Component\Notifier\Bridge\FreeMobile\FreeMobileTransport" transport does not support "from" in "Symfony\Component\Notifier\Message\SmsMessage".');
+
+        $transport->send(new SmsMessage('+33611223344', 'test', 'foo'));
+    }
 }
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.3
 ---
 

@@ -55,12 +55,14 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        $from = $message->getFrom() ?: $this->from;
+
         $endpoint = sprintf('https://%s/rest/mtsms', $this->getEndpoint());
 
         $response = $this->client->request('POST', $endpoint, [
             'auth_basic' => [$this->authToken, ''],
             'json' => [
-                'sender' => $this->from,
+                'sender' => $from,
                 'recipients' => [['msisdn' => $message->getPhone()]],
                 'message' => $message->getSubject(),
             ],

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.3
 ---
 

@@ -54,6 +54,8 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        $from = $message->getFrom() ?: $this->from;
+
         $endpoint = sprintf('https://%s/sms/2/text/advanced', $this->getEndpoint());
 
         $response = $this->client->request('POST', $endpoint, [
@@ -63,7 +65,7 @@ protected function doSend(MessageInterface $message): SentMessage
             'json' => [
                 'messages' => [
                     [
-                        'from' => $this->from,
+                        'from' => $from,
                         'destinations' => [
                             [
                                 'to' => $message->getPhone(),

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 5.3
 ---
 

@@ -57,13 +57,15 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
+        $from = $message->getFrom() ?: $this->from;
+
         $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/messages/v2/send.json', [
             'json' => [
                 'messages' => [
                     [
                         'phone' => $message->getPhone(),
                         'text' => $message->getSubject(),
-                        'sender' => $this->from,
+                        'sender' => $from,
                         'clientId' => uniqid(),
                     ],
                 ],

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.2
+---
+
+ * Use `SmsMessage->from` when defined
+
 6.1
 ---
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ CHANGELOG
		---

		* Add the bridge
		* Throw exception when `SmsMessage->from` defined