* sender changed to from

Vasilij Dusko | CREATION · Vasilij Dusko | CREATION · commit 7f13dbf71164 · 2021-03-29T17:49:52.000+03:00
diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php
@@ -26,7 +26,7 @@
  */
 final class LightSmsTransport extends AbstractTransport
 {
-    protected const HOST = 'www.lightsms.com';
+    protected const HOST = 'lightsms.com';
 
     private $login;
     private $password;
@@ -75,11 +75,11 @@ final class LightSmsTransport extends AbstractTransport
         '39' => 'Phone number does not exist in this database',
     ];
 
-    public function __construct(string $login, string $password, string $phone, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(string $login, string $password, string $from, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
         $this->login = $login;
         $this->password = $password;
-        $this->phone = $phone;
+        $this->from = $from;
 
         parent::__construct($client, $dispatcher);
     }
@@ -102,19 +102,16 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $timestamp = time();
 
-        $signature = $this->generateSignature([
-            'message' => $message,
-            'timestamp' => $timestamp,
-        ]);
+        $signature = $this->generateSignature($message, $timestamp);
 
         $endpoint = sprintf(
-            'https://%s/external/get/send.php?login=%s&signature=%s&phone=%s&text=%s&sender=%s&timestamp=%s',
+            'https://www.%s/external/get/send.php?login=%s&signature=%s&phone=%s&text=%s&sender=%s&timestamp=%s',
             $this->getEndpoint(),
             $this->login,
             $signature,
             $this->escapePhoneNumber($message->getPhone()),
             $this->escapeSubject($message->getSubject()),
-            $this->phone,
+            $this->from,
             $timestamp
         );
 
@@ -143,14 +140,14 @@ protected function doSend(MessageInterface $message): SentMessage
         return $sentMessage;
     }
 
-    private function generateSignature(array $params): string
+    private function generateSignature(SmsMessage $message, string $timestamp): string
     {
         $params = [
-            'timestamp' => $params['timestamp'],
+            'timestamp' => $timestamp,
             'login' => $this->login,
-            'phone' => $this->escapePhoneNumber($params['message']->getPhone()),
-            'sender' => $this->phone,
-            'text' => $this->escapeSubject($params['message']->getSubject()),
+            'phone' => $this->escapePhoneNumber($message->getPhone()),
+            'sender' => $this->from,
+            'text' => $this->escapeSubject($message->getSubject()),
         ];
 
         ksort($params);
diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransportFactory.php
@@ -34,12 +34,12 @@ public function create(Dsn $dsn): TransportInterface
 
         $login = $this->getUser($dsn);
         $token = $this->getPassword($dsn);
-        $phone = $dsn->getRequiredOption('phone');
+        $from = $dsn->getRequiredOption('from');
 
         $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
         $port = $dsn->getPort();
 
-        return (new LightSmsTransport($login, $token, $phone, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
+        return (new LightSmsTransport($login, $token, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
     }
 
     protected function getSupportedSchemes(): array
diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/LightSms/Tests/LightSmsTransportFactoryTest.php
@@ -41,7 +41,7 @@ public function supportsProvider(): iterable
 
     public function unsupportedSchemeProvider(): iterable
     {
-        yield ['somethingElse://accountSid:authToken@default?phone=37061234567'];
-        yield ['somethingElse://accountSid:authToken@default']; // missing "phone" option
+        yield ['somethingElse://login:token@default?phone=37061234567'];
+        yield ['somethingElse://login:token@default']; // missing "phone" option
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function supportsProvider(): iterable`
`41`	`41`
`42`	`42`	`public function unsupportedSchemeProvider(): iterable`
`43`	`43`	`{`
`44`		`- yield ['somethingElse://accountSid:authToken@default?phone=37061234567'];`
`45`		`- yield ['somethingElse://accountSid:authToken@default']; // missing "phone" option`
	`44`	`+ yield ['somethingElse://login:token@default?phone=37061234567'];`
	`45`	`+ yield ['somethingElse://login:token@default']; // missing "phone" option`
`46`	`46`	`}`
`47`	`47`	`}`