[Mailer] Change the DSN semantics

Author: fabpot

Exception/UnsupportedSchemeException.php

@@ -18,8 +18,8 @@
  */
 class UnsupportedSchemeException extends LogicException
 {
-    public function __construct(Dsn $dsn, array $supported)
+    public function __construct(Dsn $dsn, string $name, array $supported)
     {
-        parent::__construct(sprintf('The "%s" scheme is not supported for mailer "%s". Supported schemes are: "%s".', $dsn->getScheme(), $dsn->getHost(), implode('", "', $supported)));
+        parent::__construct(sprintf('The "%s" scheme is not supported. Supported schemes for mailer "%s" are: "%s".', $dsn->getScheme(), $name, implode('", "', $supported)));
     }
 }

Test/TransportFactoryTestCase.php

@@ -69,7 +69,7 @@ public function testCreate(Dsn $dsn, TransportInterface $transport): void
         $factory = $this->getFactory();
 
         $this->assertEquals($transport, $factory->create($dsn));
-        if ('smtp' !== $dsn->getScheme() && 'smtps' !== $dsn->getScheme()) {
+        if (false !== strpos('smtp', $dsn->getScheme())) {
             $this->assertStringMatchesFormat($dsn->getScheme().'://%S'.$dsn->getHost().'%S', (string) $transport);
         }
     }

Tests/Transport/NullTransportFactoryTest.php

@@ -27,29 +27,16 @@ public function getFactory(): TransportFactoryInterface
     public function supportsProvider(): iterable
     {
         yield [
-            new Dsn('smtp', 'null'),
+            new Dsn('null', ''),
             true,
         ];
-
-        yield [
-            new Dsn('smtp', 'example.com'),
-            false,
-        ];
     }
 
     public function createProvider(): iterable
     {
         yield [
-            new Dsn('smtp', 'null'),
+            new Dsn('null', 'null'),
             new NullTransport($this->getDispatcher(), $this->getLogger()),
         ];
     }
-
-    public function unsupportedSchemeProvider(): iterable
-    {
-        yield [
-            new Dsn('foo', 'null'),
-            'The "foo" scheme is not supported for mailer "null". Supported schemes are: "smtp".',
-        ];
-    }
 }

Tests/Transport/NullTransportTest.php

@@ -19,6 +19,6 @@ class NullTransportTest extends TestCase
     public function testToString()
     {
         $t = new NullTransport();
-        $this->assertEquals('smtp://null', (string) $t);
+        $this->assertEquals('null://', (string) $t);
     }
 }

Tests/Transport/SendmailTransportFactoryTest.php

@@ -27,29 +27,24 @@ public function getFactory(): TransportFactoryInterface
     public function supportsProvider(): iterable
     {
         yield [
-            new Dsn('smtp', 'sendmail'),
+            new Dsn('sendmail+smtp', 'default'),
             true,
         ];
-
-        yield [
-            new Dsn('smtp', 'example.com'),
-            false,
-        ];
     }
 
     public function createProvider(): iterable
     {
         yield [
-            new Dsn('smtp', 'sendmail'),
+            new Dsn('sendmail+smtp', 'default'),
             new SendmailTransport(null, $this->getDispatcher(), $this->getLogger()),
         ];
     }
 
     public function unsupportedSchemeProvider(): iterable
     {
         yield [
-            new Dsn('http', 'sendmail'),
-            'The "http" scheme is not supported for mailer "sendmail". Supported schemes are: "smtp".',
+            new Dsn('sendmail+http', 'default'),
+            'The "sendmail+http" scheme is not supported. Supported schemes for mailer "sendmail" are: "sendmail", "sendmail+smtp".',
         ];
     }
 }

Tests/Transport/Smtp/EsmtpTransportFactoryTest.php

@@ -64,7 +64,7 @@ public function createProvider(): iterable
         $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
 
         yield [
-            new Dsn('smtp', 'example.com', '', '', 465),
+            new Dsn('smtps', 'example.com', '', '', 465),
             $transport,
         ];
     }

Transport/AbstractHttpTransport.php

@@ -24,6 +24,8 @@
  */
 abstract class AbstractHttpTransport extends AbstractTransport
 {
+    protected $host;
+    protected $port;
     protected $client;
 
     public function __construct(HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
@@ -40,6 +42,26 @@ public function __construct(HttpClientInterface $client = null, EventDispatcherI
         parent::__construct($dispatcher, $logger);
     }
 
+    /**
+     * @return $this
+     */
+    public function setHost(?string $host)
+    {
+        $this->host = $host;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function setPort(?int $port)
+    {
+        $this->port = $port;
+
+        return $this;
+    }
+
     abstract protected function doSendHttp(SentMessage $message): ResponseInterface;
 
     protected function doSend(SentMessage $message): void

Transport/AbstractTransportFactory.php

@@ -32,6 +32,13 @@ public function __construct(EventDispatcherInterface $dispatcher = null, HttpCli
         $this->logger = $logger;
     }
 
+    public function supports(Dsn $dsn): bool
+    {
+        return \in_array($dsn->getScheme(), $this->getSupportedSchemes());
+    }
+
+    abstract protected function getSupportedSchemes(): array;
+
     protected function getUser(Dsn $dsn): string
     {
         $user = $dsn->getUser();

Transport/NullTransport.php

@@ -26,6 +26,6 @@ protected function doSend(SentMessage $message): void
 
     public function __toString(): string
     {
-        return 'smtp://null';
+        return 'null://';
     }
 }

Transport/NullTransportFactory.php

@@ -20,15 +20,15 @@ final class NullTransportFactory extends AbstractTransportFactory
 {
     public function create(Dsn $dsn): TransportInterface
     {
-        if ('smtp' === $dsn->getScheme()) {
+        if ('null' === $dsn->getScheme()) {
             return new NullTransport($this->dispatcher, $this->logger);
         }
 
-        throw new UnsupportedSchemeException($dsn, ['smtp']);
+        throw new UnsupportedSchemeException($dsn, 'null', $this->getSupportedSchemes());
     }
 
-    public function supports(Dsn $dsn): bool
+    protected function getSupportedSchemes(): array
     {
-        return 'null' === $dsn->getHost();
+        return ['null'];
     }
 }