[Notifier][Discord] Make webhookId argument required

OskarStark · fabpot · commit 21c47680f99c · 2020-12-10T08:09:23.000+01:00
diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransport.php b/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransport.php
@@ -32,7 +32,7 @@ final class DiscordTransport extends AbstractTransport
     private $token;
     private $webhookId;
 
-    public function __construct(string $token, string $webhookId = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(string $token, string $webhookId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
         $this->token = $token;
         $this->webhookId = $webhookId;
diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Discord/DiscordTransportFactory.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Bridge\Discord;
 
+use Symfony\Component\Notifier\Exception\IncompleteDsnException;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\AbstractTransportFactory;
 use Symfony\Component\Notifier\Transport\Dsn;
@@ -31,6 +32,11 @@ public function create(Dsn $dsn): TransportInterface
         $scheme = $dsn->getScheme();
         $token = $this->getUser($dsn);
         $webhookId = $dsn->getOption('webhook_id');
+
+        if (!$webhookId) {
+            throw new IncompleteDsnException('Missing webhook_id.', $dsn->getOriginalDsn());
+        }
+
         $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
         $port = $dsn->getPort();
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Discord/Tests/DiscordTransportFactoryTest.php
@@ -31,6 +31,15 @@ public function testCreateWithDsn()
         $this->assertSame(sprintf('discord://%s?webhook_id=%s', $host, $webhookId), (string) $transport);
     }
 
+    public function testCreateWithNoWebhookIdThrowsMalformed(): void
+    {
+        $factory = new DiscordTransportFactory();
+
+        $this->expectException(IncompleteDsnException::class);
+
+        $factory->create(Dsn::fromString('discord://token@host'));
+    }
+
     public function testCreateWithNoTokenThrowsMalformed()
     {
         $factory = new DiscordTransportFactory();

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class DiscordTransport extends AbstractTransport`
`32`	`32`	`private $token;`
`33`	`33`	`private $webhookId;`
`34`	`34`
`35`		`- public function __construct(string $token, string $webhookId = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
	`35`	`+ public function __construct(string $token, string $webhookId, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)`
`36`	`36`	`{`
`37`	`37`	`$this->token = $token;`
`38`	`38`	`$this->webhookId = $webhookId;`