Merge branch '5.1' into 5.2

derrabus · derrabus · commit 904b05a0dea7 · 2020-12-16T08:59:53.000+01:00
* 5.1:
  [Notifier] Improve tests (5.1)
  [Notifier] Fix wrong package names
  [Notifier] [Free Mobile] Could not use custom host in DSN
diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportFactoryTest.php
@@ -25,8 +25,7 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $transport = $factory->create(Dsn::fromString('firebase://username:password@default'));
-        $transport->setHost('host.test');
+        $transport = $factory->create(Dsn::fromString('firebase://username:password@host.test'));
 
         $this->assertSame('firebase://host.test', (string) $transport);
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php
@@ -27,7 +27,7 @@
  */
 final class FreeMobileTransport extends AbstractTransport
 {
-    protected const HOST = 'https://smsapi.free-mobile.fr/sendmsg';
+    protected const HOST = 'smsapi.free-mobile.fr/sendmsg';
 
     private $login;
     private $password;
@@ -58,7 +58,9 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new LogicException(sprintf('The "%s" transport only supports instances of "%s" (instance of "%s" given) and configured with your phone number.', __CLASS__, SmsMessage::class, \get_class($message)));
         }
 
-        $response = $this->client->request('POST', $this->getEndpoint(), [
+        $endpoint = sprintf('https://%s', $this->getEndpoint());
+
+        $response = $this->client->request('POST', $endpoint, [
             'json' => [
                 'user' => $this->login,
                 'pass' => $this->password,
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransportFactory.php
@@ -43,7 +43,10 @@ public function create(Dsn $dsn): TransportInterface
             throw new IncompleteDsnException('Missing phone.', $dsn->getOriginalDsn());
         }
 
-        return new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher);
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
     }
 
     protected function getSupportedSchemes(): array
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php
@@ -23,9 +23,7 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $dsn = 'freemobile://login:pass@default?phone=0611223344';
-        $transport = $factory->create(Dsn::fromString($dsn));
-        $transport->setHost('host.test');
+        $transport = $factory->create(Dsn::fromString('freemobile://login:pass@host.test?phone=0611223344'));
 
         $this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportFactoryTest.php
@@ -26,13 +26,9 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $accessToken = 'testAccessToken';
-        $host = 'testHost';
-        $channel = 'testChannel';
+        $transport = $factory->create(Dsn::fromString('mattermost://accessToken@host.test?channel=testChannel'));
 
-        $transport = $factory->create(Dsn::fromString(sprintf('mattermost://%s@%s/?channel=%s', $accessToken, $host, $channel)));
-
-        $this->assertSame(sprintf('mattermost://%s?channel=%s', $host, $channel), (string) $transport);
+        $this->assertSame('mattermost://host.test?channel=testChannel', (string) $transport);
     }
 
     public function testCreateWithMissingOptionChannelThrowsIncompleteDsnException()
@@ -49,21 +45,21 @@ public function testCreateWithNoTokenThrowsIncompleteDsnException()
         $factory = $this->createFactory();
 
         $this->expectException(IncompleteDsnException::class);
-        $factory->create(Dsn::fromString(sprintf('mattermost://%s/?channel=%s', 'testHost', 'testChannel')));
+        $factory->create(Dsn::fromString('mattermost://host.test?channel=testChannel'));
     }
 
     public function testSupportsReturnsTrueWithSupportedScheme()
     {
         $factory = $this->createFactory();
 
-        $this->assertTrue($factory->supports(Dsn::fromString('mattermost://token@host/?channel=testChannel')));
+        $this->assertTrue($factory->supports(Dsn::fromString('mattermost://token@host?channel=testChannel')));
     }
 
     public function testSupportsReturnsFalseWithUnsupportedScheme()
     {
         $factory = $this->createFactory();
 
-        $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host/?channel=testChannel')));
+        $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host?channel=testChannel')));
     }
 
     public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
@@ -72,7 +68,7 @@ public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
 
         $this->expectException(UnsupportedSchemeException::class);
 
-        $factory->create(Dsn::fromString('somethingElse://token@host/?channel=testChannel'));
+        $factory->create(Dsn::fromString('somethingElse://token@host?channel=testChannel'));
     }
 
     public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()
diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/Tests/MattermostTransportTest.php
@@ -38,7 +38,7 @@ public function testSupportsChatMessage()
         $this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
     }
 
-    public function testSendNonChatMessageThrows()
+    public function testSendNonChatMessageThrowsLogicException()
     {
         $transport = $this->createTransport();
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Nexmo/Tests/NexmoTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Nexmo/Tests/NexmoTransportFactoryTest.php
@@ -23,9 +23,7 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $dsn = 'nexmo://apiKey:apiSecret@default?from=0611223344';
-        $transport = $factory->create(Dsn::fromString($dsn));
-        $transport->setHost('host.test');
+        $transport = $factory->create(Dsn::fromString('nexmo://apiKey:apiSecret@host.test?from=0611223344'));
 
         $this->assertSame('nexmo://host.test?from=0611223344', (string) $transport);
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/OvhCloud/Tests/OvhCloudTransportFactoryTest.php
@@ -23,9 +23,7 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $dsn = 'ovhcloud://applicationKey:applicationSecret@default?consumer_key=consumerKey&service_name=serviceName';
-        $transport = $factory->create(Dsn::fromString($dsn));
-        $transport->setHost('host.test');
+        $transport = $factory->create(Dsn::fromString('ovhcloud://applicationKey:applicationSecret@host.test?consumer_key=consumerKey&service_name=serviceName'));
 
         $this->assertSame('ovhcloud://host.test?consumer_key=consumerKey&service_name=serviceName', (string) $transport);
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportFactoryTest.php
@@ -26,35 +26,31 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $accessToken = 'testAccessToken';
-        $host = 'testHost';
-        $channel = 'testChannel';
+        $transport = $factory->create(Dsn::fromString('rocketchat://accessToken@host.test?channel=testChannel'));
 
-        $transport = $factory->create(Dsn::fromString(sprintf('rocketchat://%s@%s/?channel=%s', $accessToken, $host, $channel)));
-
-        $this->assertSame(sprintf('rocketchat://%s?channel=%s', $host, $channel), (string) $transport);
+        $this->assertSame('rocketchat://host.test?channel=testChannel', (string) $transport);
     }
 
     public function testCreateWithNoTokenThrowsIncompleteDsnException()
     {
         $factory = $this->createFactory();
 
         $this->expectException(IncompleteDsnException::class);
-        $factory->create(Dsn::fromString(sprintf('rocketchat://%s/?channel=%s', 'testHost', 'testChannel')));
+        $factory->create(Dsn::fromString('rocketchat://host.test?channel=testChannel'));
     }
 
     public function testSupportsReturnsTrueWithSupportedScheme()
     {
         $factory = $this->createFactory();
 
-        $this->assertTrue($factory->supports(Dsn::fromString('rocketchat://token@host/?channel=testChannel')));
+        $this->assertTrue($factory->supports(Dsn::fromString('rocketchat://token@host?channel=testChannel')));
     }
 
     public function testSupportsReturnsFalseWithUnsupportedScheme()
     {
         $factory = $this->createFactory();
 
-        $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host/?channel=testChannel')));
+        $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host?channel=testChannel')));
     }
 
     public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
@@ -63,7 +59,7 @@ public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
 
         $this->expectException(UnsupportedSchemeException::class);
 
-        $factory->create(Dsn::fromString('somethingElse://token@host/?channel=testChannel'));
+        $factory->create(Dsn::fromString('somethingElse://token@host?channel=testChannel'));
     }
 
     private function createFactory(): RocketChatTransportFactory
diff --git a/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportTest.php b/src/Symfony/Component/Notifier/Bridge/RocketChat/Tests/RocketChatTransportTest.php
@@ -38,7 +38,7 @@ public function testSupportsChatMessage()
         $this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
     }
 
-    public function testSendNonChatMessageThrows()
+    public function testSendNonChatMessageThrowsLogicException()
     {
         $transport = $this->createTransport();
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sinch/Tests/SinchTransportFactoryTest.php
@@ -23,9 +23,7 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $dsn = 'sinch://accountSid:authToken@default?from=0611223344';
-        $transport = $factory->create(Dsn::fromString($dsn));
-        $transport->setHost('host.test');
+        $transport = $factory->create(Dsn::fromString('sinch://accountSid:authToken@host.test?from=0611223344'));
 
         $this->assertSame('sinch://host.test?from=0611223344', (string) $transport);
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportFactoryTest.php
@@ -24,14 +24,12 @@ public function testCreateWithDsn()
     {
         $factory = new SlackTransportFactory();
 
-        $host = 'testHost';
-        $channel = 'testChannel';
-        $transport = $factory->create(Dsn::fromString(sprintf('slack://testUser@%s/?channel=%s', $host, $channel)));
+        $transport = $factory->create(Dsn::fromString('slack://testUser@testHost/?channel=testChannel'));
 
-        $this->assertSame(sprintf('slack://%s?channel=%s', $host, $channel), (string) $transport);
+        $this->assertSame('slack://testHost?channel=testChannel', (string) $transport);
     }
 
-    public function testCreateWithDeprecatedDsn(): void
+    public function testCreateWithDeprecatedDsn()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Support for Slack webhook DSN has been dropped since 5.2 (maybe you haven\'t updated the DSN when upgrading from 5.1).');
@@ -40,7 +38,7 @@ public function testCreateWithDeprecatedDsn(): void
         $factory->create(Dsn::fromString('slack://default/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX'));
     }
 
-    public function testCreateWithNoTokenThrowsMalformed(): void
+    public function testCreateWithNoTokenThrowsMalformed()
     {
         $factory = new SlackTransportFactory();
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php
@@ -28,13 +28,12 @@ final class SlackTransportTest extends TestCase
 {
     public function testToStringContainsProperties()
     {
-        $host = 'testHost';
         $channel = 'test Channel'; // invalid channel name to test url encoding of the channel
 
         $transport = new SlackTransport('testToken', $channel, $this->createMock(HttpClientInterface::class));
         $transport->setHost('testHost');
 
-        $this->assertSame(sprintf('slack://%s?channel=%s', $host, urlencode($channel)), (string) $transport);
+        $this->assertSame('slack://testHost?channel=test+Channel', (string) $transport);
     }
 
     public function testSupportsChatMessage()
@@ -45,7 +44,7 @@ public function testSupportsChatMessage()
         $this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
     }
 
-    public function testSendNonChatMessageThrows()
+    public function testSendNonChatMessageThrowsLogicException()
     {
         $this->expectException(LogicException::class);
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportFactoryTest.php
@@ -23,42 +23,39 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $host = 'testHost';
-        $channel = 'testChannel';
+        $transport = $factory->create(Dsn::fromString('telegram://user:password@host.test?channel=testChannel'));
 
-        $transport = $factory->create(Dsn::fromString(sprintf('telegram://%s@%s/?channel=%s', 'testUser:testPassword', $host, $channel)));
-
-        $this->assertSame(sprintf('telegram://%s?channel=%s', $host, $channel), (string) $transport);
+        $this->assertSame('telegram://host.test?channel=testChannel', (string) $transport);
     }
 
     public function testCreateWithNoPasswordThrowsIncompleteDsnException()
     {
         $factory = $this->createFactory();
 
         $this->expectException(IncompleteDsnException::class);
-        $factory->create(Dsn::fromString(sprintf('telegram://%s@%s/?channel=%s', 'simpleToken', 'testHost', 'testChannel')));
+        $factory->create(Dsn::fromString('telegram://simpleToken@host.test?channel=testChannel'));
     }
 
     public function testCreateWithNoTokenThrowsIncompleteDsnException()
     {
         $factory = $this->createFactory();
 
         $this->expectException(IncompleteDsnException::class);
-        $factory->create(Dsn::fromString(sprintf('telegram://%s/?channel=%s', 'testHost', 'testChannel')));
+        $factory->create(Dsn::fromString('telegram://host.test?channel=testChannel'));
     }
 
     public function testSupportsReturnsTrueWithSupportedScheme()
     {
         $factory = $this->createFactory();
 
-        $this->assertTrue($factory->supports(Dsn::fromString('telegram://host/?channel=testChannel')));
+        $this->assertTrue($factory->supports(Dsn::fromString('telegram://host?channel=testChannel')));
     }
 
     public function testSupportsReturnsFalseWithUnsupportedScheme()
     {
         $factory = $this->createFactory();
 
-        $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://host/?channel=testChannel')));
+        $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://host?channel=testChannel')));
     }
 
     public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
@@ -67,7 +64,7 @@ public function testUnsupportedSchemeThrowsUnsupportedSchemeException()
 
         $this->expectException(UnsupportedSchemeException::class);
 
-        $factory->create(Dsn::fromString('somethingElse://user:pwd@host/?channel=testChannel'));
+        $factory->create(Dsn::fromString('somethingElse://user:pwd@host?channel=testChannel'));
     }
 
     private function createFactory(): TelegramTransportFactory
diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Telegram/Tests/TelegramTransportTest.php
@@ -26,26 +26,24 @@ final class TelegramTransportTest extends TestCase
 {
     public function testToStringContainsProperties()
     {
-        $channel = 'testChannel';
-
-        $transport = new TelegramTransport('testToken', $channel, $this->createMock(HttpClientInterface::class));
-        $transport->setHost('host.test');
+        $transport = $this->createTransport();
 
-        $this->assertSame(sprintf('telegram://%s?channel=%s', 'host.test', $channel), (string) $transport);
+        $this->assertSame('telegram://host.test?channel=testChannel', (string) $transport);
     }
 
     public function testSupportsChatMessage()
     {
-        $transport = new TelegramTransport('testToken', 'testChannel', $this->createMock(HttpClientInterface::class));
+        $transport = $this->createTransport();
 
         $this->assertTrue($transport->supports(new ChatMessage('testChatMessage')));
         $this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));
     }
 
-    public function testSendNonChatMessageThrows()
+    public function testSendNonChatMessageThrowsLogicException()
     {
+        $transport = $this->createTransport();
+
         $this->expectException(LogicException::class);
-        $transport = new TelegramTransport('testToken', 'testChannel', $this->createMock(HttpClientInterface::class));
 
         $transport->send($this->createMock(MessageInterface::class));
     }
@@ -67,7 +65,7 @@ public function testSendWithErrorResponseThrows()
             return $response;
         });
 
-        $transport = new TelegramTransport('testToken', 'testChannel', $client);
+        $transport = $this->createTransport('testChannel', $client);
 
         $transport->send(new ChatMessage('testMessage'));
     }
@@ -121,12 +119,12 @@ public function testSendWithOptions()
             return $response;
         });
 
-        $transport = new TelegramTransport('testToken', $channel, $client);
+        $transport = $this->createTransport($channel, $client);
 
         $sentMessage = $transport->send(new ChatMessage('testMessage'));
 
         $this->assertEquals(1, $sentMessage->getMessageId());
-        $this->assertEquals('telegram://api.telegram.org?channel=testChannel', $sentMessage->getTransport());
+        $this->assertEquals('telegram://host.test?channel=testChannel', $sentMessage->getTransport());
     }
 
     public function testSendWithChannelOverride()
@@ -177,14 +175,19 @@ public function testSendWithChannelOverride()
             return $response;
         });
 
-        $transport = new TelegramTransport('testToken', 'defaultChannel', $client);
+        $transport = $this->createTransport('defaultChannel', $client);
 
         $messageOptions = new TelegramOptions();
         $messageOptions->chatId($channelOverride);
 
         $sentMessage = $transport->send(new ChatMessage('testMessage', $messageOptions));
 
         $this->assertEquals(1, $sentMessage->getMessageId());
-        $this->assertEquals('telegram://api.telegram.org?channel=defaultChannel', $sentMessage->getTransport());
+        $this->assertEquals('telegram://host.test?channel=defaultChannel', $sentMessage->getTransport());
+    }
+
+    private function createTransport($channel = 'testChannel', ?HttpClientInterface $client = null): TelegramTransport
+    {
+        return (new TelegramTransport('token', $channel, $client ?: $this->createMock(HttpClientInterface::class)))->setHost('host.test');
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Twilio/Tests/TwilioTransportFactoryTest.php
diff --git a/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php b/src/Symfony/Component/Notifier/Exception/UnsupportedSchemeException.php

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ public function testCreateWithDsn()`
`25`	`25`	`{`
`26`	`26`	`$factory = $this->createFactory();`
`27`	`27`
`28`		`- $transport = $factory->create(Dsn::fromString('firebase://username:password@default'));`
`29`		`- $transport->setHost('host.test');`
	`28`	`+ $transport = $factory->create(Dsn::fromString('firebase://username:[email protected]'));`
`30`	`29`
`31`	`30`	`$this->assertSame('firebase://host.test', (string) $transport);`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,10 @@ public function create(Dsn $dsn): TransportInterface`
`43`	`43`	`throw new IncompleteDsnException('Missing phone.', $dsn->getOriginalDsn());`
`44`	`44`	`}`
`45`	`45`
`46`		`- return new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher);`
	`46`	`+ $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();`
	`47`	`+ $port = $dsn->getPort();`
	`48`	`+`
	`49`	`+ return (new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher))->setHost($host)->setPort($port);`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`protected function getSupportedSchemes(): array`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ public function testCreateWithDsn()`
`23`	`23`	`{`
`24`	`24`	`$factory = $this->createFactory();`
`25`	`25`
`26`		`- $dsn = 'freemobile://login:pass@default?phone=0611223344';`
`27`		`- $transport = $factory->create(Dsn::fromString($dsn));`
`28`		`- $transport->setHost('host.test');`
	`26`	`+ $transport = $factory->create(Dsn::fromString('freemobile://login:[email protected]?phone=0611223344'));`
`29`	`27`
`30`	`28`	`$this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);`
`31`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,9 @@ public function testCreateWithDsn()`
`26`	`26`	`{`
`27`	`27`	`$factory = $this->createFactory();`
`28`	`28`
`29`		`- $accessToken = 'testAccessToken';`
`30`		`- $host = 'testHost';`
`31`		`- $channel = 'testChannel';`
	`29`	`+ $transport = $factory->create(Dsn::fromString('mattermost://[email protected]?channel=testChannel'));`
`32`	`30`
`33`		`- $transport = $factory->create(Dsn::fromString(sprintf('mattermost://%s@%s/?channel=%s', $accessToken, $host, $channel)));`
`34`		`-`
`35`		`- $this->assertSame(sprintf('mattermost://%s?channel=%s', $host, $channel), (string) $transport);`
	`31`	`+ $this->assertSame('mattermost://host.test?channel=testChannel', (string) $transport);`
`36`	`32`	`}`
`37`	`33`
`38`	`34`	`public function testCreateWithMissingOptionChannelThrowsIncompleteDsnException()`
`@@ -49,21 +45,21 @@ public function testCreateWithNoTokenThrowsIncompleteDsnException()`
`49`	`45`	`$factory = $this->createFactory();`
`50`	`46`
`51`	`47`	`$this->expectException(IncompleteDsnException::class);`
`52`		`- $factory->create(Dsn::fromString(sprintf('mattermost://%s/?channel=%s', 'testHost', 'testChannel')));`
	`48`	`+ $factory->create(Dsn::fromString('mattermost://host.test?channel=testChannel'));`
`53`	`49`	`}`
`54`	`50`
`55`	`51`	`public function testSupportsReturnsTrueWithSupportedScheme()`
`56`	`52`	`{`
`57`	`53`	`$factory = $this->createFactory();`
`58`	`54`
`59`		`- $this->assertTrue($factory->supports(Dsn::fromString('mattermost://token@host/?channel=testChannel')));`
	`55`	`+ $this->assertTrue($factory->supports(Dsn::fromString('mattermost://token@host?channel=testChannel')));`
`60`	`56`	`}`
`61`	`57`
`62`	`58`	`public function testSupportsReturnsFalseWithUnsupportedScheme()`
`63`	`59`	`{`
`64`	`60`	`$factory = $this->createFactory();`
`65`	`61`
`66`		`- $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host/?channel=testChannel')));`
	`62`	`+ $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host?channel=testChannel')));`
`67`	`63`	`}`
`68`	`64`
`69`	`65`	`public function testUnsupportedSchemeThrowsUnsupportedSchemeException()`
`@@ -72,7 +68,7 @@ public function testUnsupportedSchemeThrowsUnsupportedSchemeException()`
`72`	`68`
`73`	`69`	`$this->expectException(UnsupportedSchemeException::class);`
`74`	`70`
`75`		`- $factory->create(Dsn::fromString('somethingElse://token@host/?channel=testChannel'));`
	`71`	`+ $factory->create(Dsn::fromString('somethingElse://token@host?channel=testChannel'));`
`76`	`72`	`}`
`77`	`73`
`78`	`74`	`public function testUnsupportedSchemeThrowsUnsupportedSchemeExceptionEvenIfRequiredOptionIsMissing()`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function testSupportsChatMessage()`
`38`	`38`	`$this->assertFalse($transport->supports($this->createMock(MessageInterface::class)));`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function testSendNonChatMessageThrows()`
	`41`	`+ public function testSendNonChatMessageThrowsLogicException()`
`42`	`42`	`{`
`43`	`43`	`$transport = $this->createTransport();`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -26,35 +26,31 @@ public function testCreateWithDsn()`
`26`	`26`	`{`
`27`	`27`	`$factory = $this->createFactory();`
`28`	`28`
`29`		`- $accessToken = 'testAccessToken';`
`30`		`- $host = 'testHost';`
`31`		`- $channel = 'testChannel';`
	`29`	`+ $transport = $factory->create(Dsn::fromString('rocketchat://[email protected]?channel=testChannel'));`
`32`	`30`
`33`		`- $transport = $factory->create(Dsn::fromString(sprintf('rocketchat://%s@%s/?channel=%s', $accessToken, $host, $channel)));`
`34`		`-`
`35`		`- $this->assertSame(sprintf('rocketchat://%s?channel=%s', $host, $channel), (string) $transport);`
	`31`	`+ $this->assertSame('rocketchat://host.test?channel=testChannel', (string) $transport);`
`36`	`32`	`}`
`37`	`33`
`38`	`34`	`public function testCreateWithNoTokenThrowsIncompleteDsnException()`
`39`	`35`	`{`
`40`	`36`	`$factory = $this->createFactory();`
`41`	`37`
`42`	`38`	`$this->expectException(IncompleteDsnException::class);`
`43`		`- $factory->create(Dsn::fromString(sprintf('rocketchat://%s/?channel=%s', 'testHost', 'testChannel')));`
	`39`	`+ $factory->create(Dsn::fromString('rocketchat://host.test?channel=testChannel'));`
`44`	`40`	`}`
`45`	`41`
`46`	`42`	`public function testSupportsReturnsTrueWithSupportedScheme()`
`47`	`43`	`{`
`48`	`44`	`$factory = $this->createFactory();`
`49`	`45`
`50`		`- $this->assertTrue($factory->supports(Dsn::fromString('rocketchat://token@host/?channel=testChannel')));`
	`46`	`+ $this->assertTrue($factory->supports(Dsn::fromString('rocketchat://token@host?channel=testChannel')));`
`51`	`47`	`}`
`52`	`48`
`53`	`49`	`public function testSupportsReturnsFalseWithUnsupportedScheme()`
`54`	`50`	`{`
`55`	`51`	`$factory = $this->createFactory();`
`56`	`52`
`57`		`- $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host/?channel=testChannel')));`
	`53`	`+ $this->assertFalse($factory->supports(Dsn::fromString('somethingElse://token@host?channel=testChannel')));`
`58`	`54`	`}`
`59`	`55`
`60`	`56`	`public function testUnsupportedSchemeThrowsUnsupportedSchemeException()`
`@@ -63,7 +59,7 @@ public function testUnsupportedSchemeThrowsUnsupportedSchemeException()`
`63`	`59`
`64`	`60`	`$this->expectException(UnsupportedSchemeException::class);`
`65`	`61`
`66`		`- $factory->create(Dsn::fromString('somethingElse://token@host/?channel=testChannel'));`
	`62`	`+ $factory->create(Dsn::fromString('somethingElse://token@host?channel=testChannel'));`
`67`	`63`	`}`
`68`	`64`
`69`	`65`	`private function createFactory(): RocketChatTransportFactory`