minor #40712 [Notifier] Simplify LightSms implementation (jderusse)

OskarStark · OskarStark · commit 0cc982c251f4 · 2021-04-07T08:36:17.000+02:00
This PR was merged into the 5.3-dev branch. Discussion ---------- [Notifier] Simplify LightSms implementation | Q | A | ------------- | --- | Branch? | 5.x | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - /cc @OskarStark Commits ------- 1240e9f [notifier] Simplify lightsms implementation
diff --git a/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php b/src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php
@@ -100,15 +100,14 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
         }
 
-        $timestamp = time();
         $data = [
             'login' => $this->login,
-            'phone' => $this->escapePhoneNumber($message->getPhone()),
-            'text' => $message->getSubject(),
+            'phone' => $phone = $this->escapePhoneNumber($message->getPhone()),
             'sender' => $this->from,
-            'timestamp' => $timestamp,
+            'text' => $message->getSubject(),
+            'timestamp' => time(),
         ];
-        $data['signature'] = $this->generateSignature($data, $timestamp);
+        $data['signature'] = $this->generateSignature($data);
 
         $endpoint = sprintf('https://%s/external/get/send.php', $this->getEndpoint());
         $response = $this->client->request(
@@ -125,55 +124,33 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $content = $response->toArray(false);
 
-        // it happens if the host without www
-        if (isset($content['']['error'])) {
-            throw new TransportException('Unable to send the SMS: '.$this->getErrorMsg((int) $content['']['error']), $response);
-        }
-
-        if (isset($content['error'])) {
-            throw new TransportException('Unable to send the SMS: '.$this->getErrorMsg((int) $content['error']), $response);
-        }
+        if (0 !== (int) $content[$phone]['error'] ?? -1) {
+            $errorCode = (int) $content['error'] ?? $content['']['error'] ?? $content[$phone]['error'] ?? -1;
+            if (-1 === $errorCode) {
+                throw new TransportException('Unable to send the SMS.', $response);
+            }
 
-        $phone = $this->escapePhoneNumber($message->getPhone());
-        if (32 === (int) $content[$phone]['error']) {
-            throw new TransportException('Unable to send the SMS: '.$this->getErrorMsg((int) $content[$phone]['error']), $response);
+            $error = self::ERROR_CODES[$errorCode] ?? self::ERROR_CODES[999];
+            throw new TransportException('Unable to send the SMS: '.$error, $response);
         }
 
-        if (0 === (int) $content[$phone]['error']) {
-            $sentMessage = new SentMessage($message, (string) $this);
-            if (isset($content[$phone]['id_sms'])) {
-                $sentMessage->setMessageId($content[$phone]['id_sms']);
-            }
-
-            return $sentMessage;
+        $sentMessage = new SentMessage($message, (string) $this);
+        if (isset($content[$phone]['id_sms'])) {
+            $sentMessage->setMessageId($content[$phone]['id_sms']);
         }
 
-        throw new TransportException('Unable to send the SMS.', $response);
+        return $sentMessage;
     }
 
-    private function generateSignature(array $data, int $timestamp): string
+    private function generateSignature(array $data): string
     {
-        $params = [
-            'timestamp' => $timestamp,
-            'login' => $this->login,
-            'phone' => $data['phone'],
-            'sender' => $this->from,
-            'text' => $data['text'],
-        ];
-
-        ksort($params);
-        reset($params);
+        ksort($data);
 
-        return md5(implode('', $params).$this->password);
+        return md5(implode('', array_values($data)).$this->password);
     }
 
     private function escapePhoneNumber(string $phoneNumber): string
     {
         return str_replace('+', '00', $phoneNumber);
     }
-
-    private function getErrorMsg(int $errorCode): string
-    {
-        return self::ERROR_CODES[$errorCode] ?? self::ERROR_CODES[999];
-    }
 }
