Added ability to initialize sms options

krasilnikovs · krasilnikovs · commit 56e5dde1cb82 · 2021-01-12T22:42:53.000+02:00
diff --git a/src/Symfony/Component/Notifier/Message/SmsMessage.php b/src/Symfony/Component/Notifier/Message/SmsMessage.php
@@ -23,15 +23,17 @@ final class SmsMessage implements MessageInterface
     private $transport;
     private $subject;
     private $phone;
+    private $options;
 
-    public function __construct(string $phone, string $subject)
+    public function __construct(string $phone, string $subject, ?MessageOptionsInterface $options = null)
     {
         if ('' === $phone) {
             throw new InvalidArgumentException(sprintf('"%s" needs a phone number, it cannot be empty.', static::class));
         }
 
         $this->subject = $subject;
         $this->phone = $phone;
+        $this->options = $options;
     }
 
     public static function fromNotification(Notification $notification, SmsRecipientInterface $recipient): self
@@ -93,8 +95,18 @@ public function getTransport(): ?string
         return $this->transport;
     }
 
+    /**
+     * @return $this
+     */
+    public function options(?MessageOptionsInterface $options): self
+    {
+        $this->options = $options;
+
+        return $this;
+    }
+
     public function getOptions(): ?MessageOptionsInterface
     {
-        return null;
+        return $this->options;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Tests/Message/SmsMessageTest.php b/src/Symfony/Component/Notifier/Tests/Message/SmsMessageTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Notifier\Tests\Message;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Notifier\Message\MessageOptionsInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 
 /**
@@ -57,4 +58,27 @@ public function testEnsureNonEmptyPhoneOnSet()
 
         $message->phone('');
     }
+
+    public function testSetOptions()
+    {
+        $options = new class implements MessageOptionsInterface {
+            public function toArray(): array
+            {
+                return  [];
+            }
+
+            public function getRecipientId(): ?string
+            {
+                return 'id';
+            }
+        };
+
+        $message = new SmsMessage('+3715673920', 'subject', $options);
+
+        $this->assertInstanceOf(MessageOptionsInterface::class, $message->getOptions());
+
+        $message->options(null);
+
+        $this->assertNull($message->getOptions());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,17 @@ final class SmsMessage implements MessageInterface`
`23`	`23`	`private $transport;`
`24`	`24`	`private $subject;`
`25`	`25`	`private $phone;`
	`26`	`+ private $options;`
`26`	`27`
`27`		`- public function __construct(string $phone, string $subject)`
	`28`	`+ public function __construct(string $phone, string $subject, ?MessageOptionsInterface $options = null)`
`28`	`29`	`{`
`29`	`30`	`if ('' === $phone) {`
`30`	`31`	`throw new InvalidArgumentException(sprintf('"%s" needs a phone number, it cannot be empty.', static::class));`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`$this->subject = $subject;`
`34`	`35`	`$this->phone = $phone;`
	`36`	`+ $this->options = $options;`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public static function fromNotification(Notification $notification, SmsRecipientInterface $recipient): self`
`@@ -93,8 +95,18 @@ public function getTransport(): ?string`
`93`	`95`	`return $this->transport;`
`94`	`96`	`}`
`95`	`97`
	`98`	`+ /**`
	`99`	`+ * @return $this`
	`100`	`+ */`
	`101`	`+ public function options(?MessageOptionsInterface $options): self`
	`102`	`+ {`
	`103`	`+ $this->options = $options;`
	`104`	`+`
	`105`	`+ return $this;`
	`106`	`+ }`
	`107`	`+`
`96`	`108`	`public function getOptions(): ?MessageOptionsInterface`
`97`	`109`	`{`
`98`		`- return null;`
	`110`	`+ return $this->options;`
`99`	`111`	`}`
`100`	`112`	`}`