[Notifier] resolve PR issues

szepczynski · szepczynski · commit 45990afcf7fc · 2020-08-17T12:33:07.000+02:00
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/.gitattributes b/src/Symfony/Component/Notifier/Bridge/Smsapi/.gitattributes
@@ -1,3 +1,3 @@
 /Tests export-ignore
 /phpunit.xml.dist export-ignore
-/.gitignore export-ignore
+/.gitignore export-ignore
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/README.md b/src/Symfony/Component/Notifier/Bridge/Smsapi/README.md
@@ -2,3 +2,25 @@ SMSAPI Notifier
 ===============
 
 Provides Smsapi integration for Symfony Notifier.
+
+DSN example
+-----------
+
+```
+// .env file
+SMSAPI_DSN=smsapi://TOKEN@default?from=FROM
+```
+
+where:
+ - `TOKEN` is API Token (OAuth)
+ - `FROM` is sender name
+
+See your account info at https://ssl.smsapi.pl/
+
+Resources
+---------
+
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransport.php
@@ -5,13 +5,15 @@
 use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Transport\AbstractTransport;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
  * @author Marcin Szepczynski <szepczynski@gmail.com>
+ * @experimental in 5.2
  */
 final class SmsapiTransport extends AbstractTransport
 {
@@ -38,7 +40,7 @@ public function supports(MessageInterface $message): bool
         return $message instanceof SmsMessage;
     }
 
-    protected function doSend(MessageInterface $message): void
+    protected function doSend(MessageInterface $message): SentMessage
     {
         if (!$message instanceof SmsMessage) {
             throw new LogicException(sprintf('The "%s" transport only supports instances of "%s" (instance of "%s" given).', __CLASS__, SmsMessage::class, get_debug_type($message)));
@@ -58,7 +60,9 @@ protected function doSend(MessageInterface $message): void
         if (200 !== $response->getStatusCode()) {
             $error = $response->toArray(false);
 
-            throw new TransportException(sprintf('Unable to send the SMS: '.$error['message'].' (see %s).', $error['more_info']), $response);
+            throw new TransportException(sprintf('Unable to send the SMS: %s', $error['message']), $response);
         }
+
+        return new SentMessage($message, (string) $this);
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Smsapi/SmsapiTransportFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @author Marcin Szepczynski <szepczynski@gmail.com>
+ * @experimental in 5.2
  */
 class SmsapiTransportFactory extends AbstractTransportFactory
 {
@@ -24,10 +25,6 @@ public function create(Dsn $dsn): TransportInterface
         $from = $dsn->getOption('from');
         $port = $dsn->getPort();
 
-        if (!$authToken) {
-            throw new IncompleteDsnException('Missing path (maybe you haven\'t update the DSN when upgrading from 5.0).', $dsn->getOriginalDsn());
-        }
-
         if ('smsapi' === $scheme) {
             return (new SmsapiTransport($authToken, $from, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
         }

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,15 @@`
`5`	`5`	`use Symfony\Component\Notifier\Exception\LogicException;`
`6`	`6`	`use Symfony\Component\Notifier\Exception\TransportException;`
`7`	`7`	`use Symfony\Component\Notifier\Message\MessageInterface;`
	`8`	`+use Symfony\Component\Notifier\Message\SentMessage;`
`8`	`9`	`use Symfony\Component\Notifier\Message\SmsMessage;`
`9`	`10`	`use Symfony\Component\Notifier\Transport\AbstractTransport;`
`10`	`11`	`use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;`
`11`	`12`	`use Symfony\Contracts\HttpClient\HttpClientInterface;`
`12`	`13`
`13`	`14`	`/**`
`14`	`15`	`* @author Marcin Szepczynski <szepczynski@gmail.com>`
	`16`	`+ * @experimental in 5.2`
`15`	`17`	`*/`
`16`	`18`	`final class SmsapiTransport extends AbstractTransport`
`17`	`19`	`{`
`@@ -38,7 +40,7 @@ public function supports(MessageInterface $message): bool`
`38`	`40`	`return $message instanceof SmsMessage;`
`39`	`41`	`}`
`40`	`42`
`41`		`- protected function doSend(MessageInterface $message): void`
	`43`	`+ protected function doSend(MessageInterface $message): SentMessage`
`42`	`44`	`{`
`43`	`45`	`if (!$message instanceof SmsMessage) {`
`44`	`46`	`throw new LogicException(sprintf('The "%s" transport only supports instances of "%s" (instance of "%s" given).', __CLASS__, SmsMessage::class, get_debug_type($message)));`
`@@ -58,7 +60,9 @@ protected function doSend(MessageInterface $message): void`
`58`	`60`	`if (200 !== $response->getStatusCode()) {`
`59`	`61`	`$error = $response->toArray(false);`
`60`	`62`
`61`		`- throw new TransportException(sprintf('Unable to send the SMS: '.$error['message'].' (see %s).', $error['more_info']), $response);`
	`63`	`+ throw new TransportException(sprintf('Unable to send the SMS: %s', $error['message']), $response);`
`62`	`64`	`}`
	`65`	`+`
	`66`	`+ return new SentMessage($message, (string) $this);`
`63`	`67`	`}`
`64`	`68`	`}`