[Notifier] Bring consistency to bridges

Author: nicolas-grekas

CHANGELOG.md

@@ -1,11 +1,6 @@
 CHANGELOG
 =========
 
-6.3
----
-
- * Add `ClickatellOptions` class
-
 6.2
 ---
 

ClickatellOptions.php

@@ -45,12 +45,12 @@ public function __toString(): string
             return sprintf('clickatell://%s', $this->getEndpoint());
         }
 
-        return sprintf('clickatell://%s?from=%s', $this->getEndpoint(), $this->from);
+        return sprintf('clickatell://%s%s', $this->getEndpoint(), null !== $this->from ? '?from='.$this->from : '');
     }
 
     public function supports(MessageInterface $message): bool
     {
-        return $message instanceof SmsMessage && (null === $message->getOptions() || $message->getOptions() instanceof ClickatellOptions);
+        return $message instanceof SmsMessage;
     }
 
     protected function doSend(MessageInterface $message): SentMessage
@@ -61,11 +61,8 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $endpoint = sprintf('https://%s/rest/message', $this->getEndpoint());
 
-        $from = $message->getFrom() ?: $this->from ?: '';
-
-        $opts = $message->getOptions();
-        $options = $opts ? $opts->toArray() : [];
-        $options['from'] = $options['from'] ?? $from;
+        $options = [];
+        $options['from'] = $message->getFrom() ?: $this->from;
         $options['to'] = $message->getPhone();
         $options['text'] = $message->getSubject();
 

ClickatellTransport.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Notifier\Bridge\Clickatell\Tests;
 
 use Symfony\Component\HttpClient\MockHttpClient;
-use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellOptions;
 use Symfony\Component\Notifier\Bridge\Clickatell\ClickatellTransport;
 use Symfony\Component\Notifier\Exception\LogicException;
 use Symfony\Component\Notifier\Exception\TransportException;
@@ -40,7 +39,6 @@ public static function toStringProvider(): iterable
     public static function supportedMessagesProvider(): iterable
     {
         yield [new SmsMessage('+33612345678', 'Hello!')];
-        yield [new SmsMessage('+33612345678', 'Hello!', 'from', new ClickatellOptions(['from' => 'foo']))];
     }
 
     public static function unsupportedMessagesProvider(): iterable