[Mailer] Catch missing scheme in DSN.

derrabus · derrabus · commit c00966a1721b · 2019-06-11T12:37:46.000+02:00
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'] ?? '');

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,17 @@ public function testFromInvalidDsn()`
`69`	`69`	`Transport::fromDsn('some://');`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ public function testNoScheme()`
	`73`	`+ {`
	`74`	`+ $this->expectException(InvalidArgumentException::class);`
	`75`	`+ $this->expectExceptionMessage('The "//sendmail" mailer DSN must contain a mailer name and transport scheme.');`
	`76`	`+ Transport::fromDsn('//sendmail');`
	`77`	`+ }`
	`78`	`+`
`72`	`79`	`public function testFromInvalidDsnNoHost()`
`73`	`80`	`{`
`74`	`81`	`$this->expectException(InvalidArgumentException::class);`
`75`		`- $this->expectExceptionMessage('The "?!" mailer DSN must contain a mailer name.');`
	`82`	`+ $this->expectExceptionMessage('The "?!" mailer DSN must contain a mailer name and transport scheme.');`
`76`	`83`	`Transport::fromDsn('?!');`
`77`	`84`	`}`
`78`	`85`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ private static function createTransport(string $dsn, EventDispatcherInterface $d`
`64`	`64`	`throw new InvalidArgumentException(sprintf('The "%s" mailer DSN is invalid.', $dsn));`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (!isset($parsedDsn['host'])) {`
`68`		`- throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a mailer name.', $dsn));`
	`67`	`+ if (!isset($parsedDsn['scheme'], $parsedDsn['host'])) {`
	`68`	`+ throw new InvalidArgumentException(sprintf('The "%s" mailer DSN must contain a mailer name and transport scheme.', $dsn));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`$user = \urldecode($parsedDsn['user'] ?? '');`