[Mailer] Catch missing scheme in DSN.

symfony · Jun 11, 2019 · c00966a · c00966a
1 parent cf728f5
commit c00966a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -69,10 +69,17 @@ public function testFromInvalidDsn()
         Transport::fromDsn('some://');
     }
 
+    public function testNoScheme()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The "//sendmail" mailer DSN must contain a mailer name and transport scheme.');
+        Transport::fromDsn('//sendmail');
+    }
+
     public function testFromInvalidDsnNoHost()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The "?!" mailer DSN must contain a mailer name.');
+        $this->expectExceptionMessage('The "?!" mailer DSN must contain a mailer name and transport scheme.');
         Transport::fromDsn('?!');
     }
 

diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
@@ -64,8 +64,8 @@ private static function createTransport(string $dsn, EventDispatcherInterface $d
             throw new InvalidArgumentException(sprintf('The "%s" mailer DSN is invalid.', $dsn));
         }
 
-        if (!isset($parsedDsn['host'])) {
-            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a mailer name.', $dsn));
+        if (!isset($parsedDsn['scheme'], $parsedDsn['host'])) {
+            throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a mailer name and transport scheme.', $dsn));
         }
 
         $user = \urldecode($parsedDsn['user'] ?? '');